[hibernate-commits] Hibernate SVN: r17934 - in core/branches/Branch_3_3: distribution/src/assembly and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2009-11-05 16:50:47 -0500 (Thu, 05 Nov 2009)
New Revision: 17934

Modified:
   core/branches/Branch_3_3/core/pom.xml
   core/branches/Branch_3_3/distribution/src/assembly/dist.xml
Log:
HHH-4548 - Alter poms to not use javax.* artifacts under Sun proprietary license


Modified: core/branches/Branch_3_3/core/pom.xml
===================================================================
--- core/branches/Branch_3_3/core/pom.xml	2009-11-05 20:00:52 UTC (rev 17933)
+++ core/branches/Branch_3_3/core/pom.xml	2009-11-05 21:50:47 UTC (rev 17934)
@@ -44,23 +44,17 @@
 
         <dependency>
             <!-- YUCK, YUCK, YUCK!!!! -->
-            <groupId>javax.transaction</groupId>
-            <artifactId>jta</artifactId>
-            <version>1.1</version>
+            <groupId>org.jboss.javaee</groupId>
+            <artifactId>jboss-transaction-api</artifactId>
+            <version>1.0.1.GA</version>
         </dependency>
         <dependency>
-            <groupId>javax.security</groupId>
-            <artifactId>jaas</artifactId>
-            <version>1.0.01</version>
+            <groupId>org.jboss.javaee</groupId>
+            <artifactId>jboss-jacc-api</artifactId>
+            <version>1.1.0.GA</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.security</groupId>
-            <artifactId>jacc</artifactId>
-            <version>1.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>ant</groupId>
             <artifactId>ant</artifactId>
             <version>1.6.5</version>

Modified: core/branches/Branch_3_3/distribution/src/assembly/dist.xml
===================================================================
--- core/branches/Branch_3_3/distribution/src/assembly/dist.xml	2009-11-05 20:00:52 UTC (rev 17933)
+++ core/branches/Branch_3_3/distribution/src/assembly/dist.xml	2009-11-05 21:50:47 UTC (rev 17934)
@@ -66,6 +66,7 @@
 
     <dependencySets>
         <dependencySet>
+            <!-- The normal required dependencySet -->
             <outputDirectory>lib/required</outputDirectory>
             <includes>
                 <include>antlr:antlr</include>
@@ -77,9 +78,16 @@
                 <include>javassist:javassist</include>
 
                 <include>org.slf4j:slf4j-api</include>
+            </includes>
+        </dependencySet>
 
-                <include>javax.transaction:jta</include>
+        <dependencySet>
+            <!-- The required dependencySet for jta so I can rename it... -->
+            <outputDirectory>lib/required</outputDirectory>
+            <includes>
+                <include>org.jboss.javaee:jboss-transaction-api</include>
             </includes>
+            <outputFileNameMapping>jta-1.1.jar</outputFileNameMapping>
         </dependencySet>
 
         <dependencySet>