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
commit 73b16c1a80c2172185095e68d3a526e218aae0d7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Aug 15 19:44:29 2019 +0100
Drop use of filesonly
This aligns 7.0.x with later versions where it was dropped as it caused
issues for some applications when scanning JARs
---
build.xml | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/build.xml b/build.xml
index 37f0b11..ffc0d6e 100644
--- a/build.xml
+++ b/build.xml
@@ -841,7 +841,7 @@
fullpath="META-INF/LICENSE" />
</jar>
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar"
- manifest="${tomcat.manifests}/default.manifest" filesonly="true">
+ manifest="${tomcat.manifests}/default.manifest">
<fileset dir="${tomcat.classes}">
<include name="**/LocalStrings_es.properties" />
</fileset>
@@ -851,7 +851,7 @@
fullpath="META-INF/LICENSE" />
</jar>
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-fr.jar"
- manifest="${tomcat.manifests}/default.manifest" filesonly="true">
+ manifest="${tomcat.manifests}/default.manifest">
<fileset dir="${tomcat.classes}">
<include name="**/LocalStrings_fr.properties" />
</fileset>
@@ -861,7 +861,7 @@
fullpath="META-INF/LICENSE" />
</jar>
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-ja.jar"
- manifest="${tomcat.manifests}/default.manifest" filesonly="true">
+ manifest="${tomcat.manifests}/default.manifest">
<fileset dir="${tomcat.classes}">
<include name="**/LocalStrings_ja.properties" />
</fileset>
@@ -1737,8 +1737,7 @@
inheritAll="false" target="compile" />
<jar jarfile="${tomcat-juli-extras.jar}"
- manifest="${tomcat.manifests}/default.manifest"
- filesonly="true">
+ manifest="${tomcat.manifests}/default.manifest">
<fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/target/classes">
<include name="org/apache/juli/logging/*" />
<include name="org/apache/juli/logging/impl/LogFactoryImpl*.class" />
@@ -1770,8 +1769,7 @@
<!-- Source JARs -->
<jar jarfile="${tomcat-juli-extras-src.jar}"
- manifest="${tomcat.manifests}/default.manifest"
- filesonly="true">
+ manifest="${tomcat.manifests}/default.manifest">
<fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/main/java">
<include name="org/apache/juli/logging/*.java" />
<include name="org/apache/juli/logging/impl/LogFactoryImpl*.java" />
@@ -1880,8 +1878,7 @@
description="Embedded packaging for those extras that can use it">
<jar jarfile="${tomcat-embed-log4j.jar}"
- manifest="${tomcat.manifests}/default.manifest"
- filesonly="true">
+ manifest="${tomcat.manifests}/default.manifest">
<fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/target/classes">
<include name="org/apache/juli/logging/*" />
<include name="org/apache/juli/logging/impl/*" />
@@ -1902,8 +1899,7 @@
</jar>
<jar jarfile="${tomcat-embed-log4j-src.jar}"
- manifest="${tomcat.manifests}/default.manifest"
- filesonly="true">
+ manifest="${tomcat.manifests}/default.manifest">
<fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/main/java">
<include name="org/apache/juli/logging/*.java" />
<include name="org/apache/juli/logging/impl/*.java" />
@@ -2157,8 +2153,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
</copy>
<!-- Digester and dependencies -->
- <jar jarfile="${tomcat.deployer}/lib/catalina-deployer.jar"
- filesonly="true">
+ <jar jarfile="${tomcat.deployer}/lib/catalina-deployer.jar">
<fileset dir="${tomcat.classes}">
<include name="org/apache/catalina/startup/DigesterFactory.class" />
<include name="org/apache/catalina/util/SchemaResolver.class" />
@@ -3265,7 +3260,7 @@ Read the Building page on the Apache Tomcat documentation
site for details on ho
<attribute name="meta-inf" description="additional contents for META-INF"
default="${tomcat.manifests}/default" />
<sequential>
- <jar jarfile="@{jarfile}" manifest="@{manifest}" filesonly="true">
+ <jar jarfile="@{jarfile}" manifest="@{manifest}">
<fileset dir="@{filesDir}">
<patternset refid="@{filesId}"/>
<!-- Javadoc and i18n exclusions -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
