Index: ejb3/pom.xml
===================================================================
--- ejb3/pom.xml	(revision 108358)
+++ ejb3/pom.xml	(working copy)
@@ -180,11 +180,6 @@
     </dependency>
     
     <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-annotations</artifactId>
-    </dependency>
-    
-    <dependency>
       <groupId>jacorb</groupId>
       <artifactId>jacorb</artifactId>
     </dependency>
Index: hibernate-int/pom.xml
===================================================================
--- hibernate-int/pom.xml	(revision 108358)
+++ hibernate-int/pom.xml	(working copy)
@@ -89,10 +89,6 @@
       <artifactId>hibernate-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-jmx</artifactId>
-    </dependency>    
-    <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-system-jmx</artifactId>
     </dependency>
Index: component-matrix/pom.xml
===================================================================
--- component-matrix/pom.xml	(revision 108358)
+++ component-matrix/pom.xml	(working copy)
@@ -63,7 +63,7 @@
     <version.jsr181.api>1.0-MR1</version.jsr181.api>
     <version.junit>4.6</version.junit>
     <version.ops4j.pax.web>0.7.2</version.ops4j.pax.web>
-    <version.org.hibernate>3.5.5-Final</version.org.hibernate>
+    <version.org.hibernate>3.6.0.CR1</version.org.hibernate>
     <version.org.hibernate.commons.annotations>3.2.0.Final</version.org.hibernate.commons.annotations>
     <version.org.hibernate.entity.manager>${version.org.hibernate}</version.org.hibernate.entity.manager>
     <version.org.hibernate.javax.persistence>1.0.0.Final</version.org.hibernate.javax.persistence>
@@ -85,7 +85,7 @@
     <version.org.jboss.cluster.server.core>1.0.0.Alpha2</version.org.jboss.cluster.server.core>
     <version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
     <version.org.jboss.deployers>2.2.0.Alpha7</version.org.jboss.deployers>
-    <version.org.jboss.ejb3.depchain>1.0.0-alpha-7</version.org.jboss.ejb3.depchain>
+    <version.org.jboss.ejb3.depchain>1.0.0-alpha-8</version.org.jboss.ejb3.depchain>
     <!-- This to move into the EJB3 BOM -->
     <version.org.jboss.ejb3.embedded>1.0.0-alpha-1</version.org.jboss.ejb3.embedded>
     <version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
@@ -1719,22 +1719,6 @@
 
       <dependency>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-jmx</artifactId>
-        <version>${version.org.hibernate}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-
-      <dependency>
-        <groupId>org.hibernate</groupId>
         <artifactId>hibernate-jbosscache</artifactId>
         <version>${version.org.hibernate}</version>
         <exclusions>
@@ -1747,18 +1731,6 @@
       
       <dependency>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-annotations</artifactId>
-        <version>${version.org.hibernate}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      
-      <dependency>
-        <groupId>org.hibernate</groupId>
         <artifactId>hibernate-commons-annotations</artifactId>
         <version>${version.org.hibernate.commons.annotations}</version>
       </dependency>
@@ -3469,6 +3441,18 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-annotations</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.persistence</groupId>
+            <artifactId>persistence-api</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
 
Index: testsuite/src/main/org/jboss/test/hibernate/test/HibernateConfigurationUnitTestCase.java
===================================================================
--- testsuite/src/main/org/jboss/test/hibernate/test/HibernateConfigurationUnitTestCase.java	(revision 108358)
+++ testsuite/src/main/org/jboss/test/hibernate/test/HibernateConfigurationUnitTestCase.java	(working copy)
@@ -17,7 +17,7 @@
 import org.hibernate.cfg.Settings;
 import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.engine.SessionFactoryImplementor;
-import org.hibernate.test.tm.TransactionManagerLookupImpl;
+import org.hibernate.testing.tm.TransactionManagerLookupImpl;
 import org.hibernate.transaction.JTATransactionFactory;
 import org.jboss.hibernate.deployers.metadata.BaseNamedElement;
 import org.jboss.hibernate.jmx.Hibernate;
Index: testsuite/build.xml
===================================================================
--- testsuite/build.xml	(revision 108358)
+++ testsuite/build.xml	(working copy)
@@ -278,7 +278,6 @@
       <fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-spi:jar:client"/>
       <fileset refid="org.jboss.ejb3.vfs:jboss-ejb3-vfs-spi: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"/>
       <fileset refid="org.hibernate:hibernate-jbosscache:jar"/>
@@ -320,7 +319,6 @@
       <fileset refid="hsqldb:hsqldb:jar"/>
       <!-- Need hibernate jar for hibernate-based tests -->
       <fileset refid="org.hibernate:hibernate-core:jar"/>
-      <fileset refid="org.hibernate:hibernate-jmx:jar"/>
       <fileset refid="odmg:odmg:jar"/>
       <fileset refid="cglib:cglib:jar"/>
       <!-- Need spring jar for spring-based tests -->
Index: build/build-web.xml
===================================================================
--- build/build-web.xml	(revision 108358)
+++ build/build-web.xml	(working copy)
@@ -100,7 +100,6 @@
                 <exclude name="common/lib/commons-collections.jar" />
                 <exclude name="common/lib/cxf-*.*" />
                 <exclude name="common/lib/FastInfoset.jar" />
-                <exclude name="common/lib/hibernate-annotations.jar" />
                 <exclude name="common/lib/hibernate-commons-annotations.jar" />
                 <exclude name="common/lib/hibernate-core.jar" />
                 <exclude name="common/lib/hibernate-entitymanager.jar" />
Index: build/build.xml
===================================================================
--- build/build.xml	(revision 108358)
+++ build/build.xml	(working copy)
@@ -2084,7 +2084,6 @@
       <fileset refid="org.hibernate:hibernate-core:jar"/>
       <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.javax.persistence:hibernate-jpa-2.0-api:jar"/>
       <fileset refid="org.hibernate:hibernate-validator:jar"/>
       <fileset refid="org.hibernate:hibernate-validator-legacy:jar"/>
@@ -2349,7 +2348,6 @@
       <fileset refid="org.codehaus.woodstox:wstx-lgpl:jar"/>
       <fileset refid="com.sun.xml.ws:policy:jar"/>
       <fileset refid="org.hibernate:hibernate-core:jar"/>
-      <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.javax.persistence:hibernate-jpa-2.0-api:jar"/>
Index: client/pom.xml
===================================================================
--- client/pom.xml	(revision 108358)
+++ client/pom.xml	(working copy)
@@ -26,11 +26,6 @@
     </dependency>
     
     <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-annotations</artifactId>
-    </dependency>
-    
-    <dependency>
       <groupId>org.jboss.aop</groupId>
       <artifactId>jboss-aop</artifactId>
       <classifier>client</classifier>