diff --git a/build-spring-framework/pom.xml b/build-spring-framework/pom.xml
index 7ba3f25f5f..2c1007c777 100644
--- a/build-spring-framework/pom.xml
+++ b/build-spring-framework/pom.xml
@@ -22,10 +22,6 @@
       <name>IBiblio mirro</name>
       <url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url>
     </repository>
-    <repository>
-      <id>EclipseLink Repo</id>
-      <url>http://mirror.cc.vt.edu/pub/eclipse/rt/eclipselink/maven.repo/</url>
-      </repository>    
     -->
     <!-- for use with jexcelapi 2.6.8, portlet 2.0, hibernate 3.3.1-->
     <repository>
@@ -33,6 +29,11 @@
       <name>JBoss Repository</name>
       <url>http://repository.jboss.org/maven2</url>
     </repository>
+    <repository>
+      <id>EclipseLink Repo</id>
+      <url>http://mirror.cc.vt.edu/pub/eclipse/rt/eclipselink/maven.repo/</url>
+    </repository>    
+
 
     <!-- fallback to S2 bundle repo for com.ibm.websphere.uow, oracle.classloader, com.sun.enterprise.loader -->
     <repository>
diff --git a/org.springframework.context.support/pom.xml b/org.springframework.context.support/pom.xml
index 7b3c9b5355..ac9dbb3192 100644
--- a/org.springframework.context.support/pom.xml
+++ b/org.springframework.context.support/pom.xml
@@ -19,6 +19,20 @@
       <version>1.1.0</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>javax.transaction</groupId>
+      <artifactId>jta</artifactId>
+      <version>1.1</version>
+    </dependency>
+
+
+
+    <dependency>
+      <groupId>quartz</groupId>
+      <artifactId>quartz</artifactId>
+      <version>1.6.2</version>
+    </dependency>
+
     <dependency>
       <groupId>org.freemarker</groupId>
       <artifactId>freemarker</artifactId>
@@ -73,6 +87,12 @@
       <version>1.6.0</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>jfree</groupId>
+      <artifactId>jfreechart</artifactId>
+      <version>1.0.9-brew</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
@@ -128,17 +148,15 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <junitArtifactName>junit:junit</junitArtifactName>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
+    <testResources>
+      <testResource>
+        <directory>src/main/java</directory>
+        <includes>
+          <include>**/*.types</include>
+        </includes>
+      </testResource>
+    </testResources>
   </build>
 </project>
diff --git a/org.springframework.orm/pom.xml b/org.springframework.orm/pom.xml
index 5f2d87164b..c7d22c0df1 100644
--- a/org.springframework.orm/pom.xml
+++ b/org.springframework.orm/pom.xml
@@ -43,10 +43,10 @@
       <version>1.1.0</version>
       <optional>true</optional>
     </dependency>
-    <!--
+
     <dependency>
       <groupId>org.eclipse.persistence</groupId>
-      <artifactId>org.eclipse.persistence</artifactId>
+      <artifactId>org.eclipse.persistence.core</artifactId>
       <version>1.0.1</version>
       <scope>test</scope>
     </dependency>
@@ -54,9 +54,21 @@
       <groupId>org.eclipse.persistence</groupId>
       <artifactId>org.eclipse.persistence.jpa</artifactId>
       <version>1.0.1</version>
-      <optional>true</optional>
+      <scope>test</scope>
     </dependency>
-    -->
+    <dependency>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>org.eclipse.persistence.asm</artifactId>
+      <version>1.0.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>org.eclipse.persistence.antlr</artifactId>
+      <version>1.0.1</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
@@ -64,12 +76,20 @@
       <optional>true</optional>
     </dependency>
 
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-cglib-repack</artifactId>
+      <version>2.1_3</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
       <version>2.1_3</version>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-jdk14</artifactId>