[jboss-cvs] JBossAS SVN: r108377 - in trunk: client and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 29 11:17:38 EDT 2010
Author: smarlow at redhat.com
Date: 2010-09-29 11:17:37 -0400 (Wed, 29 Sep 2010)
New Revision: 108377
Modified:
trunk/build/build-web.xml
trunk/build/build.xml
trunk/client/pom.xml
trunk/component-matrix/pom.xml
trunk/ejb3/pom.xml
trunk/hibernate-int/pom.xml
trunk/testsuite/build.xml
trunk/testsuite/src/main/org/jboss/test/hibernate/test/HibernateConfigurationUnitTestCase.java
Log:
JBAS-8413 upgrade to Hibernate 3.6.0.CR1
Modified: trunk/build/build-web.xml
===================================================================
--- trunk/build/build-web.xml 2010-09-29 09:13:30 UTC (rev 108376)
+++ trunk/build/build-web.xml 2010-09-29 15:17:37 UTC (rev 108377)
@@ -100,7 +100,6 @@
<exclude name="common/lib/commons-collections.jar" />
<exclude name="common/lib/cxf-*.*" />
<exclude name="common/lib/FastInfoset.jar" />
- <exclude name="common/lib/hibernate-annotations.jar" />
<exclude name="common/lib/hibernate-commons-annotations.jar" />
<exclude name="common/lib/hibernate-core.jar" />
<exclude name="common/lib/hibernate-entitymanager.jar" />
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-09-29 09:13:30 UTC (rev 108376)
+++ trunk/build/build.xml 2010-09-29 15:17:37 UTC (rev 108377)
@@ -2084,7 +2084,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"/>
@@ -2349,7 +2348,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: trunk/client/pom.xml
===================================================================
--- trunk/client/pom.xml 2010-09-29 09:13:30 UTC (rev 108376)
+++ trunk/client/pom.xml 2010-09-29 15:17:37 UTC (rev 108377)
@@ -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: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-09-29 09:13:30 UTC (rev 108376)
+++ trunk/component-matrix/pom.xml 2010-09-29 15:17:37 UTC (rev 108377)
@@ -63,7 +63,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.5-Final</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>
@@ -85,7 +85,7 @@
<version.org.jboss.cluster.server.core>1.0.0.Alpha2</version.org.jboss.cluster.server.core>
<version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
<version.org.jboss.deployers>2.2.0.Alpha7</version.org.jboss.deployers>
- <version.org.jboss.ejb3.depchain>1.0.0-alpha-7</version.org.jboss.ejb3.depchain>
+ <version.org.jboss.ejb3.depchain>1.0.0-alpha-9</version.org.jboss.ejb3.depchain>
<!-- This to move into the EJB3 BOM -->
<version.org.jboss.ejb3.embedded>1.0.0-alpha-1</version.org.jboss.ejb3.embedded>
<version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
@@ -1719,22 +1719,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-jbosscache</artifactId>
<version>${version.org.hibernate}</version>
<exclusions>
@@ -1747,18 +1731,6 @@
<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>
@@ -3469,6 +3441,18 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml 2010-09-29 09:13:30 UTC (rev 108376)
+++ trunk/ejb3/pom.xml 2010-09-29 15:17:37 UTC (rev 108377)
@@ -180,11 +180,6 @@
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- </dependency>
-
- <dependency>
<groupId>jacorb</groupId>
<artifactId>jacorb</artifactId>
</dependency>
Modified: trunk/hibernate-int/pom.xml
===================================================================
--- trunk/hibernate-int/pom.xml 2010-09-29 09:13:30 UTC (rev 108376)
+++ trunk/hibernate-int/pom.xml 2010-09-29 15:17:37 UTC (rev 108377)
@@ -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: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2010-09-29 09:13:30 UTC (rev 108376)
+++ trunk/testsuite/build.xml 2010-09-29 15:17:37 UTC (rev 108377)
@@ -278,7 +278,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-jbosscache:jar"/>
@@ -320,7 +319,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: trunk/testsuite/src/main/org/jboss/test/hibernate/test/HibernateConfigurationUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/hibernate/test/HibernateConfigurationUnitTestCase.java 2010-09-29 09:13:30 UTC (rev 108376)
+++ trunk/testsuite/src/main/org/jboss/test/hibernate/test/HibernateConfigurationUnitTestCase.java 2010-09-29 15:17:37 UTC (rev 108377)
@@ -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