This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch 1.x
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
The following commit(s) were added to refs/heads/1.x by this push:
new fc1a2993 Prepare for the next release candidate
fc1a2993 is described below
commit fc1a29936115d67b92c2205c281349fac1e72c22
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Jun 5 14:27:11 2025 +0000
Prepare for the next release candidate
---
CONTRIBUTING.md | 19 +++++-----
NOTICE.txt | 2 +-
README.md | 4 +--
RELEASE-NOTES.txt | 60 ++++++++++++++++++++++++-------
pom.xml | 16 ---------
src/changes/changes.xml | 67 +----------------------------------
src/changes/release-notes.vm | 50 +++++++++++++++++---------
src/site/xdoc/download_fileupload.xml | 10 +++---
src/site/xdoc/issue-tracking.xml | 14 ++++----
src/site/xdoc/mail-lists.xml | 14 ++++----
10 files changed, 118 insertions(+), 138 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cc404260..1a5d6d1a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -60,18 +60,21 @@ Making Changes
--------------
+ Create a _topic branch_ for your isolated work.
- * Usually you should base your branch on the `master` branch.
+ * Usually you should base your branch from the `master` branch.
* A good topic branch name can be the JIRA bug ID plus a keyword, e.g.
`FILEUPLOAD-123-InputStream`.
* If you have submitted multiple JIRA issues, try to maintain separate
branches and pull requests.
+ Make commits of logical units.
* Make sure your commit messages are meaningful and in the proper format.
Your commit message should contain the key of the JIRA issue.
- * e.g. `FILEUPLOAD-123: Close input stream earlier`
+ * For example, `[FILEUPLOAD-123] Close input stream sooner`
+ Respect the original code style:
- + Only use spaces for indentation.
+ + Only use spaces for indentation; you can check for unnecessary whitespace
with `git diff` before committing.
+ Create minimal diffs - disable _On Save_ actions like _Reformat Source
Code_ or _Organize Imports_. If you feel the source code should be reformatted
create a separate PR for this change first.
- + Check for unnecessary whitespace with `git diff` -- check before
committing.
-+ Make sure you have added the necessary tests for your changes, typically in
`src/test/java`.
-+ Run all the tests with `mvn clean verify` to ensure nothing else was
accidentally broken.
++ Write unit tests that match behavioral changes, where the tests fail if the
changes to the runtime are not applied. This may not always be possible but is
a best-practice.
+Unit tests are typically in the `src/test/java` directory.
++ Run a successful build using the default [Maven](https://maven.apache.org/)
goal with `mvn`; that's `mvn` on the command line by itself.
++ Write a pull request description that is detailed enough to understand what
the pull request does, how, and why.
++ Each commit in the pull request should have a meaningful subject line and
body. Note that commits might be squashed by a maintainer on merge.
+
Making Trivial Changes
----------------------
@@ -79,7 +82,7 @@ Making Trivial Changes
The JIRA tickets are used to generate the changelog for the next release.
For changes of a trivial nature to comments and documentation, it is not
always necessary to create a new ticket in JIRA.
-In this case, it is appropriate to start the first line of a commit with
'(doc)' instead of a ticket number.
+In this case, it is appropriate to start the first line of a commit with
'[doc]' or '[javadoc]' instead of a ticket number.
Submitting Changes
diff --git a/NOTICE.txt b/NOTICE.txt
index 19e85bde..2cabc8ce 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -2,4 +2,4 @@ Apache Commons FileUpload
Copyright 2002-2025 The Apache Software Foundation
This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (https://www.apache.org/).
diff --git a/README.md b/README.md
index c6677d5c..f4f0f63b 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -91,7 +91,7 @@ There are some guidelines which will make applying PRs easier
for us:
+ Create minimal diffs - disable on save actions like reformat source code or
organize imports. If you feel the source code should be reformatted create a
separate PR for this change.
+ Provide JUnit tests for your changes and make sure your changes don't break
any existing tests by running `mvn`.
+ Before you pushing a PR, run `mvn` (by itself), this runs the default goal,
which contains all build checks.
-+ To see the code coverage report, regardless of coverage failures, run `mvn
clean site -Dcommons.jacoco.haltOnFailure=false`
++ To see the code coverage report, regardless of coverage failures, run `mvn
clean site -Dcommons.jacoco.haltOnFailure=false -Pjacoco`
If you plan to contribute on a regular basis, please consider filing a
[contributor license agreement](https://www.apache.org/licenses/#clas).
You can learn more about contributing via GitHub in our [contribution
guidelines](CONTRIBUTING.md).
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index c7020dde..ea0b8f33 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,32 +1,66 @@
- Apache Commons FileUpload 1.6 RELEASE NOTES
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
-The Apache Commons FileUpload team is pleased to announce the release of
Apache Commons FileUpload 1.6.
+https://www.apache.org/licenses/LICENSE-2.0
-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.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Apache Commons FileUpload 1.6.0 Release Notes
+---------------------------------------------
+
+The Apache Commons FileUpload team is pleased to announce the release of
Apache Commons FileUpload 1.6.0.
-No client code changes are required to migrate from version 1.5 to 1.6.
+The Apache Commons FileUpload component provides a simple yet flexible means
of adding support for multipart
+file upload functionality to servlets and web applications.
-Changes in version 1.6 include:
+This release requires Java 8.
+
+Changes in this version include:
New features:
-o Support for uploads using content type multipart/related
+o [1.x] Enable multipart/related on FileUpload #314. Thanks
to mufasa1976, Jochen Wiedmann, Gary Gregory.
+o Add JApiCmp to the default Maven goal. Thanks to Gary
Gregory.
+o Add partHeaderSizeMax, a new limit that sets a maximum
number of bytes for each individual multipart header. The default is 512 bytes.
Thanks to Mark Thomas.
Fixed Bugs:
-o Last statement in DiskFileItem.finalize() method should be
a call to super.finalize()
-o Use java.util.Base64 instead of custom code.
+o Replace use of Locale.ENGLISH with Locale.ROOT. Thanks to
Gary Gregory.
+o Remove unused exception from FileUploadBase.createItem(Map,
boolean). Thanks to Gary Gregory.
+o Migrate from deprecated API in
DiskFileItem.getOutputStream(). Thanks to Gary Gregory.
+o Use try-with-resources. Thanks to Gary Gregory.
+o Port to Java 1.4 Throwable APIs (!). Thanks to Gary Gregory.
+o Remove -nouses directive from maven-bundle-plugin. OSGi
package imports now state 'uses' definitions for package imports, this doesn't
affect JPMS (from org.apache.commons:commons-parent:80). Thanks to Gary Gregory.
+o DiskFileItem.getInputStream() now uses NIO. Thanks to Gary
Gregory.
+o Last statement in DiskFileItem.finalize() method should be
a call to super.finalize(). Thanks to Gary Gregory.
+o
org.apache.commons.fileupload.FileUploadBase.FileUploadIOException is now a
proper Java 1.4-style exception (propagates its cause to super). Thanks to Gary
Gregory.
+o Use java.util.Base64 instead of custom code. Thanks to Gary
Gregory.
Changes:
-o Bump minimum Java version from 6 to 8
-o Bump Commons IO from 2.11.0 to 2.19.0
+o Bump Java from 6 to 8. Thanks to Gary Gregory.
+o Bump org.apache.commons:commons-parent from 62 to 84,
upgrades Doxia from 1 to 2. Thanks to Gary Gregory.
+o Bump commons-io from 2.11.0 to 2.19.0. Thanks to Gary
Gregory.
+o Bump javax.servlet:servlet-api from 2.4 to 2.5. Thanks to
Gary Gregory.
+o Bump JUnit from junit:junit:4.13.2
org.junit.vintage:junit-vintage-engine from parent POM. Thanks to Gary Gregory.
+
+Historical list of changes:
https://commons.apache.org/proper/commons-fileupload/changes.html
For complete information on Apache Commons FileUpload, including instructions
on how to submit bug reports,
-patches, or suggestions for improvement, see the Apache Apache Commons
FileUpload website:
+patches, or suggestions for improvement, see the Apache Commons FileUpload
website:
https://commons.apache.org/proper/commons-fileupload/
+Download page:
https://commons.apache.org/proper/commons-fileupload/download_fileupload.cgi
+
+Apache Commons Team
+
------------------------------------------------------------------------------
Apache Commons FileUpload 1.5 RELEASE NOTES
diff --git a/pom.xml b/pom.xml
index 9c343e8b..34e284f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -227,22 +227,6 @@
</build>
<reporting>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>${commons.changes.version}</version>
- <configuration>
- <issueLinkTemplate>%URL%/../%ISSUE%</issueLinkTemplate>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- <!-- NPE, retry from time to time <report>jira-report</report>
-->
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 20d50423..8d491998 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -42,7 +42,7 @@ The <action> type attribute can be add,update,fix,remove.
</properties>
<body>
- <release version="1.6.0" date="2025-06-09" description="This release
requires Java 8.">
+ <release version="1.6.0" date="YYYY-MM-DD" description="This release
requires Java 8.">
<!-- ADD -->
<action type="add" dev="ggregory" due-to="mufasa1976, Jochen Wiedmann,
Gary Gregory">[1.x] Enable multipart/related on FileUpload #314.</action>
<action type="add" dev="ggregory" due-to="Gary Gregory">Add JApiCmp to
the default Maven goal.</action>
@@ -95,19 +95,16 @@ The <action> type attribute can be add,update,fix,remove.
<action issue="FILEUPLOAD-288" dev="jochen" type="fix"
due-to="fangwentong" due-to-email="fangwentong2...@gmail.com">Avoid using
File.exists() on temporary files, if we know that the file has been
created.</action>
<action type="add" dev="jochen" due-to="Pascal Schumacher">Added
.travis.yml, to fix build issues on Github.</action>
</release>
-
<release version="1.3.3" description="Bugfix release for 1.3.3"
date="2017-06-13">
<action issue="FILEUPLOAD-279" dev="jochen" type="fix">
DiskDileItem can actually no longer be deserialized, unless a system
property is set to true.
</action>
</release>
-
<release version="1.3.2" description="Bugfix release for 1.3.1"
date="2016.05-26">
<action issue="FILEUPLOAD-272" dev="jochen" type="update">
SECURITY - CVE-2016-3092. Performance Improvement in MultipartStream.
</action>
</release>
-
<release version="1.3.2" description=
"This is a security and maintenance release that includes an important
security
fix as well. Compared to 1.3.1, no other changes have been made."
date="2014-02-07">
@@ -135,7 +132,6 @@ fix as well as a small number of bugfixes."
date="2014-02-07">
Correct example in usage documentation so it compiles.
</action>
</release>
-
<release version="1.3" description="maintenance release, JDK1.5 update"
date="2013-03-27">
<!-- important notes -->
<action dev="markt" type="fix">
@@ -301,7 +297,6 @@ fix as well as a small number of bugfixes."
date="2014-02-07">
The FileItemHeader stuff hasn't been actually working.
</action>
</release>
-
<release version="1.2.1" date="2008-01-18">
<action dev="jochen" type="fix">
Upgrade to commons-io-1.4-SNAPSHOT, in order to use the new
@@ -341,7 +336,6 @@ fix as well as a small number of bugfixes."
date="2014-02-07">
and Ant.
</action>
</release>
-
<release version="1.2" date="2007-02-13">
<action dev="jochen" type="fix" due-to="Aaron Freeman"
due-to-email="aa...@sendthisfile.com">
@@ -385,61 +379,46 @@ fix as well as a small number of bugfixes."
date="2014-02-07">
has not been set.
</action>
</release>
-
<release version="1.1.1" date="2006-06-08" description="Bugfix release">
-
<action dev="martinc" type="fix" issue="FILEUPLOAD-20">
Cache disk file item size when it is moved to a new location.
</action>
-
<action dev="martinc" type="fix" issue="FILEUPLOAD-30">
File names were being inadvertently converted to lower case.
</action>
-
</release>
-
<release version="1.1" date="2005-12-24" description="Portlet support,
substantial refactoring and numerous bug fixes">
-
<action dev="martinc" type="update">
Updates for FileUpload 1.1-RC1.
</action>
-
<action dev="martinc" type="add">
Added release notes for FileUpload 1.1.
</action>
-
<action dev="martinc" type="update">
Update the User Guide to document the "right" way of using FileUpload
1.1, rather than the older, and thus deprecated, ways that are
compatible with FileUpload 1.0.
</action>
-
<action dev="martinc" type="add">
Add this change log, including all changes since the Commons FileUpload
1.0 release.
</action>
-
<action dev="martinc" type="update">
Update Commons IO dependency to version 1.1.
</action>
-
<action dev="martinc" type="add">
Add custom PMD configuration.
</action>
-
<action dev="martinc" type="update">
Make inner exception classes static, which they should have been all
along.
</action>
-
<action dev="martinc" type="fix">
Fix Checkstyle warnings.
</action>
-
<action dev="martinc" type="fix" issue="FILEUPLOAD-29" due-to="Rahul
Akolkar">
Remove Javadoc warnings.
</action>
-
<action dev="martinc" type="update">
Build updates: Include NOTICE.txt in the jar file and distributions.
</action>
@@ -453,44 +432,35 @@ fix as well as a small number of bugfixes."
date="2014-02-07">
<action dev="martinc" type="add">
Add custom Checkstyle configuration.
</action>
-
<action dev="martinc" type="update">
Update dependencies in POM, and add comments and scope.
</action>
-
<action dev="martinc" type="update">
Standardise on @throws instead of having a mixture of that and
@exception.
</action>
-
<action dev="martinc" type="fix" issue="FILEUPLOAD-50" due-to="Niall
Pemberton">
Make DiskFileItem serializable. Thanks to Niall Pemberton for the
suggestion and patch.
</action>
-
<action dev="martinc" type="update">
Make the temporary file names unique across class loaders, not just
within them, by including a UID in the file name.
</action>
-
<action dev="martinc" type="fix" issue="FILEUPLOAD-77">
Include the actual and permitted sizes in both the exception message
and the exception itself.
</action>
-
<action dev="martinc" type="fix" issue="FILEUPLOAD-13">
If an explicit header encoding is not specified, use the one from the
appropriate context (i.e. ServletRequest or ActionRequest).
</action>
-
<action dev="martinc" type="add">
Add getCharacterEncoding to the request context.
</action>
-
<action dev="martinc" type="fix" issue="FILEUPLOAD-83">
Null check and case insensitivity fixes.
</action>
-
<action dev="martinc" type="update">
Web site updates:
Add detail pages for Source Repository and Issue Tracking, based on
@@ -502,40 +472,31 @@ fix as well as a small number of bugfixes."
date="2014-02-07">
The Bugzilla component name has a space in it. Fix the URLs.
Add an FAQ page, using the Maven plugin to generate it.
</action>
-
<action dev="dion" type="fix" issue="COMMONSSITE-2">
Fixes to POMs
</action>
-
<action dev="mrdon" type="update">
Setting source and target for Java 1.3
</action>
-
<action dev="martinc" type="fix" issue="FILEUPLOAD-37">
Fix typos in Javadoc code examples.
</action>
-
<action dev="martinc" type="fix">
Fix typos in exception messages.
</action>
-
<action dev="martinc" type="fix" issue="FILEUPLOAD-5">
Obtain request content type from container instead of headers.
</action>
-
<action dev="sullis" type="update">
New mock objects from Jetspeed-2, and new FileUpload test cases.
</action>
-
<action dev="sullis" type="add">
added toString() methods
</action>
-
<action dev="martinc" type="add">
Fix up the existing package.html file and add new ones for the newly
introduced packages. Fairly minimal, but with a link to the user guide.
</action>
-
<action dev="martinc" type="update">
Substantial refactoring and additions:
@@ -565,104 +526,78 @@ fix as well as a small number of bugfixes."
date="2014-02-07">
the former for now, but the latter is the desired state, which
implies some future breakage. Fair warning...
</action>
-
<action dev="martinc" type="fix" issue="FILEUPLOAD-4">
Specify the encoding (ISO-8859-1) when converting the boundary to a
byte array.
</action>
-
<action dev="martinc" type="update">
Convert to Sun coding guidelines.
</action>
-
<action dev="martinc" type="update">
DeferredFileOutputStream moved to Commons IO.
</action>
-
<action dev="martinc" type="fix" issue="FILEUPLOAD-16" due-to="Justin
Sampson">
Workaround for Mac IE5 bug. Thanks to Justin Sampson for the patch and
tests for this vexing issue.
</action>
-
<action dev="martinc" type="fix" issue="FILEUPLOAD-104">
Handle unquoted header parameters.
</action>
-
<action dev="martinc" type="add" issue="FILEUPLOAD-78">
Some documentation on interaction with virus scanners.
</action>
-
<action dev="martinc" type="add" issue="FILEUPLOAD-31" due-to="Justin
Sampson">
More unit tests from Justin Sampson.
</action>
-
<action dev="martinc" type="update" issue="FILEUPLOAD-95">
Use FileCleaner from Commons IO to clean up temp files, rather than
File.deleteOnExit(), which can cause serious problems in long-running
processes.
</action>
-
<action dev="martinc" type="fix" issue="FILEUPLOAD-53">
Check that HTTP method is POST as part of multipart check.
</action>
-
<action dev="martinc" type="add">
Switch to Commons IO version of DeferredFileOutputStream. Adding IO as
a dependency will allow us to take advantage of other classes in that
component to fix additional FileUpload bugs.
</action>
-
<action dev="martinc" type="add" issue="FILEUPLOAD-40">
handle quoted boundary specification.
</action>
-
<action dev="martinc" type="add" issue="FILEUPLOAD-18">
use case-independent comparisons for encoding types.
</action>
-
<action dev="martinc" type="fix">
Fix comments to avoid break iterator complaints.
</action>
-
<action dev="martinc" type="fix" due-to="Yuji Yamano">
Fix typos in comments.
</action>
-
<action dev="martinc" type="add" issue="FILEUPLOAD-101" due-to="Oleg
Kalnichevski">
Add support for character sets specified for individual parts.
</action>
-
<action dev="scolebourne" type="update">
Change to Apache License 2.0
</action>
-
<action dev="martinc" type="fix" issue="FILEUPLOAD-22">
Correct the comment for the no-args constructor to reflect the fact
that a factory needs to be set before parsing uploads.
</action>
-
<action dev="martinc" type="update">
Collapse some all but duplicated code.
</action>
-
<action dev="jmcnally" type="fix" issue="FILEUPLOAD-72">
Fix example showing FileItem.write to use a File object.
</action>
-
<action dev="martinc" type="fix" issue="FILEUPLOAD-21" due-to="Peter
Chase">
Check for null before attempting to close streams in write().
</action>
-
<action dev="martinc" type="fix" issue="FILEUPLOAD-67" due-to="Paul
Dalton">
Correction to sample code in the docs.
</action>
-
</release>
-
<release version="1.0" date="2003-06-26" description="Initial release">
</release>
-
-
</body>
-
</document>
diff --git a/src/changes/release-notes.vm b/src/changes/release-notes.vm
index cd38fe24..6aadc059 100644
--- a/src/changes/release-notes.vm
+++ b/src/changes/release-notes.vm
@@ -6,7 +6,7 @@
## "License"); you may not use this file except in compliance
## with the License. You may obtain a copy of the License at
##
-## http://www.apache.org/licenses/LICENSE-2.0
+## https://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing,
## software distributed under the License is distributed on an
@@ -14,27 +14,37 @@
## KIND, either express or implied. See the License for the
## specific language governing permissions and limitations
## under the License.
+##
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
${project.name} ${version} Release Notes
------------------------------------------------
The ${developmentTeam} is pleased to announce the release of ${project.name}
${version}.
-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.6 onwards requires Java 8 or later.
-
-No client code changes are required to migrate from version 1.5 to 1.6.
-
+$introduction.replaceAll("(?<!\015)\012", "
+").replaceAll("(?m)^ +","")
## The available variables are described here:
-##
http://maven.apache.org/plugins/maven-changes-plugin/examples/using-a-custom-announcement-template.html
+##
https://maven.apache.org/plugins/maven-changes-plugin/examples/using-a-custom-announcement-template.html
##
-## Hack to get line breaks to work in release description. For this to work,
each line break in the
-## release description attribute in changes.xml needs to be preceded by a
single space.
-#set( $desc = $release.description )
-#set( $desc2 = $desc.replace($esc.newline, " ") )
-#set( $d = $desc2.replace(" ",$esc.newline) )
-${d}
+## Hack to improve layout: replace all pairs of spaces with a single new-line
+$release.description.replaceAll(" ", "
+")
## set up indent sizes. Only change indent1
#set($props=${project.properties})
@@ -76,7 +86,7 @@ o $issue ${action}$dueto
#if ($release.getActions().size() == 0)
No changes defined in this version.
#else
-Changes in version ${version} include:
+Changes in this version include:
#if ($release.getActions('add').size() !=0)
New features:
@@ -108,7 +118,15 @@ Removed:
## End of main loop
#end
+Historical list of changes: ${project.url}changes.html
+
For complete information on ${project.name}, including instructions on how to
submit bug reports,
-patches, or suggestions for improvement, see the Apache ${project.name}
website:
+patches, or suggestions for improvement, see the ${project.name} website:
${project.url}
+
+Download page: ${project.url}download_fileupload.cgi
+
+The Apache Commons Team
+
+------------------------------------------------------------------------------
diff --git a/src/site/xdoc/download_fileupload.xml
b/src/site/xdoc/download_fileupload.xml
index 007b3358..e862a7aa 100644
--- a/src/site/xdoc/download_fileupload.xml
+++ b/src/site/xdoc/download_fileupload.xml
@@ -7,7 +7,7 @@ The ASF licenses this file to You under the Apache License,
Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -56,10 +56,12 @@ limitations under the License.
| |
+======================================================================+
-->
-<document>
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0
https://maven.apache.org/xsd/xdoc-2.0.xsd";>
<properties>
<title>Download Apache Commons FileUpload</title>
- <author email="d...@commons.apache.org">Apache Commons Documentation
Team</author>
+ <author email="d...@commons.apache.org">Apache Commons Team</author>
</properties>
<body>
<section name="Download Apache Commons FileUpload">
@@ -79,7 +81,7 @@ limitations under the License.
mirrors (at the end of the mirrors list) that should be
available.
<br></br>
- [if-any logo]<a href="[link]"><img align="right" src="[logo]"
border="0"></img></a>[end]
+ [if-any logo]<a href="[link]"><img align="right" src="[logo]"
border="0" alt="Logo"></img></a>[end]
</p>
<form action="[location]" method="get" id="SelectMirror">
diff --git a/src/site/xdoc/issue-tracking.xml b/src/site/xdoc/issue-tracking.xml
index 6214ae72..a2ee9155 100644
--- a/src/site/xdoc/issue-tracking.xml
+++ b/src/site/xdoc/issue-tracking.xml
@@ -7,7 +7,7 @@ The ASF licenses this file to You under the Apache License,
Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -41,10 +41,12 @@ limitations under the License.
| |
+======================================================================+
-->
-<document>
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0
https://maven.apache.org/xsd/xdoc-2.0.xsd";>
<properties>
<title>Apache Commons FileUpload Issue tracking</title>
- <author email="d...@commons.apache.org">Apache Commons Documentation
Team</author>
+ <author email="d...@commons.apache.org">Apache Commons Team</author>
</properties>
<body>
@@ -64,6 +66,7 @@ limitations under the License.
<p>
If you would like to report a bug, or raise an enhancement request with
Apache Commons FileUpload please do the following:
+ </p>
<ol>
<li><a
href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310476&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4";>Search
existing open bugs</a>.
If you find your issue listed then please add a comment with your
details.</li>
@@ -73,16 +76,15 @@ limitations under the License.
<li>Submit either a <a
href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310476&issuetype=1&priority=4&assignee=-1";>bug
report</a>
or <a
href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310476&issuetype=4&priority=4&assignee=-1";>enhancement
request</a>.</li>
</ol>
- </p>
<p>
Please also remember these points:
+ </p>
<ul>
<li>the more information you provide, the better we can help you</li>
<li>test cases are vital, particularly for any proposed
enhancements</li>
<li>the developers of Apache Commons FileUpload are all unpaid
volunteers</li>
</ul>
- </p>
<p>
For more information on creating patches see the
@@ -91,12 +93,12 @@ limitations under the License.
<p>
You may also find these links useful:
+ </p>
<ul>
<li><a
href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310476&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4";>All
Open Apache Commons FileUpload bugs</a></li>
<li><a
href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310476&sorter/field=issuekey&sorter/order=DESC&status=5&status=6";>All
Resolved Apache Commons FileUpload bugs</a></li>
<li><a
href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310476&sorter/field=issuekey&sorter/order=DESC";>All
Apache Commons FileUpload bugs</a></li>
</ul>
- </p>
</section>
</body>
</document>
diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml
index 5703d544..439627ca 100644
--- a/src/site/xdoc/mail-lists.xml
+++ b/src/site/xdoc/mail-lists.xml
@@ -7,7 +7,7 @@ The ASF licenses this file to You under the Apache License,
Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -39,10 +39,12 @@ limitations under the License.
| |
+======================================================================+
-->
-<document>
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0
https://maven.apache.org/xsd/xdoc-2.0.xsd";>
<properties>
<title>Apache Commons FileUpload Mailing Lists</title>
- <author email="d...@commons.apache.org">Apache Commons Documentation
Team</author>
+ <author email="d...@commons.apache.org">Apache Commons Team</author>
</properties>
<body>
@@ -53,10 +55,10 @@ limitations under the License.
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,
for example:
- <ul>
- <li>[fileupload] Problem with the ...</li>
- </ul>
</p>
+ <ul>
+ <li>[fileupload] Problem with the ...</li>
+ </ul>
<p>
Questions related to the usage of Apache Commons FileUpload should be
posted to the
<a
href="https://lists.apache.org/list.html?u...@commons.apache.org";>User List</a>.
