[jboss-cvs] JBossAS SVN: r108182 - in branches/infinispan-int: client and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 16 14:49:16 EDT 2010
Author: smarlow at redhat.com
Date: 2010-09-16 14:49:15 -0400 (Thu, 16 Sep 2010)
New Revision: 108182
Modified:
branches/infinispan-int/build/build.xml
branches/infinispan-int/client/pom.xml
branches/infinispan-int/component-matrix/pom.xml
branches/infinispan-int/ejb3/pom.xml
branches/infinispan-int/hibernate-int/pom.xml
branches/infinispan-int/testsuite/build.xml
branches/infinispan-int/testsuite/src/main/org/jboss/test/hibernate/test/HibernateConfigurationUnitTestCase.java
Log:
upgrade to Hibernate 3.6.0.CR1
Modified: branches/infinispan-int/build/build.xml
===================================================================
--- branches/infinispan-int/build/build.xml 2010-09-16 18:41:08 UTC (rev 108181)
+++ branches/infinispan-int/build/build.xml 2010-09-16 18:49:15 UTC (rev 108182)
@@ -2174,7 +2174,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"/>
@@ -2441,7 +2440,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"/>
Modified: branches/infinispan-int/client/pom.xml
===================================================================
--- branches/infinispan-int/client/pom.xml 2010-09-16 18:41:08 UTC (rev 108181)
+++ branches/infinispan-int/client/pom.xml 2010-09-16 18:49:15 UTC (rev 108182)
@@ -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>
Modified: branches/infinispan-int/component-matrix/pom.xml
===================================================================
--- branches/infinispan-int/component-matrix/pom.xml 2010-09-16 18:41:08 UTC (rev 108181)
+++ branches/infinispan-int/component-matrix/pom.xml 2010-09-16 18:49:15 UTC (rev 108182)
@@ -83,7 +83,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.6-SNAPSHOT</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>
@@ -1747,22 +1747,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-infinispan</artifactId>
<version>${version.org.hibernate}</version>
<exclusions>
@@ -1772,21 +1756,9 @@
</exclusion>
</exclusions>
</dependency>
-
+
<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>
Modified: branches/infinispan-int/ejb3/pom.xml
===================================================================
--- branches/infinispan-int/ejb3/pom.xml 2010-09-16 18:41:08 UTC (rev 108181)
+++ branches/infinispan-int/ejb3/pom.xml 2010-09-16 18:49:15 UTC (rev 108182)
@@ -180,11 +180,6 @@
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- </dependency>
-
- <dependency>
<groupId>jacorb</groupId>
<artifactId>jacorb</artifactId>
</dependency>
Modified: branches/infinispan-int/hibernate-int/pom.xml
===================================================================
--- branches/infinispan-int/hibernate-int/pom.xml 2010-09-16 18:41:08 UTC (rev 108181)
+++ branches/infinispan-int/hibernate-int/pom.xml 2010-09-16 18:49:15 UTC (rev 108182)
@@ -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>
Modified: branches/infinispan-int/testsuite/build.xml
===================================================================
--- branches/infinispan-int/testsuite/build.xml 2010-09-16 18:41:08 UTC (rev 108181)
+++ branches/infinispan-int/testsuite/build.xml 2010-09-16 18:49:15 UTC (rev 108182)
@@ -287,7 +287,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-infinispan:jar"/>
@@ -329,7 +328,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 -->
Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/hibernate/test/HibernateConfigurationUnitTestCase.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/hibernate/test/HibernateConfigurationUnitTestCase.java 2010-09-16 18:41:08 UTC (rev 108181)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/hibernate/test/HibernateConfigurationUnitTestCase.java 2010-09-16 18:49:15 UTC (rev 108182)
@@ -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;
More information about the jboss-cvs-commits
mailing list