[jboss-cvs] JBossAS SVN: r90970 - in branches/Branch_5_x: cluster and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 8 20:50:18 EDT 2009
Author: jason.greene at jboss.com
Date: 2009-07-08 20:50:18 -0400 (Wed, 08 Jul 2009)
New Revision: 90970
Modified:
branches/Branch_5_x/aspects/pom.xml
branches/Branch_5_x/cluster/pom.xml
branches/Branch_5_x/component-matrix/pom.xml
branches/Branch_5_x/connector/pom.xml
branches/Branch_5_x/ejb3/pom.xml
branches/Branch_5_x/hibernate-int/pom.xml
branches/Branch_5_x/iiop/pom.xml
branches/Branch_5_x/tomcat/pom.xml
branches/Branch_5_x/varia/pom.xml
Log:
Exclude and ban sun javax deps
Modified: branches/Branch_5_x/aspects/pom.xml
===================================================================
--- branches/Branch_5_x/aspects/pom.xml 2009-07-09 00:35:57 UTC (rev 90969)
+++ branches/Branch_5_x/aspects/pom.xml 2009-07-09 00:50:18 UTC (rev 90970)
@@ -120,10 +120,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: branches/Branch_5_x/cluster/pom.xml
===================================================================
--- branches/Branch_5_x/cluster/pom.xml 2009-07-09 00:35:57 UTC (rev 90969)
+++ branches/Branch_5_x/cluster/pom.xml 2009-07-09 00:50:18 UTC (rev 90970)
@@ -164,11 +164,6 @@
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.jboss.remoting</groupId>
<artifactId>jboss-remoting</artifactId>
</dependency>
Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml 2009-07-09 00:35:57 UTC (rev 90969)
+++ branches/Branch_5_x/component-matrix/pom.xml 2009-07-09 00:50:18 UTC (rev 90970)
@@ -484,18 +484,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>
@@ -541,6 +529,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>
@@ -1150,8 +1142,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>
@@ -1215,6 +1211,10 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1434,6 +1434,12 @@
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
<version>${version.org.jboss.cache.core}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -2211,6 +2217,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>javax.xml.stream:stax-api</exclude>
<exclude>com.sun.xml.bind:jaxb-impl</exclude>
Modified: branches/Branch_5_x/connector/pom.xml
===================================================================
--- branches/Branch_5_x/connector/pom.xml 2009-07-09 00:35:57 UTC (rev 90969)
+++ branches/Branch_5_x/connector/pom.xml 2009-07-09 00:50:18 UTC (rev 90970)
@@ -154,10 +154,6 @@
<artifactId>jbosssx-client</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-structure-spi</artifactId>
</dependency>
Modified: branches/Branch_5_x/ejb3/pom.xml
===================================================================
--- branches/Branch_5_x/ejb3/pom.xml 2009-07-09 00:35:57 UTC (rev 90969)
+++ branches/Branch_5_x/ejb3/pom.xml 2009-07-09 00:50:18 UTC (rev 90970)
@@ -67,11 +67,6 @@
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</dependency>
Modified: branches/Branch_5_x/hibernate-int/pom.xml
===================================================================
--- branches/Branch_5_x/hibernate-int/pom.xml 2009-07-09 00:35:57 UTC (rev 90969)
+++ branches/Branch_5_x/hibernate-int/pom.xml 2009-07-09 00:50:18 UTC (rev 90970)
@@ -55,13 +55,9 @@
<artifactId>jboss-as-j2se</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-transaction-spi</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: branches/Branch_5_x/iiop/pom.xml
===================================================================
--- branches/Branch_5_x/iiop/pom.xml 2009-07-09 00:35:57 UTC (rev 90969)
+++ branches/Branch_5_x/iiop/pom.xml 2009-07-09 00:50:18 UTC (rev 90970)
@@ -117,11 +117,6 @@
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </dependency>
-
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -240,4 +235,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: branches/Branch_5_x/tomcat/pom.xml
===================================================================
--- branches/Branch_5_x/tomcat/pom.xml 2009-07-09 00:35:57 UTC (rev 90969)
+++ branches/Branch_5_x/tomcat/pom.xml 2009-07-09 00:50:18 UTC (rev 90970)
@@ -61,10 +61,6 @@
<artifactId>jaas</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</dependency>
Modified: branches/Branch_5_x/varia/pom.xml
===================================================================
--- branches/Branch_5_x/varia/pom.xml 2009-07-09 00:35:57 UTC (rev 90969)
+++ branches/Branch_5_x/varia/pom.xml 2009-07-09 00:50:18 UTC (rev 90970)
@@ -52,10 +52,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