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 2015/05/26 00:52:35 UTC
svn commit: r1681662 - in /webservices/axiom/trunk: pom.xml
systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/SpringWSTest.java
testing/spring-ws-testsuite/pom.xml
Author: veithen
Date: Mon May 25 22:52:34 2015
New Revision: 1681662
URL: http://svn.apache.org/r1681662
Log:
Fixed some version mismatches related to Spring and Castor.
Modified:
webservices/axiom/trunk/pom.xml
webservices/axiom/trunk/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/SpringWSTest.java
webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml
Modified: webservices/axiom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1681662&r1=1681661&r2=1681662&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Mon May 25 22:52:34 2015
@@ -260,6 +260,8 @@
-->
<shade.plugin.version>1.6</shade.plugin.version>
<jacoco.version>0.6.3.201306030806</jacoco.version>
+ <spring.version>4.0.5.RELEASE</spring.version>
+ <springws.version>2.2.0.RELEASE</springws.version>
</properties>
<repositories>
@@ -420,14 +422,34 @@
<version>2.0</version>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-oxm</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws-core</artifactId>
- <version>2.2.0.RELEASE</version>
+ <version>${springws.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws-security</artifactId>
- <version>2.2.0.RELEASE</version>
+ <version>${springws.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
Modified: webservices/axiom/trunk/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/SpringWSTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/SpringWSTest.java?rev=1681662&r1=1681661&r2=1681662&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/SpringWSTest.java (original)
+++ webservices/axiom/trunk/systests/spring-ws-tests/src/test/java/org/apache/axiom/systest/springws/SpringWSTest.java Mon May 25 22:52:34 2015
@@ -24,7 +24,6 @@ import junit.framework.TestSuite;
import org.apache.axiom.ts.springws.MessageFactoryConfigurator;
import org.apache.axiom.ts.springws.SpringWSTestSuiteBuilder;
import org.apache.axiom.ts.springws.scenario.broker.BrokerScenarioTest;
-import org.apache.axiom.ts.springws.scenario.castor.CastorTest;
import org.apache.axiom.ts.springws.scenario.jaxb2.JAXB2Test;
import org.apache.axiom.ts.springws.scenario.jdom.ClientServerTest;
import org.apache.axiom.ts.springws.scenario.secureecho.SecureEchoTest;
@@ -38,7 +37,6 @@ public class SpringWSTest extends TestCa
// TODO: investigate
builder.exclude(ClientServerTest.class);
builder.exclude(JAXB2Test.class);
- builder.exclude(CastorTest.class);
builder.exclude(BrokerScenarioTest.class);
builder.exclude(SecureEchoTest.class);
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=1681662&r1=1681661&r2=1681662&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml Mon May 25 22:52:34 2015
@@ -63,7 +63,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>3.2.2.RELEASE</version>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
@@ -85,12 +84,11 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
- <version>3.2.9.RELEASE</version>
</dependency>
<dependency>
<groupId>org.codehaus.castor</groupId>
- <artifactId>castor</artifactId>
- <version>1.2</version>
+ <artifactId>castor-xml</artifactId>
+ <version>1.3.3</version>
</dependency>
<dependency>
<groupId>org.springframework.ws</groupId>