Author: davsclaus
Date: Mon Jun 25 07:49:12 2012
New Revision: 1353413
URL: http://svn.apache.org/viewvc?rev=1353413&view=rev
Log:
CAMEL-5393: Downgraded to spring ws 2.0.3 to support spring 3.0 out of the box.
Modified:
camel/trunk/components/camel-spring-ws/pom.xml
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-spring-ws/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/pom.xml?rev=1353413&r1=1353412&r2=1353413&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/pom.xml (original)
+++ camel/trunk/components/camel-spring-ws/pom.xml Mon Jun 25 07:49:12 2012
@@ -53,11 +53,14 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
</dependency>
+
+<!-- spring-oxm is needed when upgrading to Spring WS 2.1 that uses Spring 3.1
onwards
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
<version>${spring-version}</version>
</dependency>
+-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1353413&r1=1353412&r2=1353413&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Jun 25 07:49:12 2012
@@ -176,7 +176,8 @@
<spring-version>3.0.7.RELEASE</spring-version>
<spring-osgi-version>1.2.1</spring-osgi-version>
<spring-security-version>3.1.0.RELEASE</spring-security-version>
- <spring-ws-version>2.0.5.RELEASE</spring-ws-version>
+ <!-- spring WS 2.0.3 is the last release to support Spring 3.0.x -->
+ <spring-ws-version>2.0.3.RELEASE</spring-ws-version>
<spymemcached-version>2.8.0</spymemcached-version>
<sshd-version>0.6.0</sshd-version>
<stax-api-version>1.0.1</stax-api-version>
