[tomcat] 02/04: Repeatable builds: Always use UTF-8 rather than platform encoding

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit a0cc710d9081a49955570a6de7c037ed71915a95
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 23 19:23:05 2021 +0000

    Repeatable builds: Always use UTF-8 rather than platform encoding
---
 build.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 3da50de..d5c9486 100644
--- a/build.xml
+++ b/build.xml
@@ -1390,7 +1390,8 @@
       <fileset dir="${tomcat.embed}"/>
     </touch>
 
-    <zip destfile="${tomcat.embed}/${final.name}-embed.zip">
+    <zip destfile="${tomcat.embed}/${final.name}-embed.zip"
+         encoding="UTF8">
       <fileset dir="${tomcat.embed}">
         <include name="**" />
         <exclude name="*.asc" />
@@ -2395,7 +2396,8 @@ skip.installer property in build.properties" />
       <fileset dir="${tomcat.dist}"/>
     </touch>
 
-    <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}.zip">
+    <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}.zip"
+         encoding="UTF8">
       <zipfileset file="${tomcat.dist}" fullpath="${final.name}"/>
       <zipfileset dir="${tomcat.dist}" prefix="${final.name}">
         <include name="bin/**"/>
@@ -2435,7 +2437,8 @@ skip.installer property in build.properties" />
     </touch>
 
     <!-- Windows x86 package -->
-    <zip 
zipfile="${tomcat.release}/v${version}/bin/${final.name}-windows-x86.zip">
+    <zip 
zipfile="${tomcat.release}/v${version}/bin/${final.name}-windows-x86.zip"
+         encoding="UTF8">
       <zipfileset file="${tomcat.dist}" fullpath="${final.name}"/>
       <zipfileset dir="${tomcat.dist}" prefix="${final.name}">
         <include name="bin/**"/>
@@ -2461,7 +2464,8 @@ skip.installer property in build.properties" />
     <hashAndSign 
file="${tomcat.release}/v${version}/bin/${final.name}-windows-x86.zip" />
 
     <!-- Windows x64 package -->
-    <zip 
zipfile="${tomcat.release}/v${version}/bin/${final.name}-windows-x64.zip">
+    <zip 
zipfile="${tomcat.release}/v${version}/bin/${final.name}-windows-x64.zip"
+         encoding="UTF8">
       <zipfileset file="${tomcat.dist}" fullpath="${final.name}"/>
       <zipfileset dir="${tomcat.dist}" prefix="${final.name}">
         <include name="bin/**"/>
@@ -2509,7 +2513,8 @@ skip.installer property in build.properties" />
       <fileset dir="${tomcat.deployer}"/>
     </touch>
 
-    <zip 
zipfile="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip">
+    <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip"
+         encoding="UTF8">
       <zipfileset file="${tomcat.deployer}" fullpath="${final.name}-deployer"/>
       <zipfileset dir="${tomcat.deployer}" prefix="${final.name}-deployer" 
includes="**" />
       <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer" 
includes="LICENSE" />
@@ -2644,7 +2649,8 @@ skip.installer property in build.properties" />
       <fileset dir="${tomcat.dist}"/>
     </touch>
 
-    <zip zipfile="${tomcat.release}/v${version}/src/${final-src.name}.zip">
+    <zip zipfile="${tomcat.release}/v${version}/src/${final-src.name}.zip"
+         encoding="UTF8">
       <zipfileset file="${tomcat.dist}/src" fullpath="${final-src.name}" />
       <zipfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" />
     </zip>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org