This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 3f68d96ba7 FileUpload 1.6.0-RC1 was released
3f68d96ba7 is described below
commit 3f68d96ba750cc79cdfac71956ac4dd63986e555
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sat Jun 7 09:44:55 2025 +0100
FileUpload 1.6.0-RC1 was released
---
MERGE.txt | 2 +-
webapps/docs/changelog.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index 794422d3e0..cb1bae66c2 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -55,7 +55,7 @@ Branch: 1.x
Sub-tree:
src/main/java/org/apache/commons/fileupload
The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-commons-fileupload-1.6.0-RC1 (2025-06-05)
+rel/commons-fileupload-1.6.0 (2025-06-05)
Note: Tomcat's copy of fileupload also includes classes copied manually from
Commons IO.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 597e88bd05..6c3c4b7155 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -197,7 +197,7 @@
Update Tomcat Native to 2.0.9. (markt)
</update>
<update>
- Update the internal fork of Apache Commons FileUpload to 1.6.0-RC1
+ Update the internal fork of Apache Commons FileUpload to 1.6.0
(2025-06-05). (markt)
</update>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
