You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2012/03/29 11:31:00 UTC

svn commit: r1306767 - in /cxf/trunk: parent/pom.xml services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java

Author: coheigea
Date: Thu Mar 29 09:31:00 2012
New Revision: 1306767

URL: http://svn.apache.org/viewvc?rev=1306767&view=rev
Log:
Downgrading to WSS4J 1.6.5 as 1.6.6 won't be released in time for CXF 2.6

Modified:
    cxf/trunk/parent/pom.xml
    cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1306767&r1=1306766&r2=1306767&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Thu Mar 29 09:31:00 2012
@@ -123,7 +123,7 @@
         <cxf.xpp3.bundle.version>1.1.4c_6</cxf.xpp3.bundle.version>
         <cxf.axiom.version>1.2.10</cxf.axiom.version>
         <cxf.jettison.version>1.3.1</cxf.jettison.version>
-        <cxf.wss4j.version>1.6.6-SNAPSHOT</cxf.wss4j.version>
+        <cxf.wss4j.version>1.6.5</cxf.wss4j.version>
         <cxf.joda.time.version>1.6.2</cxf.joda.time.version>
         <cxf.opensaml.version>2.5.1</cxf.opensaml.version>
         <cxf.opensamlws.version>1.4.2-1</cxf.opensamlws.version>

Modified: cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java?rev=1306767&r1=1306766&r2=1306767&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java (original)
+++ cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java Thu Mar 29 09:31:00 2012
@@ -105,8 +105,10 @@ public class SAMLProviderCustomTest exte
     
     /**
      * Create a custom Saml1 Authentication Assertion.
+     * TODO re-enable when we pick up WSS4J 1.6.5.
      */
     @org.junit.Test
+    @org.junit.Ignore
     public void testCustomSaml1AuthenticationAssertion() throws Exception {
         TokenProvider samlTokenProvider = new SAMLTokenProvider();
         TokenProviderParameters providerParameters =