From 4bb621ec8057f4fb7e8b0784f5638f6c3ae13fab Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Wed, 7 May 2008 18:26:17 +0000
Subject: [PATCH] HHH-3266, HHH-3267, HHH-3268 : missing deps in dist bundle

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@14649 1b8cb986-b30d-0410-93ca-fae66ebed9b2
---
 distribution/pom.xml               | 20 ++++++++++++++++++++
 distribution/src/assembly/dist.xml | 22 ++++++++++++++++++----
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 40ff9dba9a..02034788d0 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -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>
diff --git a/distribution/src/assembly/dist.xml b/distribution/src/assembly/dist.xml
index adee9bed76..05a1fc726c 100644
--- a/distribution/src/assembly/dist.xml
+++ b/distribution/src/assembly/dist.xml
@@ -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>