Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63826
Remove commons-daemon-native.tar.gz and tomcat-native.tar.gz from the
binary zip distributions for Windows since compiled versions of those
components are already included within the zip distriubutions.
diff --git a/build.xml b/build.xml
index 020531c..c87c744 100644
--- a/build.xml
+++ b/build.xml
@@ -2367,6 +2367,8 @@
<include name="BUILDING.txt" />
<include name="CONTRIBUTING.md"/>
<exclude name="bin/x64/"/>
+ <exclude name="bin/commons-daemon-native.tar.gz"/>
+ <exclude name="bin/tomcat-native.tar.gz"/>
</zipfileset>
</zip>
@@ -2392,6 +2394,8 @@
<exclude name="bin/x64/"/>
<exclude name="bin/*.dll"/>
<exclude name="bin/tomcat${version.major}.exe"/>
+ <exclude name="bin/commons-daemon-native.tar.gz"/>
+ <exclude name="bin/tomcat-native.tar.gz"/>
</zipfileset>
<zipfileset dir="${tomcat.dist}/bin/x64" prefix="${final.name}/bin">
<include name="*.dll"/>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5998058..aa8e88d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -79,6 +79,16 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ <bug>63826</bug>: Remove <code>commons-daemon-native.tar.gz</code> and
+ <code>tomcat-native.tar.gz</code> from the binary zip distributions for
+ Windows since compiled versions of those components are already
+ included within the zip distriubutions. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.27 (markt)" rtext="release in progress">
<subsection name="Catalina">