--- org.springframework.orm/pom.xml	2012-05-28 21:51:34.670930420 +0200
+++ org.springframework.orm/pom.xml-gil	2012-05-28 21:51:41.811930459 +0200
@@ -34,15 +34,57 @@
       <optional>true</optional>
     </dependency>
     <!-- common logging dependency is in spring-core -->
-    <dependency>
+    <!--dependency>
       <groupId>org.apache.ibatis</groupId>
       <artifactId>ibatis-sqlmap</artifactId>
       <version>2.3.4.726</version>
       <optional>true</optional>
+    </dependency-->
+    <dependency>
+      <groupId>org.apache.openjpa</groupId>
+      <artifactId>openjpa-lib</artifactId>
+      <version>1.1.0</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.openjpa</groupId>
-      <artifactId>openjpa</artifactId>
+      <artifactId>openjpa-kernel</artifactId>
+      <version>1.1.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.openjpa</groupId>
+      <artifactId>openjpa-jdbc</artifactId>
+      <version>1.1.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.openjpa</groupId>
+      <artifactId>openjpa-persistence</artifactId>
+      <version>1.1.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.openjpa</groupId>
+      <artifactId>openjpa-persistence-jdbc</artifactId>
+      <version>1.1.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.openjpa</groupId>
+      <artifactId>openjpa-xmlstore</artifactId>
+      <version>1.1.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.openjpa</groupId>
+      <artifactId>openjpa-slice</artifactId>
+      <version>1.1.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.openjpa</groupId>
+      <artifactId>openjpa-jest</artifactId>
       <version>1.1.0</version>
       <optional>true</optional>
     </dependency>
@@ -59,14 +101,14 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.persistence</groupId>
-      <artifactId>org.eclipse.persistence.asm</artifactId>
+      <groupId>asm</groupId>
+      <artifactId>asm</artifactId>
       <version>1.0.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.persistence</groupId>
-      <artifactId>org.eclipse.persistence.antlr</artifactId>
+      <groupId>antlr</groupId>
+      <artifactId>antlr</artifactId>
       <version>1.0.1</version>
       <scope>test</scope>
     </dependency>
@@ -76,12 +118,12 @@
       <version>3.6.0.Final</version>
       <optional>true</optional>
     </dependency>
-    <dependency>
+    <!--dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-cglib-repack</artifactId>
       <version>2.1_3</version>
       <scope>test</scope>
-    </dependency>
+    </dependency-->
     <dependency>
       <groupId>net.sf.cglib</groupId>
       <artifactId>cglib</artifactId>
@@ -100,12 +142,12 @@
       <scope>test</scope>
       <optional>true</optional>
     </dependency>
-    <dependency>
+    <!--dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-annotations</artifactId>
       <version>3.4.0.GA</version>
       <optional>true</optional>
-    </dependency>
+    </dependency-->
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-entitymanager</artifactId>