[java-shib-idp2 COMMIT] in /branches/REL_2: pom.xml src/main/assembly/bin.xml src/test/resources/data/conf1/internal....

[noreply at shibboleth.net]

Author: scantor
Date: Fri Oct 17 18:32:47 2014
New Revision: 3200

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

Modified:
    branches/REL_2/pom.xml
    branches/REL_2/src/main/assembly/bin.xml
    branches/REL_2/src/test/resources/data/conf1/internal.xml
    branches/REL_2/src/tools/bash/aacli.sh

Modified: branches/REL_2/pom.xml
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/pom.xml?rev=3200&r1=3199&r2=3200&view=diff
==============================================================================
--- branches/REL_2/pom.xml (original)
+++ branches/REL_2/pom.xml Fri Oct 17 18:32:47 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>
@@ -98,11 +98,9 @@
             <groupId>joda-time</groupId>
             <artifactId>joda-time</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>
 
         <!-- Provided dependencies -->
@@ -140,26 +138,6 @@
             <artifactId>shibboleth-jce</artifactId>
             <version>1.1.0</version>
             <scope>runtime</scope>
-        </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_2/src/main/assembly/bin.xml
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/main/assembly/bin.xml?rev=3200&r1=3199&r2=3200&view=diff
==============================================================================
--- branches/REL_2/src/main/assembly/bin.xml (original)
+++ branches/REL_2/src/main/assembly/bin.xml Fri Oct 17 18:32:47 2014
@@ -43,17 +43,6 @@
                 <include>ant-contrib:*</include>
                 <include>net.shibboleth.tool:ant-extensions:*</include>
                 <include>org.bouncycastle:*</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/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>

Modified: branches/REL_2/src/test/resources/data/conf1/internal.xml
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/test/resources/data/conf1/internal.xml?rev=3200&r1=3199&r2=3200&view=diff
==============================================================================
--- branches/REL_2/src/test/resources/data/conf1/internal.xml (original)
+++ branches/REL_2/src/test/resources/data/conf1/internal.xml Fri Oct 17 18:32:47 2014
@@ -54,7 +54,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>

Modified: branches/REL_2/src/tools/bash/aacli.sh
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/tools/bash/aacli.sh?rev=3200&r1=3199&r2=3200&view=diff
==============================================================================
--- branches/REL_2/src/tools/bash/aacli.sh (original)
+++ branches/REL_2/src/tools/bash/aacli.sh Fri Oct 17 18:32:47 2014
@@ -41,4 +41,4 @@
     fi
 done
 
-"$JAVACMD" '-classpath' "$LOCALCLASSPATH" '-Djava.endorsed.dirs='"$LIBDIR/endorsed" 'edu.internet2.middleware.shibboleth.common.attribute.AttributeAuthorityCLI' "$@"
+"$JAVACMD" '-classpath' "$LOCALCLASSPATH" 'edu.internet2.middleware.shibboleth.common.attribute.AttributeAuthorityCLI' "$@"