You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by gi...@apache.org on 2011/11/03 15:03:15 UTC
svn commit: r1197124 - in /webservices/wss4j/branches/swssf: ./
bindings/ws-secureconversation-binding/ cxf-integration/
streaming-ws-policy/ streaming-ws-security/ streaming-xml-security/
streaming-xml-security/src/test/java/org/swssf/xmlsec/test/
Author: giger
Date: Thu Nov 3 14:03:14 2011
New Revision: 1197124
URL: http://svn.apache.org/viewvc?rev=1197124&view=rev
Log:
update dependencies
Modified:
webservices/wss4j/branches/swssf/bindings/ws-secureconversation-binding/pom.xml
webservices/wss4j/branches/swssf/cxf-integration/pom.xml
webservices/wss4j/branches/swssf/pom.xml
webservices/wss4j/branches/swssf/streaming-ws-policy/pom.xml
webservices/wss4j/branches/swssf/streaming-ws-security/pom.xml
webservices/wss4j/branches/swssf/streaming-xml-security/pom.xml
webservices/wss4j/branches/swssf/streaming-xml-security/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamReaderTest.java
Modified: webservices/wss4j/branches/swssf/bindings/ws-secureconversation-binding/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/bindings/ws-secureconversation-binding/pom.xml?rev=1197124&r1=1197123&r2=1197124&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/bindings/ws-secureconversation-binding/pom.xml (original)
+++ webservices/wss4j/branches/swssf/bindings/ws-secureconversation-binding/pom.xml Thu Nov 3 14:03:14 2011
@@ -18,18 +18,18 @@
<cobertura.skip>true</cobertura.skip>
</properties>
- <dependencies>
- <dependency>
+ <dependencies>
+ <dependency>
<groupId>org.swssf</groupId>
<artifactId>xmldsig-binding</artifactId>
<version>1.0.0</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.swssf</groupId>
<artifactId>wss10-binding</artifactId>
<version>1.0.0</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.swssf</groupId>
<artifactId>wsu10-binding</artifactId>
<version>1.0.0</version>
@@ -69,12 +69,12 @@
doesn't respect the catalog and will do online lookups :-( -->
<strict>false</strict>
<args>
- <arg>-Xinheritance</arg>
+ <arg>-Xinheritance</arg>
</args>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>jaxb2-basics</artifactId>
+ <artifactId>jaxb2-basics</artifactId>
<version>0.6.3</version>
</plugin>
</plugins>
Modified: webservices/wss4j/branches/swssf/cxf-integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/cxf-integration/pom.xml?rev=1197124&r1=1197123&r2=1197124&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/cxf-integration/pom.xml (original)
+++ webservices/wss4j/branches/swssf/cxf-integration/pom.xml Thu Nov 3 14:03:14 2011
@@ -15,7 +15,7 @@
<name>Streaming WS Security CXF Integration</name>
<properties>
- <cxf.version>2.4.2</cxf.version>
+ <cxf.version>2.4.3</cxf.version>
</properties>
<dependencies>
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.14.2</version>
+ <version>5.14.10</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: webservices/wss4j/branches/swssf/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/pom.xml?rev=1197124&r1=1197123&r2=1197124&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/pom.xml (original)
+++ webservices/wss4j/branches/swssf/pom.xml Thu Nov 3 14:03:14 2011
@@ -18,15 +18,15 @@
<modules>
<module>bindings</module>
- <module>streaming-xml-security</module>
- <module>streaming-ws-security</module>
- <module>streaming-ws-policy</module>
- <module>cxf-integration</module>
+ <module>streaming-xml-security</module>
+ <module>streaming-ws-security</module>
+ <module>streaming-ws-policy</module>
+ <module>cxf-integration</module>
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <xmlsec.version>1.4.4</xmlsec.version>
+ <xmlsec.version>1.4.6</xmlsec.version>
</properties>
<dependencyManagement>
@@ -41,6 +41,11 @@
<artifactId>xmlsec</artifactId>
<version>${xmlsec.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <version>4.1.2</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/pom.xml?rev=1197124&r1=1197123&r2=1197124&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/pom.xml (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/pom.xml Thu Nov 3 14:03:14 2011
@@ -49,13 +49,13 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.14.2</version>
+ <version>5.14.10</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
- <version>1.6.0</version>
+ <version>1.6.3</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/pom.xml?rev=1197124&r1=1197123&r2=1197124&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/pom.xml (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/pom.xml Thu Nov 3 14:03:14 2011
@@ -15,7 +15,7 @@
<name>Streaming WebService Security</name>
<properties>
- <opensaml.version>2.4.1</opensaml.version>
+ <opensaml.version>2.5.1-1</opensaml.version>
</properties>
<dependencies>
@@ -53,6 +53,10 @@
<artifactId>commons-dbcp</artifactId>
</exclusion>
<exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
</exclusion>
@@ -196,13 +200,13 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.14.2</version>
+ <version>5.14.10</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
- <version>1.6.0</version>
+ <version>1.6.3</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: webservices/wss4j/branches/swssf/streaming-xml-security/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-xml-security/pom.xml?rev=1197124&r1=1197123&r2=1197124&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-xml-security/pom.xml (original)
+++ webservices/wss4j/branches/swssf/streaming-xml-security/pom.xml Thu Nov 3 14:03:14 2011
@@ -36,8 +36,8 @@
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.9</version>
+ <artifactId>woodstox-core-asl</artifactId>
+ <version>4.1.2</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -47,7 +47,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.14.2</version>
+ <version>5.14.10</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -121,7 +121,7 @@
<configuration>
<instrumentation>
<excludes>
- <exclude>org/xmlsecurity/ns/configuration/*</exclude>
+ <exclude>org/xmlsecurity/ns/configuration/*</exclude>
</excludes>
</instrumentation>
</configuration>
Modified: webservices/wss4j/branches/swssf/streaming-xml-security/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamReaderTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-xml-security/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamReaderTest.java?rev=1197124&r1=1197123&r2=1197124&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-xml-security/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamReaderTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-xml-security/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamReaderTest.java Thu Nov 3 14:03:14 2011
@@ -66,7 +66,7 @@ public class XMLSecurityStreamReaderTest
inputProcessorChain.addProcessor(new EventReaderProcessor());
XMLSecurityStreamReader xmlSecurityStreamReader = new XMLSecurityStreamReader(inputProcessorChain, securityProperties);
int event = xmlSecurityStreamReader.next();
- Assert.assertEquals(XMLStreamConstants.CHARACTERS, event);
+ Assert.assertEquals(XMLStreamConstants.START_ELEMENT, event);
}
@Test