This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 0152437 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63826
0152437 is described below
commit 01524378e75a80e87b42cabca12109b7da4f9ad5
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 0b2b8d2..e421448 100644
--- a/build.xml
+++ b/build.xml
@@ -2526,6 +2526,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>
@@ -2551,6 +2553,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 9d45831..160ad9d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -94,6 +94,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 7.0.97 (violetagg)" rtext="not released">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
