Index: thirdparty/pom.xml
===================================================================
--- thirdparty/pom.xml	(revision 95221)
+++ thirdparty/pom.xml	(working copy)
@@ -933,12 +933,19 @@
               </mapping>
             </dependency>
             <dependency>
+              <groupId>org.hibernate.java-persistence</groupId>
+              <artifactId>jpa-api</artifactId>
+              <mapping>
+                <componentId>hibernate-entitymanager</componentId>
+              </mapping>
+            </dependency>
+            <!--dependency>
               <groupId>org.hibernate</groupId>
               <artifactId>ejb3-persistence</artifactId>
               <mapping>
                 <componentId>hibernate-entitymanager</componentId>
               </mapping>
-            </dependency>
+            </dependency -->
             <dependency>
               <groupId>org.hibernate</groupId>
               <artifactId>hibernate-validator</artifactId>
@@ -1302,9 +1309,13 @@
       <artifactId>hibernate-annotations</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.hibernate.java-persistence</groupId>
+      <artifactId>jpa-api</artifactId>
+    </dependency>
+    <!--dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>ejb3-persistence</artifactId>
-    </dependency>
+    </dependency-->
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-commons-annotations</artifactId>
Index: component-matrix/pom.xml
===================================================================
--- component-matrix/pom.xml	(revision 95342)
+++ component-matrix/pom.xml	(working copy)
@@ -51,8 +51,9 @@
     <version.junit>3.8.2</version.junit>
     <version.org.hibernate.annotations>3.4.0.GA</version.org.hibernate.annotations>
     <version.org.hibernate.commons.annotations>3.1.0.GA</version.org.hibernate.commons.annotations>
-    <version.org.hibernate.ejb3.persistence>1.0.2.GA</version.org.hibernate.ejb3.persistence>
-    <version.org.hibernate.entity.manager>3.4.0.GA</version.org.hibernate.entity.manager>
+    <!-- version.org.hibernate.ejb3.persistence>1.0.2.GA</version.org.hibernate.ejb3.persistence -->
+    <version.org.hibernate.java-persistence>2.0.Beta-20090815</version.org.hibernate.java-persistence>
+    <version.org.hibernate.entity.manager>3.5.0.Beta-1</version.org.hibernate.entity.manager>
     <version.org.hibernate.validator>4.0.0.CR1</version.org.hibernate.validator>
     <version.org.hibernate>3.3.1.GA</version.org.hibernate>
     <version.org.jboss.aop>2.1.6.GA</version.org.jboss.aop>
@@ -1228,6 +1229,10 @@
         <exclusions>
           <exclusion>
             <groupId>org.hibernate</groupId>
+            <artifactId>ejb3-persistence</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.hibernate</groupId>
             <artifactId>hibernate</artifactId>
           </exclusion>
           <exclusion>
@@ -1238,10 +1243,16 @@
       </dependency>
       
       <dependency>
+        <groupId>org.hibernate.java-persistence</groupId>
+        <artifactId>jpa-api</artifactId>
+        <version>${version.org.hibernate.java-persistence}</version>
+      </dependency>
+
+      <!--dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>ejb3-persistence</artifactId>
         <version>${version.org.hibernate.ejb3.persistence}</version>
-      </dependency>
+      </dependency -->
       
       <dependency>
         <groupId>org.hibernate</groupId>