From 0fd4a45070328c257039973db2153ca3572c8d34 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Thu, 4 Feb 2010 11:46:21 +0000
Subject: [PATCH] + upgrade to AspectJ 1.6.8 + externalize some of the jar
 versions + align the versions of some dependencies between pom.xml and
 ivy.xml

---
 build.versions                                  |  4 ++++
 org.springframework.aop/build.xml               |  1 +
 org.springframework.aop/ivy.xml                 |  6 +++---
 org.springframework.aop/pom.xml                 |  2 +-
 org.springframework.aspects/build.xml           |  1 +
 org.springframework.aspects/ivy.xml             |  4 ++--
 org.springframework.beans/build.xml             |  1 +
 org.springframework.beans/ivy.xml               |  2 +-
 org.springframework.beans/pom.xml               |  4 ++--
 org.springframework.context.support/build.xml   |  1 +
 org.springframework.context.support/ivy.xml     |  2 +-
 org.springframework.context/build.xml           |  1 +
 org.springframework.context/ivy.xml             |  6 +++---
 org.springframework.context/pom.xml             |  2 +-
 org.springframework.core/build.xml              |  1 +
 org.springframework.core/ivy.xml                |  4 ++--
 org.springframework.expression/build.xml        |  1 +
 org.springframework.instrument/build.xml        |  1 +
 org.springframework.integration-tests/build.xml |  1 +
 org.springframework.integration-tests/ivy.xml   | 10 ++++------
 org.springframework.integration-tests/pom.xml   | 14 +-------------
 org.springframework.jdbc/build.xml              |  1 +
 org.springframework.jdbc/ivy.xml                |  2 +-
 org.springframework.jms/build.xml               |  1 +
 org.springframework.jms/ivy.xml                 |  4 ++--
 org.springframework.jms/pom.xml                 | 14 +++++++-------
 org.springframework.orm/build.xml               |  1 +
 org.springframework.orm/ivy.xml                 |  2 +-
 org.springframework.orm/pom.xml                 |  6 ++++++
 org.springframework.oxm/build.xml               |  1 +
 org.springframework.oxm/ivy.xml                 |  2 +-
 org.springframework.spring-parent/pom.xml       |  8 ++++----
 org.springframework.test/ivy.xml                |  6 +++---
 org.springframework.test/pom.xml                |  4 ++--
 org.springframework.transaction/build.xml       |  1 +
 org.springframework.transaction/ivy.xml         |  4 ++--
 org.springframework.web.portlet/build.xml       |  1 +
 org.springframework.web.portlet/ivy.xml         |  2 +-
 org.springframework.web.servlet/build.xml       |  1 +
 org.springframework.web.struts/build.xml        |  1 +
 org.springframework.web.struts/ivy.xml          |  2 +-
 org.springframework.web/build.xml               |  1 +
 org.springframework.web/ivy.xml                 |  2 +-
 43 files changed, 75 insertions(+), 61 deletions(-)

diff --git a/build.versions b/build.versions
index 3ecf22342c..6fa5d9a703 100644
--- a/build.versions
+++ b/build.versions
@@ -1,2 +1,6 @@
+#common dependency versions
+aspectj.version=1.6.8.RELEASE
+commons.pool.version=1.5.3
+slf4j.version=1.5.10
 org.testng.version=5.10.0
 org.junit.version=4.7.0
\ No newline at end of file
diff --git a/org.springframework.aop/build.xml b/org.springframework.aop/build.xml
index 4ce649f89d..73cf8acf0f 100644
--- a/org.springframework.aop/build.xml
+++ b/org.springframework.aop/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="org.springframework.aop">
 	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
 </project>
diff --git a/org.springframework.aop/ivy.xml b/org.springframework.aop/ivy.xml
index d5676e27cd..c09103b4f3 100644
--- a/org.springframework.aop/ivy.xml
+++ b/org.springframework.aop/ivy.xml
@@ -28,14 +28,14 @@
 		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="optional, bytecode-proxy->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, commons-logging->compile"/>
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.4.0" conf="optional, pooling->compile"/>
-		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="optional, aspectj->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="${commons.pool.version}" conf="optional, pooling->compile"/>
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
 		<dependency org="org.springframework" name="org.springframework.beans" 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.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
 	</dependencies>
 
diff --git a/org.springframework.aop/pom.xml b/org.springframework.aop/pom.xml
index e1c29daea0..b4996bf2f8 100644
--- a/org.springframework.aop/pom.xml
+++ b/org.springframework.aop/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
-      <version>1.4</version>
+      <version>1.5.3</version>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/org.springframework.aspects/build.xml b/org.springframework.aspects/build.xml
index a424a62bb2..149f2f61a5 100644
--- a/org.springframework.aspects/build.xml
+++ b/org.springframework.aspects/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="org.springframework.aspects">
 	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/aspect/default.xml"/>
 	
diff --git a/org.springframework.aspects/ivy.xml b/org.springframework.aspects/ivy.xml
index ccd472da3c..4277c715dc 100644
--- a/org.springframework.aspects/ivy.xml
+++ b/org.springframework.aspects/ivy.xml
@@ -24,14 +24,14 @@
 
 	<dependencies>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
-		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="optional, aspectj->compile"/>
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
 		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="optional, tx->compile"/>
 		<dependency org="org.springframework" name="org.springframework.orm" rev="latest.integration" conf="optional,orm->compile"/>
 		<dependency org="org.springframework" name="org.springframework.test" rev="latest.integration" conf="test->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="test->runtime"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->compile"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->compile"/>
 		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided, compile->compile"/>
 		<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="test->compile"/>
 	</dependencies>
diff --git a/org.springframework.beans/build.xml b/org.springframework.beans/build.xml
index 027fd641d7..4bde9eb6e4 100644
--- a/org.springframework.beans/build.xml
+++ b/org.springframework.beans/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="org.springframework.beans">
 	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
 </project>
diff --git a/org.springframework.beans/ivy.xml b/org.springframework.beans/ivy.xml
index f8629d95d7..1b6cd508f0 100644
--- a/org.springframework.beans/ivy.xml
+++ b/org.springframework.beans/ivy.xml
@@ -28,7 +28,7 @@
 		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
 		<!-- test dependencies -->
 		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
 		<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>
 	</dependencies>
diff --git a/org.springframework.beans/pom.xml b/org.springframework.beans/pom.xml
index 9064dbc0af..81bbce4f1f 100644
--- a/org.springframework.beans/pom.xml
+++ b/org.springframework.beans/pom.xml
@@ -21,8 +21,8 @@
     </dependency>
     <dependency>
       <groupId>javax.inject</groupId>
-      <artifactId>com.springsource.javax.inject</artifactId>
-      <version>0.9.0.PFD</version>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
       <scope>provided</scope> 
     </dependency>
     <dependency>
diff --git a/org.springframework.context.support/build.xml b/org.springframework.context.support/build.xml
index 643fa1f7b8..67d632d055 100644
--- a/org.springframework.context.support/build.xml
+++ b/org.springframework.context.support/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="org.springframework.context.support">
 	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
 </project>
diff --git a/org.springframework.context.support/ivy.xml b/org.springframework.context.support/ivy.xml
index 2bb0e8507f..dcbdf187e6 100644
--- a/org.springframework.context.support/ivy.xml
+++ b/org.springframework.context.support/ivy.xml
@@ -49,7 +49,7 @@
 		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->runtime"/>
 		<dependency org="org.apache.poi" name="com.springsource.org.apache.poi" rev="3.0.2.FINAL" conf="test->compile"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.context/build.xml b/org.springframework.context/build.xml
index 2f9d8d2485..24653c5c4b 100644
--- a/org.springframework.context/build.xml
+++ b/org.springframework.context/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="org.springframework.context">
 	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
 </project>
diff --git a/org.springframework.context/ivy.xml b/org.springframework.context/ivy.xml
index 506d42a0e5..c314fe1d22 100644
--- a/org.springframework.context/ivy.xml
+++ b/org.springframework.context/ivy.xml
@@ -43,7 +43,7 @@
 		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="optional, bytecode-proxy->compile"/>
 		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile, aop->compile"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
-		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="optional, aspectj->compile"/>
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
 		<dependency org="org.beanshell" name="com.springsource.bsh" rev="2.0.0.b4" conf="optional, beanshell->compile"/>
 		<dependency org="org.codehaus.groovy" name="com.springsource.org.codehaus.groovy" rev="1.6.5" conf="optional, groovy->compile"/>
 		<dependency org="org.joda" name="com.springsource.org.joda.time" rev="1.6.0" conf="optional->compile"/>
@@ -63,8 +63,8 @@
 		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.0.0.GA" conf="test->runtime"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
-		<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="1.5.3" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+		<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->runtime"/>
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml
index 2391e5710b..0fb3f1700e 100644
--- a/org.springframework.context/pom.xml
+++ b/org.springframework.context/pom.xml
@@ -169,7 +169,7 @@
 		<dependency>
 			<groupId>commons-pool</groupId>
 			<artifactId>commons-pool</artifactId>
-			<version>1.4</version>
+			<version>1.5.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/org.springframework.core/build.xml b/org.springframework.core/build.xml
index dd79022c7d..9ec442705a 100644
--- a/org.springframework.core/build.xml
+++ b/org.springframework.core/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="org.springframework.core" xmlns:ivy="antlib:org.apache.ivy.ant">
 	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
 	<target name="create.pom" depends="ivy.init, resolve">
diff --git a/org.springframework.core/ivy.xml b/org.springframework.core/ivy.xml
index b0d0bf29ce..9f1acc53c1 100644
--- a/org.springframework.core/ivy.xml
+++ b/org.springframework.core/ivy.xml
@@ -25,12 +25,12 @@
 	<dependencies>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
 		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional, log4j->compile"/>
-		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="optional, aspectj->compile"/>
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
 		<dependency org="org.jboss.vfs" name="com.springsource.org.jboss.virtual" rev="2.1.0.GA" conf="optional->compile"/>
 		<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>
 		<!-- test dependencies -->
 		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="test->compile"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
 		<dependency org="org.custommonkey.xmlunit" name="com.springsource.org.custommonkey.xmlunit" rev="1.2.0" conf="test->compile"/>
 		<dependency org="org.codehaus.woodstox" name="com.springsource.com.ctc.wstx" rev="3.2.7" conf="test->compile"/>
diff --git a/org.springframework.expression/build.xml b/org.springframework.expression/build.xml
index 04d8ce0c7c..bf25300602 100644
--- a/org.springframework.expression/build.xml
+++ b/org.springframework.expression/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="org.springframework.expression">
 	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
 </project>
diff --git a/org.springframework.instrument/build.xml b/org.springframework.instrument/build.xml
index 237154117b..a86d256c23 100644
--- a/org.springframework.instrument/build.xml
+++ b/org.springframework.instrument/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="org.springframework.instrument">
 	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
 </project>
diff --git a/org.springframework.integration-tests/build.xml b/org.springframework.integration-tests/build.xml
index 618aca54f4..22af73bde8 100644
--- a/org.springframework.integration-tests/build.xml
+++ b/org.springframework.integration-tests/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="org.springframework.integration-tests">
 	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
 
 	<target name="publish" description="Publishes all artifacts to remote repositories"/>
diff --git a/org.springframework.integration-tests/ivy.xml b/org.springframework.integration-tests/ivy.xml
index 5f4a06a831..f443290228 100644
--- a/org.springframework.integration-tests/ivy.xml
+++ b/org.springframework.integration-tests/ivy.xml
@@ -22,15 +22,13 @@
 		<dependency org="com.caucho" name="com.springsource.com.caucho" rev="3.2.1" conf="test->compile"/>
 		<dependency org="com.ibm.websphere" name="com.springsource.com.ibm.websphere.uow" rev="6.0.2.17" conf="test->compile"/>
 		<dependency org="com.opensymphony.quartz" name="com.springsource.org.quartz" rev="1.6.2" conf="test->compile"/>
-		<dependency org="com.oracle.oc4j" name="com.springsource.oracle.classloader" rev="10.1.3.1" conf="provided->compile"/>
 		<dependency org="com.oracle.toplink.essentials" name="com.springsource.oracle.toplink.essentials" rev="2.0.0.b41-beta2" conf="test->compile"/>
-		<dependency org="com.sun.enterprise" name="com.springsource.com.sun.enterprise.loader" rev="1.0.0" conf="test->compile"/>
 		<dependency org="com.sun.syndication" name="com.springsource.com.sun.syndication" rev="1.0.0" conf="test->compile"/>
 		<dependency org="edu.emory.mathcs.backport" name="com.springsource.edu.emory.mathcs.backport" rev="3.0.0" conf="test->compile"/>
 		<dependency org="javax.ejb" name="com.springsource.javax.ejb" rev="3.0.0" conf="test->compile"/>
 		<dependency org="javax.el" name="com.springsource.javax.el" rev="1.0.0" conf="test->compile"/>
 		<dependency org="javax.faces" name="com.springsource.javax.faces" rev="1.2.0.08" conf="test->compile"/>
-		<dependency org="javax.inject" name="com.springsource.javax.inject" rev="0.9.0.PFD" conf="test->compile"/>
+		<dependency org="javax.inject" name="com.springsource.javax.inject" rev="1.0.0" conf="test->compile"/>
 		<dependency org="javax.jdo" name="com.springsource.javax.jdo" rev="2.1.0" conf="test->compile"/>
 		<dependency org="javax.jms" name="com.springsource.javax.jms" rev="1.1.0" conf="test->compile"/>
 		<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="test->compile"/>
@@ -63,7 +61,7 @@
 		<dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles.jsp" rev="2.0.5" conf="test->compile"/>
 		<dependency org="org.apache.velocity" name="com.springsource.org.apache.velocity" rev="1.5.0" conf="test->compile"/>
 		<dependency org="org.apache.velocity" name="com.springsource.org.apache.velocity.tools.view" rev="1.4.0" conf="test->compile"/>
-		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="test->compile"/>
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="test->compile"/>
 		<dependency org="org.codehaus.groovy" name="com.springsource.org.codehaus.groovy" rev="1.6.5" conf="test->compile"/>
 		<dependency org="org.dom4j" name="com.springsource.org.dom4j" rev="1.6.1" conf="test->compile"/>
 		<dependency org="org.eclipse.persistence" name="com.springsource.org.eclipse.persistence" rev="1.0.1" conf="test->compile"/>
@@ -74,7 +72,7 @@
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations.common" rev="3.3.0.ga" conf="test->compile"/>
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.4.0.GA" conf="test->compile"/>
 		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->compile"/>
-		<dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.2.0" conf="optional, runtime->compile"/>
+		<dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.4.0" conf="optional, runtime->compile"/>
 		<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="test->compile"/>
 		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
@@ -94,7 +92,7 @@
 		<dependency org="org.custommonkey.xmlunit" name="com.springsource.org.custommonkey.xmlunit" rev="1.2.0" conf="test->compile"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock.classextension" rev="2.3.0" conf="test->compile"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
 		<dependency org="org.testng" name="com.springsource.org.testng" rev="5.9.0" conf="test->compile"/>
 	</dependencies>
 
diff --git a/org.springframework.integration-tests/pom.xml b/org.springframework.integration-tests/pom.xml
index b7c6b3b2b4..5b9133e55f 100644
--- a/org.springframework.integration-tests/pom.xml
+++ b/org.springframework.integration-tests/pom.xml
@@ -30,24 +30,12 @@
       <version>1.6.2</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.oracle.oc4j</groupId>
-      <artifactId>oracle.classloader</artifactId>
-      <version>10.1.3.1</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>com.oracle.toplink.essentials</groupId>
       <artifactId>oracle.toplink.essentials</artifactId>
       <version>2.0.0.b41-beta2</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.sun.enterprise</groupId>
-      <artifactId>com.sun.enterprise.loader</artifactId>
-      <version>1.0</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.sun.syndication</groupId>
       <artifactId>com.sun.syndication</artifactId>
@@ -189,7 +177,7 @@
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
-      <version>1.4</version>
+      <version>1.5.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.jdbc/build.xml b/org.springframework.jdbc/build.xml
index c8b6069577..c93d64ea05 100644
--- a/org.springframework.jdbc/build.xml
+++ b/org.springframework.jdbc/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="org.springframework.jdbc">
 	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
 </project>
diff --git a/org.springframework.jdbc/ivy.xml b/org.springframework.jdbc/ivy.xml
index f0f28025be..152a85e906 100644
--- a/org.springframework.jdbc/ivy.xml
+++ b/org.springframework.jdbc/ivy.xml
@@ -35,7 +35,7 @@
 		<dependency org="com.h2database" name="com.springsource.org.h2" rev="1.0.71" conf="optional->compile"/>
 		<dependency org="org.apache.derby" name="com.springsource.org.apache.derby" rev="10.5.1000001.764942" conf="optional->compile"/>
 		<!-- test dependencies -->
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
 	</dependencies>
 
diff --git a/org.springframework.jms/build.xml b/org.springframework.jms/build.xml
index 5df978288c..47a67616c0 100644
--- a/org.springframework.jms/build.xml
+++ b/org.springframework.jms/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="org.springframework.jms">
 	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
 </project>
diff --git a/org.springframework.jms/ivy.xml b/org.springframework.jms/ivy.xml
index 8a84235c73..3f43b50d20 100644
--- a/org.springframework.jms/ivy.xml
+++ b/org.springframework.jms/ivy.xml
@@ -29,10 +29,10 @@
 		<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, commons-logging->compile"/>
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.3.0"
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.5.3"
 					conf="optional, commons-pool->compile"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->compile"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->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"
diff --git a/org.springframework.jms/pom.xml b/org.springframework.jms/pom.xml
index 40ba73754d..8de79c2a30 100644
--- a/org.springframework.jms/pom.xml
+++ b/org.springframework.jms/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
-      <version>1.3</version>
+      <version>1.5.3</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -57,37 +57,37 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>3.0.1.BUILD-SNAPSHOT</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.0.1.BUILD-SNAPSHOT</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.0.1.BUILD-SNAPSHOT</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.0.1.BUILD-SNAPSHOT</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-oxm</artifactId>
-      <version>3.0.1.BUILD-SNAPSHOT</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>3.0.1.BUILD-SNAPSHOT</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
   </dependencies>
diff --git a/org.springframework.orm/build.xml b/org.springframework.orm/build.xml
index ac4c8153a5..6737c9d6d6 100644
--- a/org.springframework.orm/build.xml
+++ b/org.springframework.orm/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="org.springframework.orm">
 	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
 </project>
diff --git a/org.springframework.orm/ivy.xml b/org.springframework.orm/ivy.xml
index 6e2b2e29a5..14eb8dd2c8 100644
--- a/org.springframework.orm/ivy.xml
+++ b/org.springframework.orm/ivy.xml
@@ -53,7 +53,7 @@
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="optional, web->compile"/>
 		<!-- test dependencies -->
-		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="test->compile"/>
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="test->compile"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.dbcp" rev="1.2.2.osgi" conf="test->runtime"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.5.3" conf="test->compile"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
diff --git a/org.springframework.orm/pom.xml b/org.springframework.orm/pom.xml
index f3246420a5..8de34f3c7a 100644
--- a/org.springframework.orm/pom.xml
+++ b/org.springframework.orm/pom.xml
@@ -182,6 +182,12 @@
 			<version>1.2.2</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>commons-pool</groupId>
+			<artifactId>commons-pool</artifactId>
+			<version>1.5.3</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.easymock</groupId>
 			<artifactId>easymock</artifactId>
diff --git a/org.springframework.oxm/build.xml b/org.springframework.oxm/build.xml
index 9623453fb1..f1acbfae3b 100644
--- a/org.springframework.oxm/build.xml
+++ b/org.springframework.oxm/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="org.springframework.oxm" xmlns:ivy="antlib:org.apache.ivy.ant">
 	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
 
diff --git a/org.springframework.oxm/ivy.xml b/org.springframework.oxm/ivy.xml
index 792e0d11e4..f4e05e3edd 100644
--- a/org.springframework.oxm/ivy.xml
+++ b/org.springframework.oxm/ivy.xml
@@ -48,7 +48,7 @@
 		<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.7.0" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
 		<dependency org="org.codehaus.jettison" name="com.springsource.org.codehaus.jettison" rev="1.0.1"
 					conf="test->compile"/>
diff --git a/org.springframework.spring-parent/pom.xml b/org.springframework.spring-parent/pom.xml
index fe6b11dd4d..cd944ffb0e 100644
--- a/org.springframework.spring-parent/pom.xml
+++ b/org.springframework.spring-parent/pom.xml
@@ -38,7 +38,7 @@
       <dependency>
 		<groupId>javax.inject</groupId>
 		<artifactId>com.springsource.javax.inject</artifactId>
-		<version>0.9.0.PFD</version>
+		<version>1.0.0</version>
 		<scope>provided</scope> 
       </dependency>
       <dependency>
@@ -50,7 +50,7 @@
       <dependency>
 		<groupId>org.aspectj</groupId>
 		<artifactId>aspectjweaver</artifactId>
-		<version>1.6.5</version>
+		<version>1.6.8</version>
 		<optional>true</optional>
       </dependency>
       <dependency>
@@ -62,12 +62,12 @@
       <dependency>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-api</artifactId>
-		<version>1.5.8</version>
+		<version>1.5.10</version>
       </dependency>
       <dependency>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-log4j12</artifactId>
-		<version>1.5.8</version>
+		<version>1.5.10</version>
       </dependency>
       <dependency>
 		<groupId>log4j</groupId>
diff --git a/org.springframework.test/ivy.xml b/org.springframework.test/ivy.xml
index 4f2e2897d7..899d4c24da 100644
--- a/org.springframework.test/ivy.xml
+++ b/org.springframework.test/ivy.xml
@@ -22,7 +22,7 @@
 	<dependencies>
 		<dependency org="javax.activation" name="com.springsource.javax.activation" rev="1.1.0" conf="provided->compile"/>
 		<dependency org="javax.el" name="com.springsource.javax.el" rev="1.0.0" conf="provided->compile"/>
-		<dependency org="javax.inject" name="com.springsource.javax.inject" rev="0.9.0.PFD" conf="test->compile"/>
+		<dependency org="javax.inject" name="com.springsource.javax.inject" rev="1.0.0" conf="test->compile"/>
 		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided->compile"/>
 		<dependency org="javax.portlet" name="com.springsource.javax.portlet" rev="2.0.0" conf="provided->compile"/>
 		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided->compile"/>
@@ -30,12 +30,12 @@
 		<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->compile"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
 		<dependency org="org.apache.taglibs" name="com.springsource.org.apache.taglibs.standard" rev="1.1.2" conf="optional->compile"/>
-		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="optional->compile"/>
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional->compile"/>
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.3.1.GA" conf="test->compile"/>
 		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->compile"/>
 		<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="optional->compile"/>
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="optional->compile"/>
-		<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="1.5.3" conf="test->compile"/>
+		<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->compile"/>
 		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="optional->compile"/>
 		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional->compile"/>
 		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="optional->compile"/>
diff --git a/org.springframework.test/pom.xml b/org.springframework.test/pom.xml
index 3b7a0affc0..7ed46168b0 100644
--- a/org.springframework.test/pom.xml
+++ b/org.springframework.test/pom.xml
@@ -27,8 +27,8 @@
     </dependency>
     <dependency>
       <groupId>javax.inject</groupId>
-      <artifactId>com.springsource.javax.inject</artifactId>
-      <version>0.9.0.PFD</version>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
       <scope>test</scope> 
     </dependency>
     <dependency>
diff --git a/org.springframework.transaction/build.xml b/org.springframework.transaction/build.xml
index 0e16faffdb..257816b598 100644
--- a/org.springframework.transaction/build.xml
+++ b/org.springframework.transaction/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="org.springframework.transaction">
 	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
 </project>
diff --git a/org.springframework.transaction/ivy.xml b/org.springframework.transaction/ivy.xml
index ebce68522f..de64935e01 100644
--- a/org.springframework.transaction/ivy.xml
+++ b/org.springframework.transaction/ivy.xml
@@ -34,8 +34,8 @@
 		<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.7.0" conf="test->runtime"/>
-		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="test->compile"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="test->compile"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock.classextension" rev="2.3.0" conf="test->compile"/>
 		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="test->compile"/>
diff --git a/org.springframework.web.portlet/build.xml b/org.springframework.web.portlet/build.xml
index ce0ccd5638..c463a792db 100644
--- a/org.springframework.web.portlet/build.xml
+++ b/org.springframework.web.portlet/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="org.springframework.web.portlet">
 	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
 </project>
diff --git a/org.springframework.web.portlet/ivy.xml b/org.springframework.web.portlet/ivy.xml
index ae3f031cbc..04dbf6172d 100644
--- a/org.springframework.web.portlet/ivy.xml
+++ b/org.springframework.web.portlet/ivy.xml
@@ -35,7 +35,7 @@
 		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.web.servlet/build.xml b/org.springframework.web.servlet/build.xml
index b1807ec3ba..5707224bae 100644
--- a/org.springframework.web.servlet/build.xml
+++ b/org.springframework.web.servlet/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="org.springframework.web.servlet">
 	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
 </project>
diff --git a/org.springframework.web.struts/build.xml b/org.springframework.web.struts/build.xml
index acfd7e6840..f795e2bffa 100644
--- a/org.springframework.web.struts/build.xml
+++ b/org.springframework.web.struts/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="org.springframework.web.struts">
 	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
 </project>
diff --git a/org.springframework.web.struts/ivy.xml b/org.springframework.web.struts/ivy.xml
index de19367920..032ca64ef4 100644
--- a/org.springframework.web.struts/ivy.xml
+++ b/org.springframework.web.struts/ivy.xml
@@ -38,7 +38,7 @@
 		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration"
                     conf="optional, tiles->compile"/>
 		<!-- test dependencies -->
- 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
+ 		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
 		<dependency org="org.springframework" name="org.springframework.test" rev="latest.integration"
                     conf="test->compile"/>
diff --git a/org.springframework.web/build.xml b/org.springframework.web/build.xml
index 479c9926a2..6cfd327dc4 100644
--- a/org.springframework.web/build.xml
+++ b/org.springframework.web/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="org.springframework.web">
 	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
 </project>
diff --git a/org.springframework.web/ivy.xml b/org.springframework.web/ivy.xml
index 7fae83adb2..d64953bd4e 100644
--- a/org.springframework.web/ivy.xml
+++ b/org.springframework.web/ivy.xml
@@ -72,7 +72,7 @@
         <!-- test dependencies -->
         <dependency org="org.apache.taglibs" name="com.springsource.org.apache.taglibs.standard" rev="1.1.2"
                     conf="test->runtime"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
 		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="test->compile"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
 		<dependency org="org.mortbay.jetty" name="com.springsource.org.mortbay.jetty.server" rev="6.1.9"