[java-shib-common COMMIT] in /branches/REL_1: pom.xml src/test/resources/data/edu/internet2/middleware/shibboleth/com...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Oct 17 18:32:56 2014
New Revision: 1107

URL: http://svn.shibboleth.net/view/java-shib-common?rev=1107&view=rev
Log:
SIDP-619 - Remove Xerces/Xalan dependencies, bump xmlsec version, fix non-portable unit tests

Modified:
    branches/REL_1/pom.xml
    branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/base-config.xml

Modified: branches/REL_1/pom.xml
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/pom.xml?rev=1107&r1=1106&r2=1107&view=diff
==============================================================================
--- branches/REL_1/pom.xml (original)
+++ branches/REL_1/pom.xml Fri Oct 17 18:32:56 2014
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.shibboleth</groupId>
         <artifactId>parent-v2</artifactId>
-        <version>2</version>
+        <version>TRUNK-SNAPSHOT</version>
     </parent>
 
     <groupId>edu.internet2.middleware</groupId>
@@ -149,11 +149,9 @@
             <groupId>org.codehaus.janino</groupId>
             <artifactId>janino</artifactId>
         </dependency>
-        <!-- TODO: overrides parent POM managed version.  Remove when appropriate. -->
         <dependency>
             <groupId>org.apache.santuario</groupId>
             <artifactId>xmlsec</artifactId>
-            <version>1.5.6</version>
         </dependency>
         
 
@@ -181,26 +179,6 @@
                     <artifactId>ant</artifactId>
                 </exclusion>
             </exclusions>
-        </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>xml-resolver</groupId>
-            <artifactId>xml-resolver</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${xalan.groupId}</groupId>
-            <artifactId>xalan</artifactId>
         </dependency>
 
         <!-- Test dependencies -->

Modified: branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/base-config.xml
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/base-config.xml?rev=1107&r1=1106&r2=1107&view=diff
==============================================================================
--- branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/base-config.xml (original)
+++ branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/base-config.xml Fri Oct 17 18:32:56 2014
@@ -57,7 +57,7 @@
                     <key>
                         <value>http://apache.org/xml/properties/security-manager</value>
                     </key>
-                    <bean id="shibboleth.XercesSecurityManager" class="org.apache.xerces.util.SecurityManager"/>
+                    <bean class="com.sun.org.apache.xerces.internal.util.SecurityManager"/>
                 </entry>
             </map>
         </property>