Author: veithen
Date: Mon Nov 12 00:44:41 2018
New Revision: 1846370
URL: http://svn.apache.org/viewvc?rev=1846370&view=rev
Log:
Merge r1819411 to the 1.2 branch.
Modified:
webservices/axiom/branches/1.2.x/ (props changed)
webservices/axiom/branches/1.2.x/pom.xml
webservices/axiom/branches/1.2.x/testing/ (props changed)
webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/pom.xml
webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/client.xml
webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/server.xml
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 12 00:44:41 2018
@@ -14,4 +14,4 @@
/webservices/axiom/branches/maven-site-plugin-3.5:1731125-1732708
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
/webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1758113,1762239,1762241,1762243,1777898,1781319,1781488,1787644,1791831,1795059,1795067,1795081,1796558,1798352,1806321,1815009,1817725,1817727,1817735,1826041,1843069,1843517,1845037,1845623
+/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1758113,1762239,1762241,1762243,1777898,1781319,1781488,1787644,1791831,1795059,1795067,1795081,1796558,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1826041,1843069,1843517,1845037,1845623
Modified: webservices/axiom/branches/1.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/pom.xml?rev=1846370&r1=1846369&r2=1846370&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/pom.xml Mon Nov 12 00:44:41 2018
@@ -261,8 +261,8 @@
<shade.plugin.version>2.3</shade.plugin.version>
<enforcer.plugin.version>1.4.1</enforcer.plugin.version>
<jacoco.version>0.7.5.201505241946</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.7.0</exam.version>
<skipDeploy>false</skipDeploy>
Propchange: webservices/axiom/branches/1.2.x/testing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 12 00:44:41 2018
@@ -12,4 +12,4 @@
/webservices/axiom/branches/attrs-aspects/testing:1685218-1686663
/webservices/axiom/branches/namespaceURIInterning/testing:1293148-1293587
/webservices/axiom/branches/osgi-redesign/testing:1180368-1180596
-/webservices/axiom/trunk/testing:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1741979,1758113,1762241,1762243,1795067,1798352,1817725,1817727,1817735
+/webservices/axiom/trunk/testing:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1741979,1758113,1762241,1762243,1795067,1798352,1817725,1817727,1817735,1819411
Modified: webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/pom.xml?rev=1846370&r1=1846369&r2=1846370&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/pom.xml
(original)
+++ webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/pom.xml Mon
Nov 12 00:44:41 2018
@@ -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>
@@ -106,11 +106,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/branches/1.2.x/testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/client.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/client.xml?rev=1846370&r1=1846369&r2=1846370&view=diff
==============================================================================
---
webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/client.xml
(original)
+++
webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/client.xml
Mon Nov 12 00:44:41 2018
@@ -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/branches/1.2.x/testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/server.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/server.xml?rev=1846370&r1=1846369&r2=1846370&view=diff
==============================================================================
---
webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/server.xml
(original)
+++
webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/resources/org/apache/axiom/ts/springws/scenario/secureecho/server.xml
Mon Nov 12 00:44:41 2018
@@ -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>
