diff --git a/README.md b/README.md index 4ceea1ca28..b89d17243b 100644 --- a/README.md +++ b/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 - - commons-fileupload - commons-fileupload - 1.5 - -``` - -The upcoming version 2.0.0 will be: - -```xml - - org.apache.commons - commons-fileupload2-jakarta - 2.0.0 - - - org.apache.commons - commons-fileupload2-javax - 2.0.0 - -``` - -You can experiment today by building from git master or using a snapshot build: - -```xml - - org.apache.commons - commons-fileupload2-jakarta - 2.0.0-SNAPSHOT - org.apache.commons - commons-fileupload2-javax - 2.0.0-SNAPSHOT + commons-fileupload2 + 2.0.0-M1 ``` diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 9997ddd5e5..484a8fe215 100644 --- a/RELEASE-NOTES.txt +++ b/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. diff --git a/commons-fileupload2-core/pom.xml b/commons-fileupload2-core/pom.xml index d66f10d16a..9d6a1b49a2 100644 --- a/commons-fileupload2-core/pom.xml +++ b/commons-fileupload2-core/pom.xml @@ -21,7 +21,7 @@ org.apache.commons commons-fileupload2 - 2.0.0-SNAPSHOT + 2.0.0-M1-SNAPSHOT commons-fileupload2-core diff --git a/commons-fileupload2-jakarta/pom.xml b/commons-fileupload2-jakarta/pom.xml index 9e07134637..280147868f 100644 --- a/commons-fileupload2-jakarta/pom.xml +++ b/commons-fileupload2-jakarta/pom.xml @@ -21,7 +21,7 @@ org.apache.commons commons-fileupload2 - 2.0.0-SNAPSHOT + 2.0.0-M1-SNAPSHOT commons-fileupload2-jakarta @@ -41,12 +41,12 @@ org.apache.commons commons-fileupload2-core - 2.0.0-SNAPSHOT + 2.0.0-M1-SNAPSHOT org.apache.commons commons-fileupload2-core - 2.0.0-SNAPSHOT + 2.0.0-M1-SNAPSHOT tests test diff --git a/commons-fileupload2-javax/pom.xml b/commons-fileupload2-javax/pom.xml index aee15d79f5..c0a22c3e08 100644 --- a/commons-fileupload2-javax/pom.xml +++ b/commons-fileupload2-javax/pom.xml @@ -21,7 +21,7 @@ org.apache.commons commons-fileupload2 - 2.0.0-SNAPSHOT + 2.0.0-M1-SNAPSHOT commons-fileupload2-javax @@ -41,12 +41,12 @@ org.apache.commons commons-fileupload2-core - 2.0.0-SNAPSHOT + 2.0.0-M1-SNAPSHOT org.apache.commons commons-fileupload2-core - 2.0.0-SNAPSHOT + 2.0.0-M1-SNAPSHOT tests test diff --git a/commons-fileupload2-portlet/pom.xml b/commons-fileupload2-portlet/pom.xml index ae54107170..c800abeb32 100644 --- a/commons-fileupload2-portlet/pom.xml +++ b/commons-fileupload2-portlet/pom.xml @@ -21,7 +21,7 @@ org.apache.commons commons-fileupload2 - 2.0.0-SNAPSHOT + 2.0.0-M1-SNAPSHOT commons-fileupload2-portlet @@ -41,24 +41,24 @@ org.apache.commons commons-fileupload2-core - 2.0.0-SNAPSHOT + 2.0.0-M1-SNAPSHOT org.apache.commons commons-fileupload2-core - 2.0.0-SNAPSHOT + 2.0.0-M1-SNAPSHOT tests test org.apache.commons commons-fileupload2-javax - 2.0.0-SNAPSHOT + 2.0.0-M1-SNAPSHOT org.apache.commons commons-fileupload2-javax - 2.0.0-SNAPSHOT + 2.0.0-M1-SNAPSHOT tests test diff --git a/pom.xml b/pom.xml index 213ce4bbcb..0ed44ee969 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ commons-fileupload2 - 2.0.0-SNAPSHOT + 2.0.0-M1-SNAPSHOT pom Apache Commons FileUpload Parent @@ -227,7 +227,7 @@ ${basedir} fileupload org.apache.commons.fileupload - 2.0.0 + 2.0.0-M1 in the org.apache.commons.fileupload2 namespace for Java 8 or later 1.5 @@ -249,13 +249,12 @@ 1.0.0.Final - 2.0.0 + 1.5 RC1 - true scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid} - Rob Tompkins - B6E73D84EA4FCC47166087253FAAD2CD5ECBB314 - + true + Gary Gregory + 86fdc7e2a11262cb diff --git a/src/changes/changes.xml b/src/changes/changes.xml index c06f0705b4..7c95692217 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -43,7 +43,7 @@ The type attribute can be add,update,fix,remove. - + Changing Maven coordinates, and package name, due to binary incompatible changes. DiskFileItem.write(File) had been changed to use FileUtils.moveFile internally, preventing an existing file as the target. diff --git a/src/changes/release-notes.vm b/src/changes/release-notes.vm index 0769f29515..78f09cb993 100644 --- a/src/changes/release-notes.vm +++ b/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} + +------------------------------------------------------------------------------ diff --git a/src/site/xdoc/download_fileupload.xml b/src/site/xdoc/download_fileupload.xml index 3591929fb5..5e55e723f4 100644 --- a/src/site/xdoc/download_fileupload.xml +++ b/src/site/xdoc/download_fileupload.xml @@ -58,11 +58,11 @@ limitations under the License. --> - Download Apache Commons FileUpload + Download Apache Commons FileUpload Parent Apache Commons Documentation Team -
+

We recommend you use a mirror to download our release @@ -113,37 +113,37 @@ limitations under the License.

-
+
- - - + + + - - - + + +
commons-fileupload2-2.0.0-bin.tar.gzsha512pgpcommons-fileupload2-2.0.0-M1-bin.tar.gzsha512pgp
commons-fileupload2-2.0.0-bin.zipsha512pgpcommons-fileupload2-2.0.0-M1-bin.zipsha512pgp
- - - + + + - - - + + +
commons-fileupload2-2.0.0-src.tar.gzsha512pgpcommons-fileupload2-2.0.0-M1-src.tar.gzsha512pgp
commons-fileupload2-2.0.0-src.zipsha512pgpcommons-fileupload2-2.0.0-M1-src.zipsha512pgp
-
+
diff --git a/src/site/xdoc/issue-tracking.xml b/src/site/xdoc/issue-tracking.xml index 6214ae721a..c0d8d5c576 100644 --- a/src/site/xdoc/issue-tracking.xml +++ b/src/site/xdoc/issue-tracking.xml @@ -43,15 +43,15 @@ limitations under the License. --> - Apache Commons FileUpload Issue tracking + Apache Commons FileUpload Parent Issue tracking Apache Commons Documentation Team -
+

- Apache Commons FileUpload uses ASF JIRA for tracking issues. - See the Apache Commons FileUpload JIRA project page. + Apache Commons FileUpload Parent uses ASF JIRA for tracking issues. + See the Apache Commons FileUpload Parent JIRA project page.

@@ -63,7 +63,7 @@ limitations under the License.

If you would like to report a bug, or raise an enhancement request with - Apache Commons FileUpload please do the following: + Apache Commons FileUpload Parent please do the following:

  1. Search existing open bugs. If you find your issue listed then please add a comment with your details.
    2. @@ -80,7 +80,7 @@ limitations under the License.
    • the more information you provide, the better we can help you
    • test cases are vital, particularly for any proposed enhancements
      • -
    • the developers of Apache Commons FileUpload are all unpaid volunteers
      • +
    • the developers of Apache Commons FileUpload Parent are all unpaid volunteers

    @@ -92,9 +92,9 @@ limitations under the License.

    You may also find these links useful:

diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml index 79acfacddd..b7ba8fe857 100644 --- a/src/site/xdoc/mail-lists.xml +++ b/src/site/xdoc/mail-lists.xml @@ -41,14 +41,14 @@ limitations under the License. --> - Apache Commons FileUpload Mailing Lists + Apache Commons FileUpload Parent Mailing Lists Apache Commons Documentation Team

- Apache Commons FileUpload shares mailing lists with all the other + Apache Commons FileUpload Parent shares mailing lists with all the other Commons Components. To make it easier for people to only read messages related to components they are interested in, the convention in Commons is to prefix the subject line of messages with the component's name, @@ -58,11 +58,11 @@ limitations under the License.

- Questions related to the usage of Apache Commons FileUpload should be posted to the + Questions related to the usage of Apache Commons FileUpload Parent should be posted to the User List.
The Developer List - is for questions and discussion related to the development of Apache Commons FileUpload. + is for questions and discussion related to the development of Apache Commons FileUpload Parent.
Please do not cross-post; developers are also subscribed to the user list.
@@ -76,9 +76,9 @@ limitations under the License.

-
+

- Please prefix the subject line of any messages for Apache Commons FileUpload + Please prefix the subject line of any messages for Apache Commons FileUpload Parent with [fileupload] - thanks!

@@ -99,7 +99,7 @@ limitations under the License.

@@ -119,7 +119,7 @@ limitations under the License.
Commons User List

- Questions on using Apache Commons FileUpload. + Questions on using Apache Commons FileUpload Parent.

Subscribe Commons Developer List

- Discussion of development of Apache Commons FileUpload. + Discussion of development of Apache Commons FileUpload Parent.

Subscribe