[jboss-cvs] JBossAS SVN: r90993 - in projects/ejb3/trunk: core and 1 other directory.

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

Author: jaikiran
Date: 2009-07-09 05:28:04 -0400 (Thu, 09 Jul 2009)
New Revision: 90993

Modified:
   projects/ejb3/trunk/build/pom.xml
   projects/ejb3/trunk/core/pom.xml
Log:
EJBTHREE-1865 Upgraded Hibernate to hibernate-core 3.3.1.GA and banned org.hibernate:hibernate

Modified: projects/ejb3/trunk/build/pom.xml
===================================================================
--- projects/ejb3/trunk/build/pom.xml	2009-07-09 08:36:08 UTC (rev 90992)
+++ projects/ejb3/trunk/build/pom.xml	2009-07-09 09:28:04 UTC (rev 90993)
@@ -165,6 +165,8 @@
                 <exclude>org.jboss.microcontainer:jboss-deployers-spi</exclude>
                 <!-- EJBTHREE-1767, now org.jboss.ejb3:jboss-ejb3-proxy-impl -->
                 <exclude>org.jboss.ejb3:jboss-ejb3-proxy</exclude>
+                <!-- EJBTHREE-1865 Use org.hibernate:hibernate-core-->
+                <exclude>org.hibernate:hibernate</exclude>
               </excludes>
             </bannedDependencies>
             <requireMavenVersion>

Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml	2009-07-09 08:36:08 UTC (rev 90992)
+++ projects/ejb3/trunk/core/pom.xml	2009-07-09 09:28:04 UTC (rev 90993)
@@ -154,20 +154,36 @@
 
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>hibernate</artifactId>
-      <version>3.2.6.ga</version>
+      <artifactId>hibernate-core</artifactId>
+      <version>3.3.1.GA</version>
     </dependency>
 
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-annotations</artifactId>
       <version>3.3.1.GA</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>
       <artifactId>hibernate-entitymanager</artifactId>
       <version>3.3.2.GA</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>
@@ -354,7 +370,7 @@
       <artifactId>jboss-ejb3-common</artifactId>
       <version>1.0.0</version>
     </dependency>
-    
+
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-endpoint</artifactId>
@@ -408,7 +424,7 @@
       <artifactId>jboss-ejb3-proxy-clustered</artifactId>
       <version>1.0.1</version>
     </dependency>
-    
+
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-proxy-spi</artifactId>