[hibernate-commits] Hibernate SVN: r16891 - in core/branches/Branch_3_3: cache-jbosscache and 7 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Tue Jun 23 03:09:13 EDT 2009
Author: steve.ebersole at jboss.com
Date: 2009-06-23 03:09:12 -0400 (Tue, 23 Jun 2009)
New Revision: 16891
Modified:
core/branches/Branch_3_3/cache-ehcache/pom.xml
core/branches/Branch_3_3/cache-jbosscache/pom.xml
core/branches/Branch_3_3/cache-jbosscache2/pom.xml
core/branches/Branch_3_3/core/pom.xml
core/branches/Branch_3_3/distribution/pom.xml
core/branches/Branch_3_3/documentation/manual/pom.xml
core/branches/Branch_3_3/parent/pom.xml
core/branches/Branch_3_3/testsuite/pom.xml
core/branches/Branch_3_3/tutorials/pom.xml
Log:
HHH-3979 - Upgrade to javassist 3.9.0
Modified: core/branches/Branch_3_3/cache-ehcache/pom.xml
===================================================================
--- core/branches/Branch_3_3/cache-ehcache/pom.xml 2009-06-23 06:20:55 UTC (rev 16890)
+++ core/branches/Branch_3_3/cache-ehcache/pom.xml 2009-06-23 07:09:12 UTC (rev 16891)
@@ -45,14 +45,12 @@
<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>
-</project>
\ No newline at end of file
+</project>
Modified: core/branches/Branch_3_3/cache-jbosscache/pom.xml
===================================================================
--- core/branches/Branch_3_3/cache-jbosscache/pom.xml 2009-06-23 06:20:55 UTC (rev 16890)
+++ core/branches/Branch_3_3/cache-jbosscache/pom.xml 2009-06-23 07:09:12 UTC (rev 16891)
@@ -73,53 +73,21 @@
<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>
+ <version>${slf4jVersion}</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>
\ No newline at end of file
Modified: core/branches/Branch_3_3/cache-jbosscache2/pom.xml
===================================================================
--- core/branches/Branch_3_3/cache-jbosscache2/pom.xml 2009-06-23 06:20:55 UTC (rev 16890)
+++ core/branches/Branch_3_3/cache-jbosscache2/pom.xml 2009-06-23 07:09:12 UTC (rev 16891)
@@ -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>
</dependencies>
Modified: core/branches/Branch_3_3/core/pom.xml
===================================================================
--- core/branches/Branch_3_3/core/pom.xml 2009-06-23 06:20:55 UTC (rev 16890)
+++ core/branches/Branch_3_3/core/pom.xml 2009-06-23 07:09:12 UTC (rev 16891)
@@ -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/branches/Branch_3_3/distribution/pom.xml
===================================================================
--- core/branches/Branch_3_3/distribution/pom.xml 2009-06-23 06:20:55 UTC (rev 16890)
+++ core/branches/Branch_3_3/distribution/pom.xml 2009-06-23 07:09:12 UTC (rev 16891)
@@ -117,13 +117,11 @@
<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>
Modified: core/branches/Branch_3_3/documentation/manual/pom.xml
===================================================================
--- core/branches/Branch_3_3/documentation/manual/pom.xml 2009-06-23 06:20:55 UTC (rev 16890)
+++ core/branches/Branch_3_3/documentation/manual/pom.xml 2009-06-23 07:09:12 UTC (rev 16891)
@@ -107,4 +107,24 @@
</plugins>
</build>
+
+ <properties>
+ <skipTranslations>true</skipTranslations>
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>processTransations</id>
+ <activation>
+ <property>
+ <name>processTransations</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <properties>
+ <skipTranslations>false</skipTranslations>
+ </properties>
+ </profile>
+ </profiles>
+
</project>
\ No newline at end of file
Modified: core/branches/Branch_3_3/parent/pom.xml
===================================================================
--- core/branches/Branch_3_3/parent/pom.xml 2009-06-23 06:20:55 UTC (rev 16890)
+++ core/branches/Branch_3_3/parent/pom.xml 2009-06-23 07:09:12 UTC (rev 16891)
@@ -334,6 +334,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/branches/Branch_3_3/testsuite/pom.xml
===================================================================
--- core/branches/Branch_3_3/testsuite/pom.xml 2009-06-23 06:20:55 UTC (rev 16890)
+++ core/branches/Branch_3_3/testsuite/pom.xml 2009-06-23 07:09:12 UTC (rev 16891)
@@ -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/branches/Branch_3_3/tutorials/pom.xml
===================================================================
--- core/branches/Branch_3_3/tutorials/pom.xml 2009-06-23 06:20:55 UTC (rev 16890)
+++ core/branches/Branch_3_3/tutorials/pom.xml 2009-06-23 07:09:12 UTC (rev 16891)
@@ -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.2</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>
More information about the hibernate-commits
mailing list