This is an automated email from the ASF dual-hosted git repository.
ChristopherSchultz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 946ba68fef Align embedded distribution ZIP with other archive formats
946ba68fef is described below
commit 946ba68fefaf241f84cbfe0c5361bf99b1a1cabc
Author: Christopher Schultz <[email protected]>
AuthorDate: Thu Oct 15 13:37:41 2026 +0100
Align embedded distribution ZIP with other archive formats
Put all files into a directory matching the release version number
---
build.xml | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 0af0468a8a..2305c90012 100644
--- a/build.xml
+++ b/build.xml
@@ -1892,13 +1892,13 @@
<zip destfile="${tomcat.embed}/${final.name}-embed.zip"
modificationtime="${tstamp.iso.release}"
encoding="UTF8">
- <fileset dir="${tomcat.embed}">
+ <zipfileset dir="${tomcat.embed}" prefix="${final.name}-embed">
<include name="**" />
<exclude name="*.asc" />
<exclude name="*.sha512" />
<exclude name="*.zip" />
<exclude name="*.tar.gz" />
- </fileset>
+ </zipfileset>
</zip>
<hashAndSign file="${tomcat.embed}/${final.name}-embed.zip" />
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 664c31e0a1..af6936534a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -753,6 +753,9 @@
<update>
Update Checkstyle to 14.1.0. (markt)
</update>
+ <update>
+ Add directory prefix to embedded ZIP packaging. (schultz)
+ </update>
<!-- Entries for backport and removal before 12.0.0-M1 below this line
-->
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
