Fix #3444 "Do not include xml-apis JAR"

orbeon · Feb 8, 2018 · a68420d · a68420d
1 parent 5642042
commit a68420d
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 11 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/build.xml b/build.xml
@@ -26,7 +26,7 @@
 
     <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask">
         <classpath>
-            <pathelement location="lib_ant/jarjar-1.3.jar"/>
+            <pathelement location="lib_ant/jarjar-1.4.jar"/>
         </classpath>
     </taskdef>
 
@@ -117,15 +117,11 @@
     <target name="jarjar" depends="prepare">
         <!-- Xerces fat JAR -->
         <jarjar jarfile="lib/xerces-2.11-orbeon.jar">
-            <zipfileset src="lib/src/xerces-resolver-2.11.jar">
-                <!-- Don't expose any services -->
-                <exclude name="META-INF/services/**"/>
-            </zipfileset>
-            <zipfileset src="lib/src/xerces-resolver-2.11.jar">
+            <zipfileset src="lib/src/xerces-xercesImpl-2.11.jar">
                 <!-- Don't expose any services -->
                 <exclude name="META-INF/services/**"/>
             </zipfileset>
-            <zipfileset src="lib/src/xerces-xercesImpl-2.11.jar">
+            <zipfileset src="lib/src/xerces-serializer-2.11.jar">
                 <!-- Don't expose any services -->
                 <exclude name="META-INF/services/**"/>
             </zipfileset>

diff --git a/lib/runtime/xerces-2.11-orbeon.jar b/lib/runtime/xerces-2.11-orbeon.jar
diff --git a/lib/runtime/xml-apis-1.4.01.jar b/lib/runtime/xml-apis-1.4.01.jar
diff --git a/lib/src/xerces-resolver-2.11.jar b/lib/src/xerces-resolver-2.11.jar
diff --git a/lib/src/xerces-xercesImpl-2.11.jar b/lib/src/xerces-xercesImpl-2.11.jar
diff --git a/lib_ant/jarjar-1.3.jar → lib_ant/jarjar-1.4.jar b/lib_ant/jarjar-1.3.jar → lib_ant/jarjar-1.4.jar