Index: deployment/pom.xml
===================================================================
--- deployment/pom.xml	(revision 100822)
+++ deployment/pom.xml	(working copy)
@@ -180,8 +180,8 @@
     </dependency>
     
     <dependency>
-      <groupId>org.hibernate.java-persistence</groupId>
-      <artifactId>jpa-api</artifactId>
+      <groupId>org.hibernate.javax.persistence</groupId>
+      <artifactId>hibernate-jpa-2.0-api</artifactId>
     </dependency>
 
     <dependency>
Index: tomcat/pom.xml
===================================================================
--- tomcat/pom.xml	(revision 100822)
+++ tomcat/pom.xml	(working copy)
@@ -303,8 +303,8 @@
       <artifactId>jboss-ejb-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.hibernate.java-persistence</groupId>
-      <artifactId>jpa-api</artifactId>
+      <groupId>org.hibernate.javax.persistence</groupId>
+      <artifactId>hibernate-jpa-2.0-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.cluster</groupId>
Index: component-matrix/pom.xml
===================================================================
--- component-matrix/pom.xml	(revision 100842)
+++ component-matrix/pom.xml	(working copy)
@@ -57,7 +57,7 @@
     <version.org.hibernate>3.5.0-CR-1</version.org.hibernate>
     <version.org.hibernate.commons.annotations>3.2.0.Beta1</version.org.hibernate.commons.annotations>
     <version.org.hibernate.entity.manager>3.5.0-CR-1</version.org.hibernate.entity.manager>
-    <version.org.hibernate.java-persistence>2.0-cr-1</version.org.hibernate.java-persistence>
+    <version.org.hibernate.javax.persistence>1.0.0-CR-1</version.org.hibernate.javax.persistence>
     <version.org.hibernate.validator>4.0.2.GA</version.org.hibernate.validator>
     <version.org.jboss.aop>2.1.8.GA</version.org.jboss.aop>
     <version.org.jboss.aspects.currentinvocation>1.0.1</version.org.jboss.aspects.currentinvocation>
@@ -1307,9 +1307,9 @@
       </dependency>
       
       <dependency>
-        <groupId>org.hibernate.java-persistence</groupId>
-        <artifactId>jpa-api</artifactId>
-        <version>${version.org.hibernate.java-persistence}</version>
+        <groupId>org.hibernate.javax.persistence</groupId>
+        <artifactId>hibernate-jpa-2.0-api</artifactId>
+        <version>${version.org.hibernate.javax.persistence}</version>
       </dependency>
       
       <dependency>
Index: server/pom.xml
===================================================================
--- server/pom.xml	(revision 100822)
+++ server/pom.xml	(working copy)
@@ -267,8 +267,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.hibernate.java-persistence</groupId>
-      <artifactId>jpa-api</artifactId>
+      <groupId>org.hibernate.javax.persistence</groupId>
+      <artifactId>hibernate-jpa-2.0-api</artifactId>
     </dependency>
     
     <dependency>
Index: testsuite/build.xml
===================================================================
--- testsuite/build.xml	(revision 100822)
+++ testsuite/build.xml	(working copy)
@@ -272,7 +272,7 @@
       <fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-impl:jar"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-impl:jar:client"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-spi:jar:client"/>
-      <fileset refid="org.hibernate.java-persistence:jpa-api:jar"/>
+      <fileset refid="org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar"/>
       <fileset refid="org.hibernate:hibernate-annotations:jar"/>
       <fileset refid="org.hibernate:hibernate-core:jar"/>
       <fileset refid="org.hibernate:hibernate-entitymanager:jar"/>
Index: build/build.xml
===================================================================
--- build/build.xml	(revision 100822)
+++ build/build.xml	(working copy)
@@ -2026,7 +2026,7 @@
       <fileset refid="org.hibernate:hibernate-commons-annotations:jar"/>
       <fileset refid="org.hibernate:hibernate-entitymanager:jar"/>
       <fileset refid="org.hibernate:hibernate-annotations:jar"/>
-      <fileset refid="org.hibernate.java-persistence:jpa-api:jar"/>
+      <fileset refid="org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar"/>
       <fileset refid="org.hibernate:hibernate-validator:jar"/>
       <fileset refid="org.hibernate:hibernate-validator-legacy:jar"/>
       <fileset refid="org.jboss.interceptor:jboss-interceptor-api:jar"/>
@@ -2208,7 +2208,7 @@
       <fileset refid="org.hibernate:hibernate-annotations:jar"/>
       <fileset refid="org.hibernate:hibernate-commons-annotations:jar"/>
       <fileset refid="org.hibernate:hibernate-validator:jar"/>
-      <fileset refid="org.hibernate.java-persistence:jpa-api:jar"/>
+      <fileset refid="org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar"/>
       <fileset refid="org.jboss.aop:jboss-aop:jar:client"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-ext-api:jar"/>
       <!-- For JSR-250 impl -->
Index: client/pom.xml
===================================================================
--- client/pom.xml	(revision 100822)
+++ client/pom.xml	(working copy)
@@ -21,8 +21,8 @@
     </dependency>
     
     <dependency>
-      <groupId>org.hibernate.java-persistence</groupId>
-      <artifactId>jpa-api</artifactId>
+      <groupId>org.hibernate.javax.persistence</groupId>
+      <artifactId>hibernate-jpa-2.0-api</artifactId>
     </dependency>
 
     <dependency>