Prepare for release candidate

README.md

@@ -46,7 +46,7 @@ Apache Commons FileUpload Parent
 [![GitHub Actions Status](https://github.com/apache/commons-fileupload/workflows/Java%20CI/badge.svg)](https://github.com/apache/commons-fileupload/actions)
 [![Coverage Status](https://codecov.io/gh/apache/commons-fileupload/branch/master/graph/badge.svg)](https://app.codecov.io/gh/apache/commons-fileupload)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-fileupload2/badge.svg?gav=true)](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-fileupload2/?gav=true)
-[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-fileupload2/2.0.0.svg)](https://javadoc.io/doc/org.apache.commons/commons-fileupload2/2.0.0)
+[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-fileupload2/2.0.0-M1.svg)](https://javadoc.io/doc/org.apache.commons/commons-fileupload2/2.0.0-M1)
 [![CodeQL](https://github.com/apache/commons-fileupload/workflows/CodeQL/badge.svg)](https://github.com/apache/commons-fileupload/actions/workflows/codeql-analysis.yml?query=workflow%3ACodeQL)
 [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/apache/commons-fileupload/badge)](https://api.securityscorecards.dev/projects/github.com/apache/commons-fileupload)
 
@@ -64,43 +64,13 @@ Where can I get the latest release?
 -----------------------------------
 You can download source and binaries from our [download page](https://commons.apache.org/proper/commons-fileupload/download_fileupload.cgi).
 
-Alternatively, you can pull it from the central Maven repositories:
+Alternatively, you can pull it from  the central Maven repositories:
 
 ```xml
-<dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.5</version>
-</dependency>
-```
-
-The upcoming version 2.0.0 will be:
-
-```xml
-<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-fileupload2-jakarta</artifactId>
- <version>2.0.0</version>
-</dependency>
-<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-fileupload2-javax</artifactId>
- <version>2.0.0</version>
-</dependency>
-```
-
-You can experiment today by building from git master or using a snapshot build:
-
-```xml
-<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-fileupload2-jakarta</artifactId>
- <version>2.0.0-SNAPSHOT</version>
-</dependency>
 <dependency>
  <groupId>org.apache.commons</groupId>
- <artifactId>commons-fileupload2-javax</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <artifactId>commons-fileupload2</artifactId>
+ <version>2.0.0-M1</version>
 </dependency>
 ```
 

RELEASE-NOTES.txt

@@ -1,3 +1,77 @@
+ Apache Commons FileUpload Parent 2.0.0-M1 RELEASE NOTES
+
+The Apache Commons FileUpload Parent team is pleased to announce the release of Apache Commons FileUpload Parent 2.0.0-M1.
+
+The Apache Commons FileUpload component provides a simple yet flexible means of
+adding support for multipart file upload functionality to servlets and web
+applications. This version requires Java 8 or later.
+
+No client code changes are required to migrate from version 1.3.0 to 1.3.1.
+
+
+2.0.0-M1 Release
+
+Changes in version 2.0.0-M1 include:
+
+New features:
+o Add github/codeql-action from #144. Thanks to Gary Gregory.
+o Add the package org.apache.fileupload2.jaksrvlt, for compliance with Jakarta Servlet API 5.0.
+o Making FileUploadException a subclass of IOException. (Mibor API simplification.)
+o Add a configurable limit (disabled by default) for the number of files to upload per request.
+
+Fixed Bugs:
+o Changing Maven coordinates, and package name, due to binary incompatible changes.
+o FILEUPLOAD-293: DiskFileItem.write(File) had been changed to use FileUtils.moveFile internally, preventing an existing file as the target.
+o FILEUPLOAD-296: Performance gains by reusing an internal buffer. Thanks to David Georg Reochelt.
+o FILEUPLOAD-274: RFC 5987 compliance Thanks to Merbin J Anselm.
+o Slight optim: resuse the index position instead of recomputing it #49. Thanks to Emmanuel L�charny.
+o FILEUPLOAD-340: Make commons-fileupload2 a JPMS module by adding module-info.class.
+o FILEUPLOAD-341: Move Exception classes out of the impl package. Thanks to Martin Grigorov.
+o Rework exceptions to use propagated exception causes (introduced in Java 1.4). Thanks to Gary Gregory.
+o All custom exception extend FileUploadException. Thanks to Gary Gregory.
+o All custom exceptions serialVersionUID value is now 2. Thanks to Gary Gregory.
+o FILEUPLOAD-350: FileUploadByteCountLimitException ctor switches fileName and fieldName parameters #216. Thanks to Ernesto Reinaldo Barreiro.
+o [StepSecurity] ci: Harden GitHub Actions #224. Thanks to step-security-bot, Gary Gregory.
+
+Changes:
+o Bump actions/cache from 2.1.6 to 3.0.8 #128, #140. Thanks to Dependabot, Gary Gregory.
+o Bump actions/checkout from 2.3.4 to 3.0.2 #125. Thanks to Dependabot, Gary Gregory.
+o Bump build actions/setup-java from 1.4.3 to 3.8.0 #142, #175, #180, #182. Thanks to Gary Gregory.
+o Bump Java compiler level to 1.8.
+o Bump commons-io:commons-io 2.6 to 2.13.0, #104, #221. Thanks to Gary Gregory, Dependabot.
+o Bump junit-jupiter from 5.5.2 to 5.9.1 #31, #130, #156, #166. Thanks to Dependabot.
+o Bump maven-pmd-plugin from 3.13.0 to 3.19.0 #48, #162. Thanks to Dependabot.
+o Bump commons.japicmp.version from 0.13.0 to 0.16.0. Thanks to Gary Gregory.
+o Bump spotbugs-maven-plugin from 4.2.3 to 4.7.3.0 #103, #133, #141, #146, #155, #163, #179. Thanks to Dependabot.
+o Bump spotbugs from 4.2.3 to 4.7.3, ignore EI_EXPOSE_REP, and EI_EXPOSE_REP2, #152, #161, #174. Thanks to Dependabot.
+o Bump biz.aQute.bndlib from 6.0.0 to 6.4.0 #129, #181. Thanks to Dependabot.
+o Bump commons-parent from 52 to 58, #167, #183, #194. Thanks to Gary Gregory, Dependabot.
+o Bump maven-checkstyle-plugin from 3.1.2 to 3.2.0 #160. Thanks to Dependabot.
+
+Removed:
+o Remove deprecated constructors in MultipartStream. Thanks to Gary Gregory.
+o Remove deprecated RequestContext.getContentLength(). Thanks to Gary Gregory.
+o Remove deprecated JakSrvltRequestContext.getContentLength(). Thanks to Gary Gregory.
+o Remove deprecated PortletRequestContext.getContentLength(). Thanks to Gary Gregory.
+o Remove deprecated ServletRequestContext.getContentLength(). Thanks to Gary Gregory.
+o Remove deprecated FileUploadBase.MAX_HEADER_SIZE. Thanks to Gary Gregory.
+o Remove deprecated FileUploadBase.createItem(Map, boolean). Thanks to Gary Gregory.
+o Remove deprecated FileUploadBase.getFieldName(Map). Thanks to Gary Gregory.
+o Remove deprecated FileUploadBase.getFileName(Map). Thanks to Gary Gregory.
+o Remove deprecated FileUploadBase.getHeader(Map, String). Thanks to Gary Gregory.
+o Remove deprecated FileUploadBase.parseHeaders(String). Thanks to Gary Gregory.
+o Replace org.apache.commons.fileupload2.util.mime.Base64Decoder with java.util.Base64. Thanks to Gary Gregory.
+o Replace LimitedInputStream with BoundedInputStream. Thanks to Gary Gregory.
+o FileItemHeadersImpl is no longer Serializable. Thanks to Gary Gregory.
+o Reuse Java's InvalidPathException instead of the custom InvalidFileNameException. Thanks to Gary Gregory.
+
+For complete information on Apache Commons FileUpload Parent, including instructions on how to submit bug reports,
+patches, or suggestions for improvement, see the Apache Commons FileUpload Parent website:
+
+https://commons.apache.org/proper/commons-fileupload/
+
+------------------------------------------------------------------------------
+
  Apache Commons FileUpload 1.4 RELEASE NOTES
 
 The Apache Commons FileUpload team is pleased to announce the release of Apache Commons FileUpload 1.4.

commons-fileupload2-core/pom.xml

@@ -21,7 +21,7 @@
  <parent>
  <groupId>org.apache.commons</groupId>
  <artifactId>commons-fileupload2</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
  </parent>
 
  <artifactId>commons-fileupload2-core</artifactId>

commons-fileupload2-jakarta/pom.xml

@@ -21,7 +21,7 @@
  <parent>
  <groupId>org.apache.commons</groupId>
  <artifactId>commons-fileupload2</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
  </parent>
 
  <artifactId>commons-fileupload2-jakarta</artifactId>
@@ -41,12 +41,12 @@
  <dependency>
  <groupId>org.apache.commons</groupId>
  <artifactId>commons-fileupload2-core</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>org.apache.commons</groupId>
  <artifactId>commons-fileupload2-core</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
  <classifier>tests</classifier>
  <scope>test</scope>
  </dependency>

commons-fileupload2-javax/pom.xml

@@ -21,7 +21,7 @@
  <parent>
  <groupId>org.apache.commons</groupId>
  <artifactId>commons-fileupload2</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
  </parent>
 
  <artifactId>commons-fileupload2-javax</artifactId>
@@ -41,12 +41,12 @@
  <dependency>
  <groupId>org.apache.commons</groupId>
  <artifactId>commons-fileupload2-core</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>org.apache.commons</groupId>
  <artifactId>commons-fileupload2-core</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
  <classifier>tests</classifier>
  <scope>test</scope>
  </dependency>

commons-fileupload2-portlet/pom.xml

@@ -21,7 +21,7 @@
  <parent>
  <groupId>org.apache.commons</groupId>
  <artifactId>commons-fileupload2</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
  </parent>
 
  <artifactId>commons-fileupload2-portlet</artifactId>
@@ -41,24 +41,24 @@
  <dependency>
  <groupId>org.apache.commons</groupId>
  <artifactId>commons-fileupload2-core</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>org.apache.commons</groupId>
  <artifactId>commons-fileupload2-core</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
  <classifier>tests</classifier>
  <scope>test</scope>
  </dependency>
  <dependency>
  <groupId>org.apache.commons</groupId>
  <artifactId>commons-fileupload2-javax</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>org.apache.commons</groupId>
  <artifactId>commons-fileupload2-javax</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
  <classifier>tests</classifier>
  <scope>test</scope>
  </dependency>

pom.xml

@@ -25,7 +25,7 @@
  </parent>
 
  <artifactId>commons-fileupload2</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
  <packaging>pom</packaging>
 
  <name>Apache Commons FileUpload Parent</name>
@@ -227,7 +227,7 @@
  <commons.parent.dir>${basedir}</commons.parent.dir>
  <commons.componentid>fileupload</commons.componentid>
  <commons.module.name>org.apache.commons.fileupload</commons.module.name>
- <commons.release.version>2.0.0</commons.release.version>
+ <commons.release.version>2.0.0-M1</commons.release.version>
  <commons.release.desc>in the org.apache.commons.fileupload2 namespace for Java 8 or later</commons.release.desc>
 
  <commons.release.2.version>1.5</commons.release.2.version>
@@ -249,13 +249,12 @@
  <moditect-maven-plugin.version>1.0.0.Final</moditect-maven-plugin.version>
 
  <!-- Commons Release Plugin -->
- <commons.bc.version>2.0.0</commons.bc.version>
+ <commons.bc.version>1.5</commons.bc.version>
  <commons.rc.version>RC1</commons.rc.version>
- <commons.release.isDistModule>true</commons.release.isDistModule>
  <commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}</commons.distSvnStagingUrl>
- <commons.releaseManagerName>Rob Tompkins</commons.releaseManagerName>
- <commons.releaseManagerKey>B6E73D84EA4FCC47166087253FAAD2CD5ECBB314</commons.releaseManagerKey>
- </properties>
+ <commons.release.isDistModule>true</commons.release.isDistModule>
+ <commons.releaseManagerName>Gary Gregory</commons.releaseManagerName> 
+  <commons.releaseManagerKey>86fdc7e2a11262cb</commons.releaseManagerKey> </properties>
 
  <dependencyManagement>
  <dependencies>

src/changes/changes.xml

@@ -43,7 +43,7 @@ The <action> type attribute can be add,update,fix,remove.
  </properties>
 
  <body>
- <release version="2.0" date="TBD" description="2.0 Release">
+ <release version="2.0.0-M1" date="2023-07-14" description="2.0.0-M1 Release">
  <!-- FIX -->
  <action dev="jochen" type="fix">Changing Maven coordinates, and package name, due to binary incompatible changes.</action>
  <action issue="FILEUPLOAD-293" dev="jochen" type="fix">DiskFileItem.write(File) had been changed to use FileUtils.moveFile internally, preventing an existing file as the target.</action>

src/changes/release-notes.vm

@@ -20,7 +20,7 @@ The ${developmentTeam} is pleased to announce the release of ${project.name} ${v
 
 The Apache Commons FileUpload component provides a simple yet flexible means of
 adding support for multipart file upload functionality to servlets and web
-applications. Version 1.3 onwards requires Java 6 or later.
+applications. This version requires Java 8 or later.
 
 No client code changes are required to migrate from version 1.3.0 to 1.3.1.
 
@@ -111,3 +111,5 @@ For complete information on ${project.name}, including instructions on how to su
 patches, or suggestions for improvement, see the ${project.name} website:
 
 ${project.url}
+
+------------------------------------------------------------------------------

src/site/xdoc/download_fileupload.xml

@@ -58,11 +58,11 @@ limitations under the License.
 -->
 <document>
  <properties>
- <title>Download Apache Commons FileUpload</title>
+ <title>Download Apache Commons FileUpload Parent</title>
  <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
  </properties>
  <body>
- <section name="Download Apache Commons FileUpload">
+ <section name="Download Apache Commons FileUpload Parent">
  <subsection name="Using a Mirror">
  <p>
  We recommend you use a mirror to download our release
@@ -113,37 +113,37 @@ limitations under the License.
  </p>
  </subsection>
  </section>
- <section name="Apache Commons FileUpload 2.0.0 in the org.apache.commons.fileupload2 namespace for Java 1.8 or later">
+ <section name="Apache Commons FileUpload Parent 2.0.0-M1 in the org.apache.commons.fileupload2 namespace for Java 8 or later">
  <subsection name="Binaries">
  <table>
  <tr>
- <td><a href="[preferred]/commons/fileupload/binaries/commons-fileupload2-2.0.0-bin.tar.gz">commons-fileupload2-2.0.0-bin.tar.gz</a></td>
- <td><a href="https://downloads.apache.org/commons/fileupload/binaries/commons-fileupload2-2.0.0-bin.tar.gz.sha512">sha512</a></td>
- <td><a href="https://downloads.apache.org/commons/fileupload/binaries/commons-fileupload2-2.0.0-bin.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/fileupload/binaries/commons-fileupload2-2.0.0-M1-bin.tar.gz">commons-fileupload2-2.0.0-M1-bin.tar.gz</a></td>
+ <td><a href="https://downloads.apache.org/commons/fileupload/binaries/commons-fileupload2-2.0.0-M1-bin.tar.gz.sha512">sha512</a></td>
+ <td><a href="https://downloads.apache.org/commons/fileupload/binaries/commons-fileupload2-2.0.0-M1-bin.tar.gz.asc">pgp</a></td>
  </tr>
  <tr>
- <td><a href="[preferred]/commons/fileupload/binaries/commons-fileupload2-2.0.0-bin.zip">commons-fileupload2-2.0.0-bin.zip</a></td>
- <td><a href="https://downloads.apache.org/commons/fileupload/binaries/commons-fileupload2-2.0.0-bin.zip.sha512">sha512</a></td>
- <td><a href="https://downloads.apache.org/commons/fileupload/binaries/commons-fileupload2-2.0.0-bin.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/fileupload/binaries/commons-fileupload2-2.0.0-M1-bin.zip">commons-fileupload2-2.0.0-M1-bin.zip</a></td>
+ <td><a href="https://downloads.apache.org/commons/fileupload/binaries/commons-fileupload2-2.0.0-M1-bin.zip.sha512">sha512</a></td>
+ <td><a href="https://downloads.apache.org/commons/fileupload/binaries/commons-fileupload2-2.0.0-M1-bin.zip.asc">pgp</a></td>
  </tr>
  </table>
  </subsection>
  <subsection name="Source">
  <table>
  <tr>
- <td><a href="[preferred]/commons/fileupload/source/commons-fileupload2-2.0.0-src.tar.gz">commons-fileupload2-2.0.0-src.tar.gz</a></td>
- <td><a href="https://downloads.apache.org/commons/fileupload/source/commons-fileupload2-2.0.0-src.tar.gz.sha512">sha512</a></td>
- <td><a href="https://downloads.apache.org/commons/fileupload/source/commons-fileupload2-2.0.0-src.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/fileupload/source/commons-fileupload2-2.0.0-M1-src.tar.gz">commons-fileupload2-2.0.0-M1-src.tar.gz</a></td>
+ <td><a href="https://downloads.apache.org/commons/fileupload/source/commons-fileupload2-2.0.0-M1-src.tar.gz.sha512">sha512</a></td>
+ <td><a href="https://downloads.apache.org/commons/fileupload/source/commons-fileupload2-2.0.0-M1-src.tar.gz.asc">pgp</a></td>
  </tr>
  <tr>
- <td><a href="[preferred]/commons/fileupload/source/commons-fileupload2-2.0.0-src.zip">commons-fileupload2-2.0.0-src.zip</a></td>
- <td><a href="https://downloads.apache.org/commons/fileupload/source/commons-fileupload2-2.0.0-src.zip.sha512">sha512</a></td>
- <td><a href="https://downloads.apache.org/commons/fileupload/source/commons-fileupload2-2.0.0-src.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/fileupload/source/commons-fileupload2-2.0.0-M1-src.zip">commons-fileupload2-2.0.0-M1-src.zip</a></td>
+ <td><a href="https://downloads.apache.org/commons/fileupload/source/commons-fileupload2-2.0.0-M1-src.zip.sha512">sha512</a></td>
+ <td><a href="https://downloads.apache.org/commons/fileupload/source/commons-fileupload2-2.0.0-M1-src.zip.asc">pgp</a></td>
  </tr>
  </table>
  </subsection>
  </section>
- <section name="Apache Commons FileUpload 1.5 in the org.apache.commons.fileupload namespace for Java 6">
+ <section name="Apache Commons FileUpload Parent 1.5 in the org.apache.commons.fileupload namespace for Java 6">
  <subsection name="Binaries">
  <table>
  <tr>