From f1587679ade419987a6af6b42175992011ba95c4 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Tue, 25 Aug 2009 14:50:54 +0000
Subject: [PATCH] INT-772 Updated ivy.xml files to reference OXM from Spring 3
 instead of Spring WS.

---
 org.springframework.integration.test/ivy.xml | 2 +-
 org.springframework.integration.ws/ivy.xml   | 4 +---
 org.springframework.integration.xml/ivy.xml  | 6 ++----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/org.springframework.integration.test/ivy.xml b/org.springframework.integration.test/ivy.xml
index 7fd4f519c9..b694a62b42 100644
--- a/org.springframework.integration.test/ivy.xml
+++ b/org.springframework.integration.test/ivy.xml
@@ -23,7 +23,7 @@
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.6.0" conf="test->runtime"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration.adapter" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="org.springframework" name="org.springframework.test" rev="3.0.0.CI-336" conf="compile->runtime"/>
+		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="compile->runtime"/>
 		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="1.6.0" />
 	</dependencies>
 
diff --git a/org.springframework.integration.ws/ivy.xml b/org.springframework.integration.ws/ivy.xml
index 7c63a9a748..1933cfbb92 100644
--- a/org.springframework.integration.ws/ivy.xml
+++ b/org.springframework.integration.ws/ivy.xml
@@ -24,9 +24,7 @@
 		<dependency org="javax.xml.soap" name="com.springsource.javax.xml.soap" rev="1.3.0" conf="provided->runtime"/>
 		<dependency org="javax.xml.stream" name="com.springsource.javax.xml.stream" rev="1.0.1" conf="provided->runtime"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration.adapter" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="org.springframework.ws" name="org.springframework.oxm" rev="1.5.7.A" conf="compile->runtime">
-			<exclude org="org.springframework"/>
-		</dependency>
+		<dependency org="org.springframework" name="org.springframework.oxm" rev="${spring.version}" conf="compile->runtime"/>
 		<dependency org="org.springframework.ws" name="org.springframework.ws" rev="1.5.7.A" conf="compile->runtime">
 			<exclude org="org.springframework"/>
 		</dependency>
diff --git a/org.springframework.integration.xml/ivy.xml b/org.springframework.integration.xml/ivy.xml
index f2c08034ba..4a1b5914f0 100644
--- a/org.springframework.integration.xml/ivy.xml
+++ b/org.springframework.integration.xml/ivy.xml
@@ -29,10 +29,8 @@
 		<dependency org="org.springframework" name="org.springframework.context" rev="${spring.version}" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="test->runtime"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="org.springframework.ws" name="org.springframework.oxm" rev="1.5.7.A" conf="compile->runtime">
-			<exclude org="org.springframework"/>
-		</dependency>
-		<dependency org="org.springframework.ws" name="org.springframework.oxm.java5" rev="1.5.7.A" conf="test->runtime">
+		<dependency org="org.springframework" name="org.springframework.oxm" rev="${spring.version}" conf="compile->runtime"/>
+		<dependency org="org.springframework.ws" name="org.springframework.xml" rev="1.5.7.A" conf="compile->runtime">
 			<exclude org="org.springframework"/>
 		</dependency>
 	</dependencies>