All,
If you do a release build today and then:
$ tar tvzf bin/embed/apache-tomcat-10.1.47-embed.tar.gz
-rw-r--r-- 0 0 0 60393 Oct 2 08:03
apache-tomcat-10.1.47-embed/LICENSE
-rw-r--r-- 0 0 0 2333 Oct 2 08:03
apache-tomcat-10.1.47-embed/NOTICE
-rw-r--r-- 0 0 0 14237 Oct 2 08:03
apache-tomcat-10.1.47-embed/annotations-api.jar
-rw-r--r-- 0 0 0 3160927 Oct 2 08:03
apache-tomcat-10.1.47-embed/ecj-4.27.jar
-rw-r--r-- 0 0 0 348254 Oct 2 08:03
apache-tomcat-10.1.47-embed/tomcat-dbcp.jar
-rw-r--r-- 0 0 0 3650904 Oct 2 08:03
apache-tomcat-10.1.47-embed/tomcat-embed-core.jar
-rw-r--r-- 0 0 0 264304 Oct 2 08:03
apache-tomcat-10.1.47-embed/tomcat-embed-el.jar
-rw-r--r-- 0 0 0 660430 Oct 2 08:03
apache-tomcat-10.1.47-embed/tomcat-embed-jasper.jar
-rw-r--r-- 0 0 0 2354824 Oct 2 08:03
apache-tomcat-10.1.47-embed/tomcat-embed-programmatic.jar
-rw-r--r-- 0 0 0 283936 Oct 2 08:03
apache-tomcat-10.1.47-embed/tomcat-embed-websocket.jar
And then:
$ unzip -v bin/embed/apache-tomcat-10.1.47-embed.zip
Archive: bin/embed/apache-tomcat-10.1.47-embed.zip
Length Method Size Cmpr Date Time CRC-32 Name
-------- ------ ------- ---- ---------- ----- -------- ----
61536 Defl:N 16286 74% 10-02-2025 12:03 bf9108d2 LICENSE
2401 Defl:N 941 61% 10-02-2025 12:03 fc7ba3fd NOTICE
14237 Defl:N 11241 21% 10-02-2025 12:03 4622dd17
annotations-api.jar
3160927 Defl:N 3012755 5% 10-02-2025 12:03 90494674 ecj-4.27.jar
348254 Defl:N 324796 7% 10-02-2025 12:03 d57eecef tomcat-dbcp.jar
3650904 Defl:N 3413048 7% 10-02-2025 12:03 f4cde31d
tomcat-embed-core.jar
264304 Defl:N 246087 7% 10-02-2025 12:03 d70890e5
tomcat-embed-el.jar
660430 Defl:N 615412 7% 10-02-2025 12:03 9b39cc5e
tomcat-embed-jasper.jar
2354824 Defl:N 2194194 7% 10-02-2025 12:03 975189de
tomcat-embed-programmatic.jar
283936 Defl:N 257253 9% 10-02-2025 12:03 74101acf
tomcat-embed-websocket.jar
-------- ------- --- -------
10801753 10092013 7% 10 files
The tarball expands into a subdirectory matching the release, while the
ZIP file does not.
The Apache Trusted Release platform is flagging this as a packaging
error, and I tend to agree with its assessment.
The only problem is that user expectations may have been established
where the files are NOT in a subdirectory.
Does anyone have any thoughts on the above?
The patch I'm proposing is this:
diff --git a/build.xml b/build.xml
index 62e4cb815c..dfe1f770ed 100644
--- a/build.xml
+++ b/build.xml
@@ -1875,13 +1875,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" />
-chris
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
