diff --git a/org.springframework.aop/pom.xml b/org.springframework.aop/pom.xml
index fafdb6b52e8..a38196af727 100644
--- a/org.springframework.aop/pom.xml
+++ b/org.springframework.aop/pom.xml
@@ -70,19 +70,15 @@
     <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.5</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-asm</artifactId>
-      <version>${project.version}</version>
+      <groupId>org.objectweb.asm</groupId>
+      <artifactId>org.springframework.asm</artifactId>
+      <version>2.2.3</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/org.springframework.context.support/pom.xml b/org.springframework.context.support/pom.xml
index e3053e3744f..413113d0512 100644
--- a/org.springframework.context.support/pom.xml
+++ b/org.springframework.context.support/pom.xml
@@ -20,14 +20,9 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>quartz</groupId>
+      <groupId>opensymphony</groupId>
       <artifactId>quartz</artifactId>
       <version>1.6.2</version>
-    </dependency>
-    <dependency>
-      <groupId>opensymphony</groupId>
-      <artifactId>quartz-all</artifactId>
-      <version>1.6.0</version>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml
index cac97948ef0..89a4b8ac0b6 100644
--- a/org.springframework.context/pom.xml
+++ b/org.springframework.context/pom.xml
@@ -182,9 +182,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-asm</artifactId>
-      <version>${project.version}</version>
+      <groupId>org.objectweb.asm</groupId>
+      <artifactId>org.springframework.asm</artifactId>
+      <version>2.2.3</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/org.springframework.core/pom.xml b/org.springframework.core/pom.xml
index c622d99e1ca..c932954a301 100644
--- a/org.springframework.core/pom.xml
+++ b/org.springframework.core/pom.xml
@@ -20,9 +20,9 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-asm</artifactId>
-      <version>${project.version}</version>
+      <groupId>org.objectweb.asm</groupId>
+      <artifactId>org.springframework.asm</artifactId>
+      <version>2.2.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.expression/pom.xml b/org.springframework.expression/pom.xml
index 12e7d4b7e3b..66bb803fb26 100644
--- a/org.springframework.expression/pom.xml
+++ b/org.springframework.expression/pom.xml
@@ -25,12 +25,6 @@
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr</artifactId>
-      <version>3.0.1</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -40,8 +34,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
   <build>
diff --git a/org.springframework.jdbc/pom.xml b/org.springframework.jdbc/pom.xml
index 0f038ca7e27..ce0980d135e 100644
--- a/org.springframework.jdbc/pom.xml
+++ b/org.springframework.jdbc/pom.xml
@@ -56,9 +56,9 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-	  <groupId>hsqldb</groupId>
-	  <artifactId>hsqldb</artifactId>
-	  <version>1.8.0.7</version>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>1.8.0.7</version>
       <scope>compile</scope>
       <optional>true</optional>      
     </dependency>
@@ -68,18 +68,21 @@
       <version>1.0.71</version>
       <scope>compile</scope>
       <optional>true</optional>      
-    </dependency>        
+    </dependency>    
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.4.2.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>      
+    </dependency>   
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
diff --git a/org.springframework.jms/pom.xml b/org.springframework.jms/pom.xml
index 2ec8eaa0dff..f4bba9969ba 100644
--- a/org.springframework.jms/pom.xml
+++ b/org.springframework.jms/pom.xml
@@ -52,14 +52,10 @@
     <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.5</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
diff --git a/org.springframework.orm/pom.xml b/org.springframework.orm/pom.xml
index 2495f3b5849..3445a4e43e6 100644
--- a/org.springframework.orm/pom.xml
+++ b/org.springframework.orm/pom.xml
@@ -195,8 +195,6 @@
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>hsqldb</groupId>
@@ -207,8 +205,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/org.springframework.oxm/pom.xml b/org.springframework.oxm/pom.xml
index 6d8bc15d1fc..35b182bc195 100644
--- a/org.springframework.oxm/pom.xml
+++ b/org.springframework.oxm/pom.xml
@@ -76,14 +76,10 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.codehaus.jettison</groupId>
diff --git a/org.springframework.spring-parent/pom.xml b/org.springframework.spring-parent/pom.xml
index 0a38bdf8981..989591970db 100644
--- a/org.springframework.spring-parent/pom.xml
+++ b/org.springframework.spring-parent/pom.xml
@@ -39,6 +39,11 @@
       <id>EclipseLink Repo</id>
       <url>http://mirror.cc.vt.edu/pub/eclipse/rt/eclipselink/maven.repo/</url>
     </repository>
+    <!-- for rome 1.0 -->
+    <repository>
+      <id>sun-repo-2</id>
+      <url>http://download.java.net/maven/2/</url>
+    </repository>    
     <!-- fallback to S2 bundle repo for com.ibm.websphere.uow, oracle.classloader, com.sun.enterprise.loader -->
     <repository>
       <id>com.springsource.repository.bundles.release</id>
@@ -65,6 +70,18 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.5</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.easymock</groupId>
+        <artifactId>easymock</artifactId>
+        <version>2.3</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -161,6 +178,7 @@
             <exclude>**/Abstract*.java</exclude>
           </excludes>
           <junitArtifactName>junit:junit</junitArtifactName>
+	  <argLine>-Xmx512m</argLine>
         </configuration>
       </plugin>
     </plugins>
diff --git a/org.springframework.test/pom.xml b/org.springframework.test/pom.xml
index 8bad03d96a9..4d222fba9ab 100644
--- a/org.springframework.test/pom.xml
+++ b/org.springframework.test/pom.xml
@@ -58,8 +58,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
-      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/org.springframework.transaction/pom.xml b/org.springframework.transaction/pom.xml
index 1bb85c17ef1..9e299667818 100644
--- a/org.springframework.transaction/pom.xml
+++ b/org.springframework.transaction/pom.xml
@@ -78,8 +78,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
@@ -90,8 +88,6 @@
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
diff --git a/org.springframework.web.portlet/pom.xml b/org.springframework.web.portlet/pom.xml
index f0f1dcef662..0c6424a07d0 100644
--- a/org.springframework.web.portlet/pom.xml
+++ b/org.springframework.web.portlet/pom.xml
@@ -86,22 +86,18 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-asm</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
+      <groupId>org.objectweb.asm</groupId>
+      <artifactId>org.springframework.asm</artifactId>
+      <version>2.2.3</version>
+      <scope>compile</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.5</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
   <build>
diff --git a/org.springframework.web.servlet/pom.xml b/org.springframework.web.servlet/pom.xml
index e201de5da00..35ff7d64009 100644
--- a/org.springframework.web.servlet/pom.xml
+++ b/org.springframework.web.servlet/pom.xml
@@ -55,6 +55,11 @@
       <version>1.1.2</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>taglibs</groupId>
+      <artifactId>standard</artifactId>
+      <version>1.1.2</version>
+    </dependency>
     <dependency>
       <groupId>net.sourceforge.jexcelapi</groupId>
       <artifactId>jxl</artifactId>
@@ -111,7 +116,7 @@
     </dependency>
     <dependency>
       <groupId>velocity-tools</groupId>
-      <artifactId>velocity-tools-generic</artifactId>
+      <artifactId>velocity-tools-view</artifactId>
       <version>1.4</version>
       <optional>true</optional>
     </dependency>
@@ -145,6 +150,12 @@
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-orm</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
@@ -154,20 +165,16 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</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>test</scope>
+      <groupId>org.objectweb.asm</groupId>
+      <artifactId>org.springframework.asm</artifactId>
+      <version>2.2.3</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>xmlunit</groupId>
@@ -193,5 +200,19 @@
       <version>2.1_3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-core</artifactId>
+      <version>3.3.1.GA</version>
+      <scope>test</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jta_1.1_spec</artifactId>
+      <version>1.1</version>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 </project>
diff --git a/org.springframework.web/pom.xml b/org.springframework.web/pom.xml
index 6e368d826e5..4b9508f250a 100644
--- a/org.springframework.web/pom.xml
+++ b/org.springframework.web/pom.xml
@@ -136,8 +136,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>cglib</groupId>
@@ -148,8 +146,6 @@
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>