You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/10/20 20:05:06 UTC
[tomcat] branch 8.5.x updated: Fix
https://bz.apache.org/bugzilla/show_bug.cgi?id=63826
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
The following commit(s) were added to refs/heads/8.5.x by this push:
new 1ec84d4 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63826
1ec84d4 is described below
commit 1ec84d408b795210c46a5348de3f22e16f259af4
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 c274aab..f8c7d62 100644
--- a/build.xml
+++ b/build.xml
@@ -2379,6 +2379,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>
@@ -2404,6 +2406,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 fa45ae4..9116dcf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -75,6 +75,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 8.5.47 (markt)" rtext="release in progress">
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org