Sign conflicting JAR file

eXist-db · Jun 24, 2018 · 4ab1669 · 4ab1669
1 parent a3ea07f
commit 4ab1669
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/build/scripts/jarsigner.xml b/build/scripts/jarsigner.xml
@@ -62,6 +62,9 @@
             <fileset dir="lib/extensions">
                 <include name="*.jar"/>
             </fileset>
+            <fileset dir="tools/jetty/lib">
+                <include name="javax.annotation-api-*.jar"/>
+            </fileset>        
         </signjar>
     </target>
 
@@ -134,6 +137,9 @@
             <fileset dir="lib/extensions" erroronmissingdir="false">
                 <include name="*.jar"/>
             </fileset>
+            <fileset dir="tools/jetty/lib">
+                <include name="javax.annotation-api-*.jar"/>
+            </fileset>  
         </unsignjar>
     </target>
 
@@ -181,7 +187,7 @@
             </fileset>
             <fileset dir="lib/core">
                 <include name="*.jar"/>
-            </fileset>
+            </fileset> 
         </pack>
     </target>