diff --git a/org.springframework.jdbc/.classpath b/org.springframework.jdbc/.classpath
index c3fb75286a..3a966f3305 100644
--- a/org.springframework.jdbc/.classpath
+++ b/org.springframework.jdbc/.classpath
@@ -13,8 +13,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.transaction"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-1.1.0.jar" sourcepath="/IVY_CACHE/javax.transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-sources-1.1.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/com.mchange.c3p0/com.springsource.com.mchange.v2.c3p0/0.9.1.2/com.springsource.com.mchange.v2.c3p0-0.9.1.2.jar" sourcepath="/IVY_CACHE/com.mchange.c3p0/com.springsource.com.mchange.v2.c3p0/0.9.1.2/com.springsource.com.mchange.v2.c3p0-sources-0.9.1.2.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/com.experlog.xapool/com.springsource.org.enhydra.jdbc/1.5.0/com.springsource.org.enhydra.jdbc-1.5.0.jar" sourcepath="/IVY_CACHE/com.experlog.xapool/com.springsource.org.enhydra.jdbc/1.5.0/com.springsource.org.enhydra.jdbc-sources-1.5.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-4.5.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.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="output" path="target/classes"/>
 </classpath>
diff --git a/org.springframework.jdbc/ivy.xml b/org.springframework.jdbc/ivy.xml
index 4f0495020a..f9625881a9 100644
--- a/org.springframework.jdbc/ivy.xml
+++ b/org.springframework.jdbc/ivy.xml
@@ -24,7 +24,6 @@
 
 	<dependencies>
 		<dependency org="com.mchange.c3p0" name="com.springsource.com.mchange.v2.c3p0" rev="0.9.1.2" conf="optional, c3p0->compile"/>
-		<dependency org="com.experlog.xapool" name="com.springsource.org.enhydra.jdbc" rev="1.5.0" conf="optional, pooling->compile"/>
 		<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
@@ -32,7 +31,7 @@
 		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="compile->compile"/>
 		<!-- test dependencies -->
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime" />
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.5.0" conf="test->runtime" />
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->compile"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.collections" rev="3.2.0" conf="test->runtime"/>
 	</dependencies>
diff --git a/org.springframework.jdbc/template.mf b/org.springframework.jdbc/template.mf
index 58bf26163a..70d7325dde 100644
--- a/org.springframework.jdbc/template.mf
+++ b/org.springframework.jdbc/template.mf
@@ -14,7 +14,6 @@ Import-Template:
  javax.sql.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional,
  javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.enhydra.jdbc.*;version="[1.5.0, 2.0.0)";resolution:=optional,
  org.springframework.beans.*;version="[3.0.0, 3.0.1)",
  org.springframework.core.*;version="[3.0.0, 3.0.1)",
  org.springframework.dao.*;version="[3.0.0, 3.0.1)",
diff --git a/org.springframework.transaction/.classpath b/org.springframework.transaction/.classpath
index 926fe4687a..985e81a51b 100644
--- a/org.springframework.transaction/.classpath
+++ b/org.springframework.transaction/.classpath
@@ -12,10 +12,9 @@
 	<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/javax.transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-1.1.0.jar" sourcepath="/IVY_CACHE/javax.transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-sources-1.1.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/com.ibm.websphere/com.springsource.com.ibm.websphere.uow/6.0.2.17/com.springsource.com.ibm.websphere.uow-6.0.2.17.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.objectweb.jotm/com.springsource.org.objectweb.jotm/2.0.10/com.springsource.org.objectweb.jotm-2.0.10.jar" sourcepath="/IVY_CACHE/org.objectweb.jotm/com.springsource.org.objectweb.jotm/2.0.10/com.springsource.org.objectweb.jotm-sources-2.0.10.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.ejb/com.springsource.javax.ejb/3.0.0/com.springsource.javax.ejb-3.0.0.jar" sourcepath="/IVY_CACHE/javax.ejb/com.springsource.javax.ejb/3.0.0/com.springsource.javax.ejb-sources-3.0.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.resource/com.springsource.javax.resource/1.5.0/com.springsource.javax.resource-1.5.0.jar" sourcepath="/IVY_CACHE/javax.resource/com.springsource.javax.resource/1.5.0/com.springsource.javax.resource-sources-1.5.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-4.5.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.springframework.transaction/ivy.xml b/org.springframework.transaction/ivy.xml
index cec0a78fd3..c426a32182 100644
--- a/org.springframework.transaction/ivy.xml
+++ b/org.springframework.transaction/ivy.xml
@@ -13,8 +13,7 @@
 		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
 		<conf name="ejb" extends="runtime" description="JARs needed to develop EJB3 beans"/>
 		<conf name="jca" extends="runtime" description="JARs needed to develop JCA beans"/>
-		<conf name="jotm" extends="runtime" description="JARs needed to use JOTM"/>
-		<conf name="websphere" extends="runtime" description="JARs needed to develop against websphere"/>
+		<conf name="websphere" extends="runtime" description="JARs needed to develop against WebSphere"/>
 	</configurations>
 
 	<publications>
@@ -29,14 +28,13 @@
 		<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->compile"/>
 		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
-		<dependency org="org.objectweb.jotm" name="com.springsource.org.objectweb.jotm" rev="2.0.10" conf="optional, jotm->compile"/>
 		<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
 		<!-- test dependencies -->
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime" />
-		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.5.4" conf="test->compile"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.5.0" conf="test->runtime" />
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.2.RELEASE" conf="test->compile"/>
 		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="test->compile"/>
 		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="test->compile"/>
 	</dependencies>
diff --git a/org.springframework.transaction/template.mf b/org.springframework.transaction/template.mf
index adb3751de7..f17016623c 100644
--- a/org.springframework.transaction/template.mf
+++ b/org.springframework.transaction/template.mf
@@ -14,7 +14,6 @@ Import-Template:
  javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
  org.aopalliance.*;version="[1.0.0, 2.0.0)",
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.objectweb.jotm.*;version="[2.0.10, 3.0.0)";resolution:=optional,
  org.springframework.aop.*;version="[3.0.0, 3.0.1)",
  org.springframework.beans.*;version="[3.0.0, 3.0.1)",
  org.springframework.context.*;version="[3.0.0, 3.0.1)",