diff --git a/org.springframework.aop/pom.xml b/org.springframework.aop/pom.xml
index 12a50be4fd9..969be99c4ee 100644
--- a/org.springframework.aop/pom.xml
+++ b/org.springframework.aop/pom.xml
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
-      <version>2.1_3</version>
+      <version>2.2</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -46,7 +46,6 @@
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjweaver</artifactId>
-      <version>1.6.2</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -70,19 +69,16 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.6</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/org.springframework.aspects/pom.xml b/org.springframework.aspects/pom.xml
index a90e6a7ff9b..b48af20b29f 100644
--- a/org.springframework.aspects/pom.xml
+++ b/org.springframework.aspects/pom.xml
@@ -22,7 +22,6 @@
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjweaver</artifactId>
-      <version>1.6.2</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -58,7 +57,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.beans/pom.xml b/org.springframework.beans/pom.xml
index ef40b652400..2ac163a04eb 100644
--- a/org.springframework.beans/pom.xml
+++ b/org.springframework.beans/pom.xml
@@ -17,12 +17,18 @@
       <groupId>javax.el</groupId>
       <artifactId>el-api</artifactId>
       <version>1.0</version>
-      <scope>provided</scope>
+      <scope>provided</scope> 
+    </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>com.springsource.javax.inject</artifactId>
+      <version>0.9.0.PFD</version>
+      <scope>provided</scope> 
     </dependency>
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
-      <version>2.1_3</version>
+      <version>2.2</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -40,19 +46,16 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/org.springframework.context.support/pom.xml b/org.springframework.context.support/pom.xml
index 546aab9705d..018d517fb44 100644
--- a/org.springframework.context.support/pom.xml
+++ b/org.springframework.context.support/pom.xml
@@ -119,13 +119,11 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -137,7 +135,6 @@
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml
index 53098657aab..cf12bb0fa80 100644
--- a/org.springframework.context/pom.xml
+++ b/org.springframework.context/pom.xml
@@ -43,6 +43,11 @@
       <version>3.0</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>com.springsource.javax.inject</artifactId>
+      <scope>provided</scope> 
+    </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jms_1.1_spec</artifactId>
@@ -55,6 +60,12 @@
       <version>1.0</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>1.0.CR3</version>
+      <scope>provided</scope> 
+    </dependency>
     <dependency>
       <groupId>javax.xml.ws</groupId>
       <artifactId>jaxws-api</artifactId>
@@ -64,15 +75,9 @@
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
-      <version>2.1_3</version>
+      <version>2.2</version>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr</artifactId>
-      <version>3.0.1</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>aopalliance</groupId>
       <artifactId>aopalliance</artifactId>
@@ -88,7 +93,6 @@
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjweaver</artifactId>
-      <version>1.6.2</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -100,15 +104,21 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy</artifactId>
-      <version>1.5.1</version>
+      <version>1.7-beta-1</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>1.1.1</version>
+      <version>1.2.0</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>3.0</version>
+      <optional>true</optional>
+    </dependency> 
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-asm</artifactId>
@@ -145,6 +155,12 @@
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-asm</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jta_1.1_spec</artifactId>
@@ -172,27 +188,30 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-asm</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>4.0.0.Beta2</version>
+      <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jcl</artifactId>
+      <version>1.5.3</version>
+      <scope>test</scope>
+    </dependency> 
   </dependencies>
   <build>
     <pluginManagement>
diff --git a/org.springframework.core/pom.xml b/org.springframework.core/pom.xml
index 836666ae9cd..ad0aaa9dc85 100644
--- a/org.springframework.core/pom.xml
+++ b/org.springframework.core/pom.xml
@@ -34,13 +34,11 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjweaver</artifactId>
-      <version>1.6.2</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -58,13 +56,11 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.expression/pom.xml b/org.springframework.expression/pom.xml
index 05077bf8e88..e90361613f4 100644
--- a/org.springframework.expression/pom.xml
+++ b/org.springframework.expression/pom.xml
@@ -28,13 +28,11 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.6</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/org.springframework.integration-tests/pom.xml b/org.springframework.integration-tests/pom.xml
index 12444da761c..5d8cec65188 100644
--- a/org.springframework.integration-tests/pom.xml
+++ b/org.springframework.integration-tests/pom.xml
@@ -135,7 +135,7 @@
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
-      <version>2.1_3</version>
+      <version>2.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -273,13 +273,12 @@
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjweaver</artifactId>
-      <version>1.6.2.RELEASE</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>org.codehaus.groovy</artifactId>
-      <version>1.5.1</version>
+      <version>1.6.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -297,7 +296,6 @@
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -357,7 +355,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>org.jruby</artifactId>
-      <version>1.1</version>
+      <version>1.2</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -453,7 +451,6 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -471,7 +468,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.jdbc/pom.xml b/org.springframework.jdbc/pom.xml
index 34ad41a1171..88177933714 100644
--- a/org.springframework.jdbc/pom.xml
+++ b/org.springframework.jdbc/pom.xml
@@ -85,13 +85,11 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.jms/pom.xml b/org.springframework.jms/pom.xml
index 6a53763ce86..df3e06d1c70 100644
--- a/org.springframework.jms/pom.xml
+++ b/org.springframework.jms/pom.xml
@@ -52,13 +52,11 @@
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.orm/pom.xml b/org.springframework.orm/pom.xml
index 278283b5fbc..46baa470df2 100644
--- a/org.springframework.orm/pom.xml
+++ b/org.springframework.orm/pom.xml
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
-      <version>2.1_3</version>
+      <version>2.2</version>
       <scope>test</scope>
     </dependency>
 
@@ -183,7 +183,6 @@
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjweaver</artifactId>
-      <version>1.6.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -195,7 +194,6 @@
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -207,7 +205,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.oxm/pom.xml b/org.springframework.oxm/pom.xml
index 29d67334373..53aa34a69cd 100644
--- a/org.springframework.oxm/pom.xml
+++ b/org.springframework.oxm/pom.xml
@@ -78,13 +78,11 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.6</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.easymock</groupId>
 			<artifactId>easymock</artifactId>
-			<version>2.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/org.springframework.spring-parent/pom.xml b/org.springframework.spring-parent/pom.xml
index ccb90bea33a..15ddf59cad7 100644
--- a/org.springframework.spring-parent/pom.xml
+++ b/org.springframework.spring-parent/pom.xml
@@ -30,7 +30,7 @@
       <layout>legacy</layout>
       <snapshots><enabled>false</enabled></snapshots>
     </repository>
-    <!-- for use with jexcelapi 2.6.8, portlet 2.0, hibernate 3.3.1-->
+    <!-- for use with jexcelapi 2.6.8, portlet 2.0, hibernate 3.3.1, javax.el/el-api 2.1 -->
     <repository>
       <id>jboss</id>
       <name>JBoss Repository</name>
@@ -76,17 +76,53 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+	<groupId>javax.inject</groupId>
+	<artifactId>com.springsource.javax.inject</artifactId>
+	<version>0.9.0.PFD</version>
+	<scope>provided</scope> 
+      </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.6</version>
+        <version>4.7</version>
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>org.easymock</groupId>
-        <artifactId>easymock</artifactId>
-        <version>2.3</version>
-        <scope>test</scope>
+	<groupId>org.aspectj</groupId>
+	<artifactId>aspectjweaver</artifactId>
+	<version>1.6.5</version>
+	<optional>true</optional>
+      </dependency>
+      <dependency>
+	<groupId>org.easymock</groupId>
+	<artifactId>easymock</artifactId>
+	<version>2.5.1</version>
+	<scope>test</scope>
+      </dependency>
+      <dependency>
+	<groupId>log4j</groupId>
+	<artifactId>log4j</artifactId>
+        <version>1.2.15</version>
+	<scope>test</scope>
+	<exclusions>
+	  <exclusion>
+	    <groupId>javax.mail</groupId>
+	    <artifactId>mail</artifactId>
+	  </exclusion>
+	  <exclusion>
+	    <groupId>javax.jms</groupId>
+	    <artifactId>jms</artifactId>
+	  </exclusion>
+	  <exclusion>
+	    <groupId>com.sun.jdmk</groupId>
+	    <artifactId>jmxtools</artifactId>
+	  </exclusion>
+	  <exclusion>
+	    <groupId>com.sun.jmx</groupId>
+	    <artifactId>jmxri</artifactId>
+	  </exclusion>
+	</exclusions>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/org.springframework.test/pom.xml b/org.springframework.test/pom.xml
index 370e59518c9..46065e3dcdd 100644
--- a/org.springframework.test/pom.xml
+++ b/org.springframework.test/pom.xml
@@ -58,7 +58,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.7</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -75,7 +74,6 @@
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjweaver</artifactId>
-      <version>1.6.2</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -161,7 +159,7 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-cglib-repack</artifactId>
-      <version>2.1_3</version>
+      <version>2.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/org.springframework.transaction/pom.xml b/org.springframework.transaction/pom.xml
index 4df0fbcfd09..d17623405c1 100644
--- a/org.springframework.transaction/pom.xml
+++ b/org.springframework.transaction/pom.xml
@@ -78,19 +78,16 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjweaver</artifactId>
-      <version>1.6.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -108,7 +105,7 @@
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
-      <version>2.1_3</version>
+      <version>2.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/org.springframework.web.portlet/pom.xml b/org.springframework.web.portlet/pom.xml
index 68fa02511e2..04b967105f0 100644
--- a/org.springframework.web.portlet/pom.xml
+++ b/org.springframework.web.portlet/pom.xml
@@ -100,13 +100,11 @@
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.6</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/org.springframework.web.servlet/pom.xml b/org.springframework.web.servlet/pom.xml
index 7770dcf96f1..8472a83c56f 100644
--- a/org.springframework.web.servlet/pom.xml
+++ b/org.springframework.web.servlet/pom.xml
@@ -188,13 +188,11 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -244,7 +242,7 @@
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
-      <version>2.1_3</version>
+      <version>2.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.web/pom.xml b/org.springframework.web/pom.xml
index 23719aa423d..afd048f7abd 100644
--- a/org.springframework.web/pom.xml
+++ b/org.springframework.web/pom.xml
@@ -106,7 +106,6 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -154,19 +153,17 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
-      <version>2.1_3</version>
+      <version>2.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>