[jboss-cvs] JBossAS SVN: r95620 - in branches/Branch_5_x: thirdparty and 1 other directory.

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

Author: smarlow at redhat.com
Date: 2009-10-27 12:52:08 -0400 (Tue, 27 Oct 2009)
New Revision: 95620

Modified:
   branches/Branch_5_x/component-matrix/pom.xml
   branches/Branch_5_x/thirdparty/pom.xml
Log:
JBAS-7241 Update to Entity Manager 3.5 and JPA 2.  Switch to Hibernate 3.5.0.Beta-1


Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-10-27 16:25:16 UTC (rev 95619)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-10-27 16:52:08 UTC (rev 95620)
@@ -49,13 +49,12 @@
     <version.jboss.web>2.1.4.GA</version.jboss.web>
     <version.jgroups>2.6.13.GA</version.jgroups>
     <version.junit>3.8.2</version.junit>
-    <version.org.hibernate.annotations>3.4.0.GA</version.org.hibernate.annotations>
+    <version.org.hibernate.annotations>3.5.0.Beta-1</version.org.hibernate.annotations>
     <version.org.hibernate.commons.annotations>3.1.0.GA</version.org.hibernate.commons.annotations>
-    <!-- version.org.hibernate.ejb3.persistence>1.0.2.GA</version.org.hibernate.ejb3.persistence -->
     <version.org.hibernate.java-persistence>2.0.Beta-20090815</version.org.hibernate.java-persistence>
     <version.org.hibernate.entity.manager>3.5.0.Beta-1</version.org.hibernate.entity.manager>
     <version.org.hibernate.validator>4.0.0.CR1</version.org.hibernate.validator>
-    <version.org.hibernate>3.3.1.GA</version.org.hibernate>
+    <version.org.hibernate>3.5.0.Beta-1</version.org.hibernate>
     <version.org.jboss.aop>2.1.6.GA</version.org.jboss.aop>
     <version.org.jboss.aspects.currentinvocation>1.0.0.GA</version.org.jboss.aspects.currentinvocation>
     <version.org.jboss.aspects.remoting>1.0.1.GA</version.org.jboss.aspects.remoting>
@@ -1194,7 +1193,7 @@
 
       <dependency>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-jbosscache2</artifactId>
+        <artifactId>hibernate-jbosscache</artifactId>
         <version>${version.org.hibernate}</version>
         <exclusions>
           <exclusion>
@@ -1247,13 +1246,7 @@
         <artifactId>jpa-api</artifactId>
         <version>${version.org.hibernate.java-persistence}</version>
       </dependency>
-
-      <!--dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>ejb3-persistence</artifactId>
-        <version>${version.org.hibernate.ejb3.persistence}</version>
-      </dependency -->
-      
+     
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-validator</artifactId>

Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml	2009-10-27 16:25:16 UTC (rev 95619)
+++ branches/Branch_5_x/thirdparty/pom.xml	2009-10-27 16:52:08 UTC (rev 95620)
@@ -1334,7 +1334,7 @@
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-jbosscache2</artifactId>
+      <artifactId>hibernate-jbosscache</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.interceptor</groupId>