[seam-commits] Seam SVN: r13511 - branches/enterprise/JBPAPP_5_0/build.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2010-07-26 10:33:36 -0400 (Mon, 26 Jul 2010)
New Revision: 13511

Modified:
   branches/enterprise/JBPAPP_5_0/build/core.pom.xml
   branches/enterprise/JBPAPP_5_0/build/ioc.pom.xml
   branches/enterprise/JBPAPP_5_0/build/root.pom.xml
   branches/enterprise/JBPAPP_5_0/build/ui.pom.xml
Log:
JBPAPP-4569 - excluded old hibernate dependency from jbpm3

Modified: branches/enterprise/JBPAPP_5_0/build/core.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/core.pom.xml	2010-07-26 10:32:37 UTC (rev 13510)
+++ branches/enterprise/JBPAPP_5_0/build/core.pom.xml	2010-07-26 14:33:36 UTC (rev 13511)
@@ -13,7 +13,6 @@
   <packaging>ejb</packaging>
 
   <!-- See parent pom for notes on how to declare dependencies -->
-
   <dependencies>
     <dependency>
       <groupId>org.hibernate</groupId>
@@ -148,10 +147,9 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.transaction</groupId>
-      <artifactId>jta</artifactId>
-      <optional>true</optional>
-      <scope>provided</scope>
+        <groupId>org.jboss.javaee</groupId>
+        <artifactId>jboss-transaction-api</artifactId>
+        <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -254,6 +252,7 @@
       <optional>true</optional>
     </dependency>
 
+    
     <dependency>
       <groupId>org.jbpm.jbpm3</groupId>
       <artifactId>jbpm-jpdl</artifactId>

Modified: branches/enterprise/JBPAPP_5_0/build/ioc.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/ioc.pom.xml	2010-07-26 10:32:37 UTC (rev 13510)
+++ branches/enterprise/JBPAPP_5_0/build/ioc.pom.xml	2010-07-26 14:33:36 UTC (rev 13511)
@@ -45,12 +45,11 @@
       <optional>true</optional>
       <scope>provided</scope>
     </dependency>
-
+    
     <dependency>
-      <groupId>javax.transaction</groupId>
-      <artifactId>jta</artifactId>
-      <optional>true</optional>
-      <scope>provided</scope>
+        <groupId>org.jboss.javaee</groupId>
+        <artifactId>jboss-transaction-api</artifactId>
+        <scope>provided</scope>
     </dependency>
 
     <dependency>

Modified: branches/enterprise/JBPAPP_5_0/build/root.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/root.pom.xml	2010-07-26 10:32:37 UTC (rev 13510)
+++ branches/enterprise/JBPAPP_5_0/build/root.pom.xml	2010-07-26 14:33:36 UTC (rev 13511)
@@ -8,18 +8,6 @@
 	<version>@seam.version@</version>
 	<name>JBoss Seam</name>
 	<packaging>pom</packaging>
-<!--	<pluginRepositories>-->
-<!--		<pluginRepository>-->
-<!--			<id>repository.jboss.org</id>-->
-<!--			<name>JBoss Repository</name>-->
-<!--			<url>http://repository.jboss.org/maven2</url>-->
-<!--		</pluginRepository>-->
-<!--		<pluginRepository>-->
-<!--			<id>maven_eap5</id>-->
-<!--			<name>EAP5 Central Repository</name>-->
-<!--			<url>http://repository.jboss.org/maven2-brew</url>-->
-<!--		</pluginRepository>-->
-<!--	</pluginRepositories>-->
 
 	<!-- Externalize some version numbers here -->
 	<properties>
@@ -28,6 +16,7 @@
 		<version.testng>5.9</version.testng>
 		<version.resteasy>1.2.1.GA_CP02</version.resteasy>
         <version.spring>2.5.6.SEC02</version.spring>
+        <version.hibernate-core>3.3.2.GA_CP03</version.hibernate-core>
 	</properties>
 
 	<dependencyManagement>
@@ -354,7 +343,7 @@
 			<dependency>
 				<groupId>org.hibernate</groupId>
 				<artifactId>hibernate-core</artifactId>
-				<version>3.3.2.GA_CP03</version>
+				<version>${version.hibernate-core}</version>
 				<exclusions>
 					<exclusion>
 						<groupId>commons-collections</groupId>
@@ -376,6 +365,10 @@
 						<groupId>org.slf4j</groupId>
 						<artifactId>slf4j-api</artifactId>
 					</exclusion>
+					<exclusion>
+					   <groupId>javax.transaction</groupId>
+					   <artifactId>jta</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 
@@ -420,7 +413,11 @@
 						<groupId>jboss</groupId>
 						<artifactId>javassist</artifactId>
 					</exclusion>
-				</exclusions>
+                    <exclusion>
+                        <groupId>javax.transaction</groupId>
+                        <artifactId>jta</artifactId>
+                    </exclusion>
+		     	</exclusions>
 			</dependency>
 
 			<dependency>
@@ -443,6 +440,12 @@
 				<groupId>org.hibernate</groupId>
 				<artifactId>hibernate-search</artifactId>
 				<version>3.1.1.GA_CP03</version>
+				<exclusions>
+                    <exclusion>
+                        <groupId>javax.transaction</groupId>
+                        <artifactId>jta</artifactId>
+                    </exclusion>
+                </exclusions>
 			</dependency>
 
 			<dependency>
@@ -660,11 +663,11 @@
 				<version>2.1.3</version>
 			</dependency>
 
-			<dependency>
-				<groupId>javax.transaction</groupId>
-				<artifactId>jta</artifactId>
-				<version>1.1</version>
-			</dependency>
+            <dependency>
+                <groupId>org.jboss.javaee</groupId>
+                <artifactId>jboss-transaction-api</artifactId>
+                <version>1.0.1.GA</version>
+            </dependency>
 
 			<dependency>
 				<groupId>javax.xml.bind</groupId>

Modified: branches/enterprise/JBPAPP_5_0/build/ui.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/ui.pom.xml	2010-07-26 10:32:37 UTC (rev 13510)
+++ branches/enterprise/JBPAPP_5_0/build/ui.pom.xml	2010-07-26 14:33:36 UTC (rev 13511)
@@ -124,6 +124,10 @@
           <groupId>commons-logging</groupId>
           <artifactId>commons-logging</artifactId>
         </exclusion>
+        <exclusion>
+        	<groupId>org.hibernate</groupId>
+        	<artifactId>hibernate</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>