This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push: new e3f18d5 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63826 e3f18d5 is described below commit e3f18d5d8f5667200cab034596d81a9b5db604b4 Author: Mark Thomas <ma...@apache.org> AuthorDate: Sun Oct 20 20:14:53 2019 +0100 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. --- build.xml | 4 ++++ webapps/docs/changelog.xml | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/build.xml b/build.xml index 020531c..c87c744 100644 --- a/build.xml +++ b/build.xml @@ -2367,6 +2367,8 @@ skip.installer property in build.properties" /> <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 @@ skip.installer property in build.properties" /> <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"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org