[jboss-cvs] JBossAS SVN: r108205 - 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-17 10:35:38 -0400 (Fri, 17 Sep 2010)
New Revision: 108205

Modified:
   projects/ejb3/branches/infinispan-int/build/pom.xml
   projects/ejb3/branches/infinispan-int/core/pom.xml
Log:
revert last change to upgrade Hibernate, will instead push a jboss-ejb3-as6-deplchain change

Modified: projects/ejb3/branches/infinispan-int/build/pom.xml
===================================================================
--- projects/ejb3/branches/infinispan-int/build/pom.xml	2010-09-17 14:30:00 UTC (rev 108204)
+++ projects/ejb3/branches/infinispan-int/build/pom.xml	2010-09-17 14:35:38 UTC (rev 108205)
@@ -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.6.0.CR1</version.org.hibernate>
-        <version.org.hibernate.hibernate-entitymanager>3.6.0.CR1</version.org.hibernate.hibernate-entitymanager>
+        <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>
       </properties>
     </profile>
 

Modified: projects/ejb3/branches/infinispan-int/core/pom.xml
===================================================================
--- projects/ejb3/branches/infinispan-int/core/pom.xml	2010-09-17 14:30:00 UTC (rev 108204)
+++ projects/ejb3/branches/infinispan-int/core/pom.xml	2010-09-17 14:35:38 UTC (rev 108205)
@@ -165,6 +165,19 @@
       <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>