[jboss-cvs] JBossAS SVN: r98928 - in trunk: cluster and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Dec 23 22:06:39 EST 2009
Author: jason.greene at jboss.com
Date: 2009-12-23 22:06:38 -0500 (Wed, 23 Dec 2009)
New Revision: 98928
Modified:
trunk/aspects/pom.xml
trunk/cluster/pom.xml
trunk/component-matrix/pom.xml
trunk/connector/pom.xml
trunk/ejb3/pom.xml
trunk/hibernate-int/pom.xml
trunk/iiop/pom.xml
trunk/tomcat/pom.xml
trunk/varia/pom.xml
Log:
Merge 90970
Modified: trunk/aspects/pom.xml
===================================================================
--- trunk/aspects/pom.xml 2009-12-24 02:46:49 UTC (rev 98927)
+++ trunk/aspects/pom.xml 2009-12-24 03:06:38 UTC (rev 98928)
@@ -124,10 +124,6 @@
<artifactId>jboss-as-system-jmx</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-transaction-spi</artifactId>
</dependency>
Modified: trunk/cluster/pom.xml
===================================================================
--- trunk/cluster/pom.xml 2009-12-24 02:46:49 UTC (rev 98927)
+++ trunk/cluster/pom.xml 2009-12-24 03:06:38 UTC (rev 98928)
@@ -212,11 +212,6 @@
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.jboss.remoting</groupId>
<artifactId>jboss-remoting</artifactId>
</dependency>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2009-12-24 02:46:49 UTC (rev 98927)
+++ trunk/component-matrix/pom.xml 2009-12-24 03:06:38 UTC (rev 98928)
@@ -509,18 +509,6 @@
</dependency>
<dependency>
- <groupId>javax.security</groupId>
- <artifactId>jacc</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.1-brew</version>
@@ -566,6 +554,10 @@
<version>${version.org.jboss.aspects.security}</version>
<exclusions>
<exclusion>
+ <groupId>javax.security</groupId>
+ <artifactId>jacc</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
</exclusion>
@@ -1181,8 +1173,12 @@
<version>${version.org.hibernate}</version>
<exclusions>
<exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -1250,6 +1246,10 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -2538,6 +2538,8 @@
<excludes>
<exclude>jboss:jboss-common</exclude>
<exclude>javax.el:el-api</exclude>
+ <exclude>javax.transaction:jta</exclude>
+ <exclude>javax.security:jacc</exclude>
<exclude>bsh:bsh</exclude>
<exclude>bsf:bsf</exclude>
<exclude>javax.xml.stream:stax-api</exclude>
Modified: trunk/connector/pom.xml
===================================================================
--- trunk/connector/pom.xml 2009-12-24 02:46:49 UTC (rev 98927)
+++ trunk/connector/pom.xml 2009-12-24 03:06:38 UTC (rev 98928)
@@ -127,10 +127,6 @@
<artifactId>mail</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
</dependency>
Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml 2009-12-24 02:46:49 UTC (rev 98927)
+++ trunk/ejb3/pom.xml 2009-12-24 03:06:38 UTC (rev 98928)
@@ -141,11 +141,6 @@
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</dependency>
Modified: trunk/hibernate-int/pom.xml
===================================================================
--- trunk/hibernate-int/pom.xml 2009-12-24 02:46:49 UTC (rev 98927)
+++ trunk/hibernate-int/pom.xml 2009-12-24 03:06:38 UTC (rev 98928)
@@ -106,10 +106,6 @@
<artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-transaction-spi</artifactId>
</dependency>
Modified: trunk/iiop/pom.xml
===================================================================
--- trunk/iiop/pom.xml 2009-12-24 02:46:49 UTC (rev 98927)
+++ trunk/iiop/pom.xml 2009-12-24 03:06:38 UTC (rev 98928)
@@ -136,11 +136,6 @@
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </dependency>
-
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml 2009-12-24 02:46:49 UTC (rev 98927)
+++ trunk/tomcat/pom.xml 2009-12-24 03:06:38 UTC (rev 98928)
@@ -177,10 +177,6 @@
<artifactId>jacorb</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</dependency>
Modified: trunk/varia/pom.xml
===================================================================
--- trunk/varia/pom.xml 2009-12-24 02:46:49 UTC (rev 98927)
+++ trunk/varia/pom.xml 2009-12-24 03:06:38 UTC (rev 98928)
@@ -196,10 +196,6 @@
<artifactId>opensaml</artifactId>
</dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </dependency>
<dependency>
<groupId>org.jboss</groupId>
More information about the jboss-cvs-commits
mailing list