All,

ASF Trusted Release is complaining that the ZIP file for Windows x86 has a root directory that doesn't match the filename:

"
Root directory mismatch. Expected 'apache-tomcat-10.1.47-windows-x86', found 'apache-tomcat-10.1.47'
"

Indeed:

$ unzip -v bin/apache-tomcat-10.1.47-windows-x86.zip

Archive:  bin/apache-tomcat-10.1.47-windows-x86.zip
 Length   Method    Size  Cmpr    Date    Time   CRC-32   Name
--------  ------  ------- ---- ---------- ----- --------  ----
0 Stored 0 0% 10-02-2025 12:03 00000000 apache-tomcat-10.1.47/ 0 Stored 0 0% 10-02-2025 12:03 00000000 apache-tomcat-10.1.47/bin/ 0 Stored 0 0% 10-02-2025 12:03 00000000 apache-tomcat-10.1.47/conf/ 0 Stored 0 0% 10-02-2025 12:03 00000000 apache-tomcat-10.1.47/lib/ 0 Stored 0 0% 10-02-2025 12:03 00000000 apache-tomcat-10.1.47/logs/ 0 Stored 0 0% 10-02-2025 12:03 00000000 apache-tomcat-10.1.47/temp/ 0 Stored 0 0% 10-02-2025 12:03 00000000 apache-tomcat-10.1.47/webapps/
[ ... ]
tomcat-10.1.47/webapps/manager/index.jsp
4458 Defl:N 1029 77% 10-02-2025 12:03 a298b995 apache-tomcat-10.1.47/webapps/manager/status.xsd 4849 Defl:N 1311 73% 10-02-2025 12:03 ead850b3 apache-tomcat-10.1.47/webapps/manager/xform.xsl
--------          -------  ---                            -------
21898312         15518499  29%                            755 files

The same is true for the -x64 release as well.

Do we care? If someone were to unzip both of the files into the same output directory, the last one would win, meaning that e.g. the x86 binaries would overwrite the x64 binaries. None of the other files really matter, as they are all cross-platform.

I have a slight preference towards adjusting our build to match RAT expectations. So something like this:

diff --git a/build.xml b/build.xml
index 62e4cb815c..ee00261e9b 100644
--- a/build.xml
+++ b/build.xml
@@ -3082,8 +3082,8 @@ Configured for ${release.asfusername} to release Tomcat ${version.major}.${versi <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-windows-x64.zip"
          modificationtime="${tstamp.iso.release}"
          encoding="UTF8">
-      <zipfileset file="${tomcat.dist}" fullpath="${final.name}"/>
-      <zipfileset dir="${tomcat.dist}" prefix="${final.name}">
+ <zipfileset file="${tomcat.dist}" fullpath="${final.name}-windows-x64"/>
+      <zipfileset dir="${tomcat.dist}" prefix="${final.name}-windows-x64">
         <include name="bin/**"/>
         <include name="conf/**"/>
         <include name="logs/**"/>

... and the same for x86 which isn't in main so I don't have a diff for it at the moment.

-chris


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to