You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2017/12/28 09:48:54 UTC
svn commit: r1819411 - in /webservices/axiom/trunk: ./
testing/spring-ws-testsuite/
testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/
Author: veithen
Date: Thu Dec 28 09:48:53 2017
New Revision: 1819411
URL: http://svn.apache.org/viewvc?rev=1819411&view=rev
Log:
Upgrade Spring and Spring-WS.
Modified:
webservices/axiom/trunk/pom.xml
webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml
webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/client.xml
webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/server.xml
Modified: webservices/axiom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1819411&r1=1819410&r2=1819411&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Thu Dec 28 09:48:53 2017
@@ -258,8 +258,8 @@
-->
<shade.plugin.version>2.3</shade.plugin.version>
<jacoco.version>0.7.9</jacoco.version>
- <spring.version>4.3.9.RELEASE</spring.version>
- <springws.version>2.4.0.RELEASE</springws.version>
+ <spring.version>5.0.1.RELEASE</spring.version>
+ <springws.version>3.0.0.RELEASE</springws.version>
<exam.version>4.9.1</exam.version>
<skipDeploy>false</skipDeploy>
Modified: webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml?rev=1819411&r1=1819410&r2=1819411&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml Thu Dec 28 09:48:53 2017
@@ -54,12 +54,12 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>7.5.4.v20111024</version>
+ <version>8.2.0.v20160908</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>7.5.4.v20111024</version>
+ <version>8.2.0.v20160908</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -98,11 +98,6 @@
<artifactId>spring-ws-security</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j</artifactId>
- <version>1.6.15</version>
- </dependency>
- <dependency>
<!-- Need this because the SAAJ implementation in Java 1.6 has an issue (probably SAAJ-37). -->
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
Modified: webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/client.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/client.xml?rev=1819411&r1=1819410&r2=1819411&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/client.xml (original)
+++ webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/client.xml Thu Dec 28 09:48:53 2017
@@ -24,7 +24,7 @@
<constructor-arg ref="messageFactory"/>
<property name="defaultUri" value="http://localhost:${port}/"/>
<property name="interceptors">
- <bean class="org.springframework.ws.soap.security.wss4j.Wss4jSecurityInterceptor">
+ <bean class="org.springframework.ws.soap.security.wss4j2.Wss4jSecurityInterceptor">
<property name="securementActions" value="UsernameToken"/>
<property name="securementUsername" value="user1"/>
<property name="securementPassword" value="123456"/>
Modified: webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/server.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/server.xml?rev=1819411&r1=1819410&r2=1819411&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/server.xml (original)
+++ webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/server.xml Thu Dec 28 09:48:53 2017
@@ -28,10 +28,10 @@
<context:component-scan base-package="org.apache.axiom.ts.springws.scenario.secureecho"/>
<sws:annotation-driven/>
<sws:interceptors>
- <bean class="org.springframework.ws.soap.security.wss4j.Wss4jSecurityInterceptor">
+ <bean class="org.springframework.ws.soap.security.wss4j2.Wss4jSecurityInterceptor">
<property name="validationActions" value="UsernameToken"/>
<property name="validationCallbackHandler">
- <bean class="org.springframework.ws.soap.security.wss4j.callback.SimplePasswordValidationCallbackHandler">
+ <bean class="org.springframework.ws.soap.security.wss4j2.callback.SimplePasswordValidationCallbackHandler">
<property name="users">
<props>
<prop key="user1">123456</prop>