[hibernate-commits] Hibernate SVN: r16892 - in core/trunk: cache-ehcache and 9 other directories.

Author: steve.ebersole(a)jboss.com Date: 2009-06-23 03:09:35 -0400 (Tue, 23 Jun 2009) New Revision: 16892 Modified: core/trunk/annotations/pom.xml core/trunk/cache-ehcache/pom.xml core/trunk/cache-jbosscache/pom.xml core/trunk/cache-jbosscache2/pom.xml core/trunk/core/pom.xml core/trunk/distribution/pom.xml core/trunk/entitymanager/pom.xml core/trunk/envers/pom.xml core/trunk/parent/pom.xml core/trunk/testsuite/pom.xml core/trunk/tutorials/pom.xml Log: HHH-3979 - Upgrade to javassist 3.9.0 Modified: core/trunk/annotations/pom.xml =================================================================== --- core/trunk/annotations/pom.xml 2009-06-23 07:09:12 UTC (rev 16891) +++ core/trunk/annotations/pom.xml 2009-06-23 07:09:35 UTC (rev 16892) @@ -67,14 +67,12 @@ <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - <version>3.4.GA</version> <scope>test</scope> </dependency> <dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId> <scope>test</scope> - <version>2.2</version> </dependency> <dependency> <groupId>javax.validation</groupId> Modified: core/trunk/cache-ehcache/pom.xml =================================================================== --- core/trunk/cache-ehcache/pom.xml 2009-06-23 07:09:12 UTC (rev 16891) +++ core/trunk/cache-ehcache/pom.xml 2009-06-23 07:09:35 UTC (rev 16892) @@ -42,13 +42,11 @@ <dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId> - <version>2.2</version> <scope>test</scope> </dependency> <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - <version>3.4.GA</version> <scope>test</scope> </dependency> </dependencies> Modified: core/trunk/cache-jbosscache/pom.xml =================================================================== --- core/trunk/cache-jbosscache/pom.xml 2009-06-23 07:09:12 UTC (rev 16891) +++ core/trunk/cache-jbosscache/pom.xml 2009-06-23 07:09:35 UTC (rev 16892) @@ -72,54 +72,16 @@ <version>1.8.0.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>99.0-does-not-exist</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - <version>99.0-does-not-exist</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl104-over-slf4j</artifactId> - <version>1.4.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.4.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - <scope>test</scope> - </dependency> <!-- these are optional on core... :( --> <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - <version>3.4.GA</version> <scope>test</scope> </dependency> <dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId> - <version>2.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - <version>3.1</version> - <scope>test</scope> - </dependency> </dependencies> </project> Modified: core/trunk/cache-jbosscache2/pom.xml =================================================================== --- core/trunk/cache-jbosscache2/pom.xml 2009-06-23 07:09:12 UTC (rev 16891) +++ core/trunk/cache-jbosscache2/pom.xml 2009-06-23 07:09:35 UTC (rev 16892) @@ -45,13 +45,11 @@ <dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId> - <version>2.2</version> <scope>test</scope> </dependency> <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - <version>3.4.GA</version> <scope>test</scope> </dependency> Modified: core/trunk/core/pom.xml =================================================================== --- core/trunk/core/pom.xml 2009-06-23 07:09:12 UTC (rev 16891) +++ core/trunk/core/pom.xml 2009-06-23 07:09:35 UTC (rev 16892) @@ -30,7 +30,19 @@ <artifactId>dom4j</artifactId> </dependency> + <!-- optional deps for bytecode providers until those are finally properly scoped --> <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <optional>true</optional> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + <optional>true</optional> + </dependency> + + <dependency> <!-- YUCK, YUCK, YUCK!!!! --> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> @@ -54,20 +66,6 @@ <version>1.6.5</version> <scope>provided</scope> </dependency> - - <!-- optional deps for bytecode providers until those are finally properly scoped --> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.4.GA</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - <version>2.2</version> - <optional>true</optional> - </dependency> </dependencies> <build> Modified: core/trunk/distribution/pom.xml =================================================================== --- core/trunk/distribution/pom.xml 2009-06-23 07:09:12 UTC (rev 16891) +++ core/trunk/distribution/pom.xml 2009-06-23 07:09:35 UTC (rev 16892) @@ -117,21 +117,13 @@ <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - <version>3.4.GA</version> <optional>true</optional> </dependency> <dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId> - <version>2.2</version> <optional>true</optional> </dependency> - <dependency> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - <version>3.1</version> - <optional>true</optional> - </dependency> </dependencies> <profiles> Modified: core/trunk/entitymanager/pom.xml =================================================================== --- core/trunk/entitymanager/pom.xml 2009-06-23 07:09:12 UTC (rev 16891) +++ core/trunk/entitymanager/pom.xml 2009-06-23 07:09:35 UTC (rev 16892) @@ -88,16 +88,6 @@ <artifactId>hibernate-annotations</artifactId> <version>${version}</version> </dependency> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.4.GA</version> - </dependency> </dependencies> </dependencyManagement> Modified: core/trunk/envers/pom.xml =================================================================== --- core/trunk/envers/pom.xml 2009-06-23 07:09:12 UTC (rev 16891) +++ core/trunk/envers/pom.xml 2009-06-23 07:09:35 UTC (rev 16892) @@ -110,13 +110,11 @@ <dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId> - <version>2.2</version> <scope>test</scope> </dependency> <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - <version>3.4.GA</version> <scope>test</scope> </dependency> </dependencies> Modified: core/trunk/parent/pom.xml =================================================================== --- core/trunk/parent/pom.xml 2009-06-23 07:09:12 UTC (rev 16891) +++ core/trunk/parent/pom.xml 2009-06-23 07:09:35 UTC (rev 16892) @@ -335,6 +335,18 @@ <artifactId>dom4j</artifactId> <version>1.6.1</version> </dependency> + <!-- javassist is optional, but if defined it should be version 3.9.0 --> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.9.0.GA</version> + </dependency> + <!-- cglib is optional, but if defined it should be version 2.2 --> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + <version>2.2</version> + </dependency> </dependencies> </dependencyManagement> Modified: core/trunk/testsuite/pom.xml =================================================================== --- core/trunk/testsuite/pom.xml 2009-06-23 07:09:12 UTC (rev 16891) +++ core/trunk/testsuite/pom.xml 2009-06-23 07:09:35 UTC (rev 16892) @@ -31,12 +31,10 @@ <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - <version>3.4.GA</version> </dependency> <dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId> - <version>2.2</version> </dependency> <!-- optional dom4j dependency; needed here for dom4j (de)serialization --> <dependency> Modified: core/trunk/tutorials/pom.xml =================================================================== --- core/trunk/tutorials/pom.xml 2009-06-23 07:09:12 UTC (rev 16891) +++ core/trunk/tutorials/pom.xml 2009-06-23 07:09:35 UTC (rev 16892) @@ -62,18 +62,11 @@ <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - <version>3.4.GA</version> </dependency> <dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId> - <version>2.1_3</version> </dependency> - <dependency> - <groupId>asm</groupId> - <artifactId>asm-attrs</artifactId> - <version>1.5.3</version> - </dependency> <!-- optional dom4j dependency; needed here for dom4j (de)serialization --> <dependency> <groupId>jaxen</groupId>