diff --git a/org.springframework.integration.jdbc/.classpath b/org.springframework.integration.jdbc/.classpath
index e26dfe3753..8bb0f6fe21 100644
--- a/org.springframework.integration.jdbc/.classpath
+++ b/org.springframework.integration.jdbc/.classpath
@@ -11,15 +11,16 @@
     <classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar" />
     <classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar" />
     <classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.RC1/org.springframework.aop-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.RC1/org.springframework.aop-sources-3.0.0.RC1.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.RC1/org.springframework.asm-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.RC1/org.springframework.asm-sources-3.0.0.RC1.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RC1/org.springframework.beans-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RC1/org.springframework.beans-sources-3.0.0.RC1.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RC1/org.springframework.context-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RC1/org.springframework.context-sources-3.0.0.RC1.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.RC1/org.springframework.context.support-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.RC1/org.springframework.context.support-sources-3.0.0.RC1.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RC1/org.springframework.core-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RC1/org.springframework.core-sources-3.0.0.RC1.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.jdbc/3.0.0.RC1/org.springframework.jdbc-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.jdbc/3.0.0.RC1/org.springframework.jdbc-sources-3.0.0.RC1.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.RC1/org.springframework.transaction-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.RC1/org.springframework.transaction-sources-3.0.0.RC1.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RC1/org.springframework.test-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RC1/org.springframework.test-sources-3.0.0.RC1.jar" />
+    <classpathentry kind="var" path="IVY_CACHE/org.apache.derby/com.springsource.org.apache.derby/10.5.1000001.764942/com.springsource.org.apache.derby-10.5.1000001.764942.jar" sourcepath="/IVY_CACHE/org.apache.derby/com.springsource.org.apache.derby/10.5.1000001.764942/com.springsource.org.apache.derby-sources-10.5.1000001.764942.jar" />
+    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.RC3/org.springframework.aop-3.0.0.RC3.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.RC3/org.springframework.aop-sources-3.0.0.RC3.jar" />
+    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.RC3/org.springframework.asm-3.0.0.RC3.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.RC3/org.springframework.asm-sources-3.0.0.RC3.jar" />
+    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RC3/org.springframework.beans-3.0.0.RC3.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RC3/org.springframework.beans-sources-3.0.0.RC3.jar" />
+    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RC3/org.springframework.context-3.0.0.RC3.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RC3/org.springframework.context-sources-3.0.0.RC3.jar" />
+    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.RC3/org.springframework.context.support-3.0.0.RC3.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.RC3/org.springframework.context.support-sources-3.0.0.RC3.jar" />
+    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RC3/org.springframework.core-3.0.0.RC3.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RC3/org.springframework.core-sources-3.0.0.RC3.jar" />
+    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.jdbc/3.0.0.RC3/org.springframework.jdbc-3.0.0.RC3.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.jdbc/3.0.0.RC3/org.springframework.jdbc-sources-3.0.0.RC3.jar" />
+    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.RC3/org.springframework.transaction-3.0.0.RC3.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.RC3/org.springframework.transaction-sources-3.0.0.RC3.jar" />
+    <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RC3/org.springframework.test-3.0.0.RC3.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RC3/org.springframework.test-sources-3.0.0.RC3.jar" />
     <classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.0.jar" />
     <classpathentry kind="var" path="IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-1.0.0.jar" sourcepath="/IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-sources-1.0.0.jar" />
     <classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration" />
diff --git a/org.springframework.integration.jdbc/ivy.xml b/org.springframework.integration.jdbc/ivy.xml
index ccc76e407d..aec618096c 100644
--- a/org.springframework.integration.jdbc/ivy.xml
+++ b/org.springframework.integration.jdbc/ivy.xml
@@ -28,6 +28,7 @@
 		<dependency org="org.springframework" name="org.springframework.jdbc" rev="${spring.version}" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="${spring.version}" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="test->runtime"/>
+		<dependency org="org.apache.derby" name="com.springsource.org.apache.derby" rev="10.5.1000001.764942" conf="test->runtime"/>
 		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="${mockito.version}" conf="test->runtime"/>
 		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="test->runtime"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->runtime"/>   
diff --git a/org.springframework.integration.jdbc/template.mf b/org.springframework.integration.jdbc/template.mf
index 1f94f88ff1..1bf9e61696 100644
--- a/org.springframework.integration.jdbc/template.mf
+++ b/org.springframework.integration.jdbc/template.mf
@@ -6,4 +6,5 @@ Import-Template:
  org.springframework.*;version="[3.0.0, 4.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.aopalliance.*;version="[1.0.0, 2.0.0)",
+ javax.sql.*;version="0",
  org.w3c.dom.*;version="0"