[java-opensaml2 COMMIT] in /branches/REL_2: pom.xml src/test/java/org/opensaml/saml1/binding/encoding/HTTPPostEncoder...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Oct 17 18:32:44 2014
New Revision: 1674

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1674&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/test/java/org/opensaml/saml1/binding/encoding/HTTPPostEncoderTest.java
    branches/REL_2/src/test/java/org/opensaml/saml1/binding/encoding/HTTPSOAP11EncoderTest.java
    branches/REL_2/src/test/java/org/opensaml/saml2/binding/encoding/HTTPPostEncoderTest.java
    branches/REL_2/src/test/java/org/opensaml/saml2/binding/encoding/HTTPPostSimpleSignEncoderTest.java
    branches/REL_2/src/test/java/org/opensaml/saml2/binding/encoding/HTTPRedirectDeflateEncoderTest.java
    branches/REL_2/src/test/java/org/opensaml/saml2/binding/encoding/HTTPSOAP11EncoderTest.java
    branches/REL_2/src/test/resources/data/org/opensaml/saml2/metadata/impl/AffiliationDescriptorOptionalAttributes.xml
    branches/REL_2/src/test/resources/data/org/opensaml/saml2/metadata/impl/AuthnAuthorityDescriptorOptionalAttributes.xml
    branches/REL_2/src/test/resources/data/org/opensaml/saml2/metadata/impl/EntitiesDescriptorOptionalAttributes.xml
    branches/REL_2/src/test/resources/data/org/opensaml/saml2/metadata/impl/EntitiesDescriptorWithCacheDuration.xml
    branches/REL_2/src/test/resources/data/org/opensaml/saml2/metadata/impl/EntityDescriptorOptionalAttributes.xml
    branches/REL_2/src/test/resources/data/org/opensaml/saml2/metadata/impl/IDPSSODescriptorOptionalAttributes.xml
    branches/REL_2/src/test/resources/data/org/opensaml/saml2/metadata/impl/PDPDescriptorOptionalAttributes.xml
    branches/REL_2/src/test/resources/data/org/opensaml/saml2/metadata/impl/SPSSODescriptorOptionalAttributes.xml

Modified: branches/REL_2/pom.xml
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/pom.xml?rev=1674&r1=1673&r2=1674&view=diff
==============================================================================
--- branches/REL_2/pom.xml (original)
+++ branches/REL_2/pom.xml Fri Oct 17 18:32:44 2014
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.shibboleth</groupId>
         <artifactId>parent-v2</artifactId>
-        <version>2</version>
+        <version>TRUNK-SNAPSHOT</version>
     </parent>
     
     <groupId>org.opensaml</groupId>
@@ -113,11 +113,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 -->
@@ -127,26 +125,6 @@
         </dependency>
         
         <!-- Runtime dependencies -->
-        <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 -->
         <dependency>

Modified: branches/REL_2/src/test/java/org/opensaml/saml1/binding/encoding/HTTPPostEncoderTest.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/test/java/org/opensaml/saml1/binding/encoding/HTTPPostEncoderTest.java?rev=1674&r1=1673&r2=1674&view=diff
==============================================================================
--- branches/REL_2/src/test/java/org/opensaml/saml1/binding/encoding/HTTPPostEncoderTest.java (original)
+++ branches/REL_2/src/test/java/org/opensaml/saml1/binding/encoding/HTTPPostEncoderTest.java Fri Oct 17 18:32:44 2014
@@ -82,6 +82,6 @@
         assertEquals("Unexpected content type", "text/html", response.getContentType());
         assertEquals("Unexpected character encoding", response.getCharacterEncoding(), "UTF-8");
         assertEquals("Unexpected cache controls", "no-cache, no-store", response.getHeader("Cache-control"));
-        assertEquals(1849646075, response.getContentAsString().hashCode());
+        assertEquals(2014741896, response.getContentAsString().hashCode());
     }
 }

Modified: branches/REL_2/src/test/java/org/opensaml/saml1/binding/encoding/HTTPSOAP11EncoderTest.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/test/java/org/opensaml/saml1/binding/encoding/HTTPSOAP11EncoderTest.java?rev=1674&r1=1673&r2=1674&view=diff
==============================================================================

[... 185 lines stripped ...]