[xmlsectool] 02/03: XSTJ-52 do not depend on or bundle "endorsed" XML parsers

Ian Young ian at iay.org.uk
Thu Oct 29 14:42:29 EDT 2015


This is an automated email from the git hooks/post-receive script.

iay pushed a commit to branch master
in repository xmlsectool.

commit a150984fc4b2e36bc73ee48ff6a7d097c3d484e9
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Oct 29 18:39:05 2015 +0000

    XSTJ-52 do not depend on or bundle "endorsed" XML parsers
---
 pom.xml                     | 20 --------------------
 src/main/assembly/bin.xml   | 13 +------------
 src/main/bash/xmlsectool.sh |  2 +-
 3 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5609457..a7f65b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,26 +96,6 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${xerces.groupId}</groupId>
-            <artifactId>xml-apis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${xerces.groupId}</groupId>
-            <artifactId>xercesImpl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${xerces.groupId}</groupId>
-            <artifactId>serializer</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${xmlresolver.groupId}</groupId>
-            <artifactId>xml-resolver</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${xalan.groupId}</groupId>
-            <artifactId>xalan</artifactId>
-        </dependency>
     </dependencies>
 
     <profiles>
diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml
index 267770d..bfb3603 100644
--- a/src/main/assembly/bin.xml
+++ b/src/main/assembly/bin.xml
@@ -2,7 +2,7 @@
 
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd" >
-          
+
 	<id>bin</id>
 	<formats>
 		<format>zip</format>
@@ -18,17 +18,6 @@
 				<include>*:jar:*</include>
 			</includes>
 		</dependencySet>
-		<dependencySet>
-			<outputDirectory>/lib/endorsed</outputDirectory>
-            <directoryMode>774</directoryMode>
-            <fileMode>444</fileMode>
-			<scope>runtime</scope>
-            <includes>
-                <include>org.apache.xerces:*</include>
-                <include>xalan:*</include>
-                <include>xml-resolver:*</include>
-            </includes>
-		</dependencySet>
 	</dependencySets>
 
 	<fileSets>
diff --git a/src/main/bash/xmlsectool.sh b/src/main/bash/xmlsectool.sh
index 6193857..0271b34 100755
--- a/src/main/bash/xmlsectool.sh
+++ b/src/main/bash/xmlsectool.sh
@@ -46,4 +46,4 @@ do
     fi
 done
 
-"$JAVACMD" '-Xmx256m' '-classpath' "$LOCALCLASSPATH" '-Djava.endorsed.dirs='"$LIBDIR/endorsed" $JVMOPTS '-Dedu.internet2.middleware.security.XmlSecTool.home='"$LOCATION" 'edu.internet2.middleware.security.XmlSecTool' "$@"
\ No newline at end of file
+"$JAVACMD" '-Xmx256m' '-classpath' "$LOCALCLASSPATH" $JVMOPTS '-Dedu.internet2.middleware.security.XmlSecTool.home='"$LOCATION" 'edu.internet2.middleware.security.XmlSecTool' "$@"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list