This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 16b8b904bd Commons FileUpload 1.6.0-RC1 has been tagged.
16b8b904bd is described below
commit 16b8b904bd1019c03a19e1c1821908f6b61bf007
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 5 15:53:22 2025 +0100
Commons FileUpload 1.6.0-RC1 has been tagged.
No code changes since last merge so just update details of latest merged
commit
---
MERGE.txt | 2 +-
webapps/docs/changelog.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index 66b5070ab8..794422d3e0 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:
-f1028401e3d59bd42aee9ab4d26995991db1aadc (2025-06-05)
+commons-fileupload-1.6.0-RC1 (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 6261e5c4db..c56951eabc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -179,8 +179,8 @@
Patch provided by Felix Zhang. (schultz)
</fix>
<update>
- Update the internal fork of Apache Commons FileUpload to f102840
- (2023-06-05, 1.x-SNAPSHOT). (markt)
+ Update the internal fork of Apache Commons FileUpload to 1.6.0-RC1
+ (2025-06-05). (markt)
</update>
<update>
Update EasyMock to 5.6.0. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
