[tor-commits] [collector/master] Don't add META-DATA files from other jars to the collector jar.

[karsten@xxxxxxxxxxxxxx]

commit 7517480e4475f35730c560cab5dadcfbfc011118
Author: iwakeh <iwakeh@xxxxxxxxxxxxxx>
Date:   Wed Jul 20 16:23:13 2016 +0200

    Don't add META-DATA files from other jars to the collector jar.
---
 build.xml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index ba50fbf..eccae8b 100644
--- a/build.xml
+++ b/build.xml
@@ -141,9 +141,18 @@
         <include name="collector.properties"/>
         <include name="logback.xml"/>
       </fileset>
-      <zipgroupfileset dir="${libs}" >
-        <patternset refid="runtime" />
-      </zipgroupfileset>
+      <restrict>
+        <not>
+          <name name="META-INF/*" />
+        </not>
+        <archives>
+          <zips>
+            <fileset dir="${libs}">
+              <patternset refid="runtime" />
+            </fileset>
+          </zips>
+        </archives>
+      </restrict>
       <manifest>
         <attribute name="Created-By" value="The Tor Project" />
         <attribute name="Implementation-Title" value="${name}"/>



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits