[jboss-cvs] JBossAS SVN: r108181 - in projects/ejb3/branches/infinispan-int: core and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: smarlow at redhat.com
Date: 2010-09-16 14:41:08 -0400 (Thu, 16 Sep 2010)
New Revision: 108181

Modified:
   projects/ejb3/branches/infinispan-int/build/pom.xml
   projects/ejb3/branches/infinispan-int/core/pom.xml
Log:
upgrade to Hibernate 3.6.0.CR1

Modified: projects/ejb3/branches/infinispan-int/build/pom.xml
===================================================================
--- projects/ejb3/branches/infinispan-int/build/pom.xml	2010-09-16 17:53:20 UTC (rev 108180)
+++ projects/ejb3/branches/infinispan-int/build/pom.xml	2010-09-16 18:41:08 UTC (rev 108181)
@@ -669,8 +669,8 @@
         <JPA.artifactId>jpa-api</JPA.artifactId>
         <JPA.version>2.0-cr-1</JPA.version>
         <version.org.jboss.ejb3.jboss-ejb3-jpa-int>2.0.0-alpha-1</version.org.jboss.ejb3.jboss-ejb3-jpa-int>
-        <version.org.hibernate>3.5.0-Beta-2</version.org.hibernate>
-        <version.org.hibernate.hibernate-entitymanager>3.5.0-Beta-2</version.org.hibernate.hibernate-entitymanager>
+        <version.org.hibernate>3.6.0.CR1</version.org.hibernate>
+        <version.org.hibernate.hibernate-entitymanager>3.6.0.CR1</version.org.hibernate.hibernate-entitymanager>
       </properties>
     </profile>
 

Modified: projects/ejb3/branches/infinispan-int/core/pom.xml
===================================================================
--- projects/ejb3/branches/infinispan-int/core/pom.xml	2010-09-16 17:53:20 UTC (rev 108180)
+++ projects/ejb3/branches/infinispan-int/core/pom.xml	2010-09-16 18:41:08 UTC (rev 108181)
@@ -165,19 +165,6 @@
       <version>${version.org.hibernate}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-annotations</artifactId>
-      <version>${version.org.hibernate}</version>
-      <!-- Exclude org.hibernate:hibernate which is banned in
-      favour of org.hibernate:hibernate-core -->
-      <exclusions>
-        <exclusion>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
 
     <dependency>
       <groupId>org.hibernate</groupId>