diff --git a/org.springframework.integration.adapter/ivy.xml b/org.springframework.integration.adapter/ivy.xml
index 23142be8f6..771c35dde7 100644
--- a/org.springframework.integration.adapter/ivy.xml
+++ b/org.springframework.integration.adapter/ivy.xml
@@ -24,8 +24,8 @@
 		<dependency org="javax.jms" name="com.springsource.javax.jms" rev="1.1.0" conf="provided->runtime"/>
 		<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.1" conf="provided->runtime"/>
 		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->runtime"/>
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.net" rev="1.4.1" conf="compile->runtime"/>
-		<dependency org="org.apache.oro" name="com.springsource.org.apache.oro" rev="2.0.8" conf="compile->runtime"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.net" rev="1.4.1" conf="optional->runtime"/>
+		<dependency org="org.apache.oro" name="com.springsource.org.apache.oro" rev="2.0.8" conf="optional->runtime"/>
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.context" rev="2.5.4.A" conf="compile->runtime"/>
diff --git a/org.springframework.integration.xml/ivy.xml b/org.springframework.integration.xml/ivy.xml
index 1cc7f0f701..617106f726 100644
--- a/org.springframework.integration.xml/ivy.xml
+++ b/org.springframework.integration.xml/ivy.xml
@@ -21,10 +21,10 @@
 
 	<dependencies>
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime"/>
-				<dependency org="org.springframework" name="org.springframework.test" rev="2.5.4.A" 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.1.A" conf="compile->runtime"/>
+		<dependency org="org.springframework" name="org.springframework.test" rev="2.5.4.A" conf="test->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.context" rev="2.5.4.A" conf="compile->runtime"/>
+		<dependency org="org.springframework.ws" name="org.springframework.oxm" rev="1.5.1.A" conf="compile->runtime"/>
+		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
 	</dependencies>
 
 </ivy-module>