[hibernate-commits] Hibernate SVN: r14649 - in core/trunk/distribution: src/assembly and 1 other directory.
Author: steve.ebersole(a)jboss.com
Date: 2008-05-07 14:26:17 -0400 (Wed, 07 May 2008)
New Revision: 14649
Modified:
core/trunk/distribution/pom.xml
core/trunk/distribution/src/assembly/dist.xml
Log:
HHH-3266, HHH-3267, HHH-3268 : missing deps in dist bundle
Modified: core/trunk/distribution/pom.xml
===================================================================
--- core/trunk/distribution/pom.xml 2008-05-07 18:11:38 UTC (rev 14648)
+++ core/trunk/distribution/pom.xml 2008-05-07 18:26:17 UTC (rev 14649)
@@ -112,6 +112,26 @@
<artifactId>hibernate-proxool</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <!-- optional deps for bytecode providers since they are optional on core
-->
+ <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.1_3</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
Modified: core/trunk/distribution/src/assembly/dist.xml
===================================================================
--- core/trunk/distribution/src/assembly/dist.xml 2008-05-07 18:11:38 UTC (rev 14648)
+++ core/trunk/distribution/src/assembly/dist.xml 2008-05-07 18:26:17 UTC (rev 14649)
@@ -70,10 +70,6 @@
<includes>
<include>antlr:antlr</include>
- <include>cglib:cglib</include>
- <include>asm:asm</include>
- <include>asm:asm-attrs</include>
-
<include>commons-collections:commons-collections</include>
<include>dom4j:dom4j</include>
@@ -81,6 +77,8 @@
<include>javassist:javassist</include>
<include>org.slf4j:slf4j-api</include>
+
+ <include>javax.transaction:jta</include>
</includes>
</dependencySet>
@@ -137,6 +135,22 @@
<include>swarmcache:swarmcache</include>
</includes>
</dependencySet>
+
+ <dependencySet>
+ <outputDirectory>lib/bytecode/cglib</outputDirectory>
+ <includes>
+ <include>cglib:cglib</include>
+ <include>asm:asm</include>
+ <include>asm:asm-attrs</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>lib/bytecode/javassist</outputDirectory>
+ <includes>
+ <include>javassist:javassist</include>
+ </includes>
+ </dependencySet>
</dependencySets>
<fileSets>