[jboss-cvs] JBossAS SVN: r108395 - in trunk: build and 18 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 30 14:38:59 EDT 2010
Author: mmoyses
Date: 2010-09-30 14:38:58 -0400 (Thu, 30 Sep 2010)
New Revision: 108395
Modified:
trunk/aspects/pom.xml
trunk/build/build.xml
trunk/client/pom.xml
trunk/component-matrix/pom.xml
trunk/connector/pom.xml
trunk/depchain/pom.xml
trunk/deployment/pom.xml
trunk/ejb3/pom.xml
trunk/hornetq-int/pom.xml
trunk/iiop/pom.xml
trunk/jbossas-remoting/pom.xml
trunk/profileservice/pom.xml
trunk/security/pom.xml
trunk/server/pom.xml
trunk/testsuite/build.xml
trunk/tomcat/pom.xml
trunk/varia/pom.xml
trunk/webservices/pom.xml
trunk/weld-int/deployer-mc-int/pom.xml
trunk/weld-int/ejb/pom.xml
Log:
JBAS-8484: upgrading picketbox to 3.0.0.CR2
Modified: trunk/aspects/pom.xml
===================================================================
--- trunk/aspects/pom.xml 2010-09-30 18:23:41 UTC (rev 108394)
+++ trunk/aspects/pom.xml 2010-09-30 18:38:58 UTC (rev 108395)
@@ -74,6 +74,14 @@
<groupId>jboss.web</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>jbosssx</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-security-spi</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -91,7 +99,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jboss-security-spi</artifactId>
</dependency>
<dependency>
@@ -164,6 +172,12 @@
<dependency>
<groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>jbosssx-client</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javassist</groupId>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-09-30 18:23:41 UTC (rev 108394)
+++ trunk/build/build.xml 2010-09-30 18:38:58 UTC (rev 108395)
@@ -2225,8 +2225,8 @@
<fileset refid="xerces:xercesImpl:jar"/>
<fileset refid="xml-resolver:xml-resolver:jar"/>
<fileset refid="org.jboss:jbossxb:jar"/>
- <fileset refid="org.jboss.security:jboss-security-spi:jar"/>
- <fileset refid="org.jboss.security:jbosssx:jar"/>
+ <fileset refid="org.picketbox:jboss-security-spi:jar"/>
+ <fileset refid="org.picketbox:jbosssx:jar"/>
<mapper refid="remove-versions" />
</copy>
@@ -2289,9 +2289,9 @@
<fileset refid="org.jboss.slf4j:slf4j-jboss-logging:jar"/>
<fileset refid="org.jboss.integration:jboss-integration:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-ext-api:jar"/>
- <fileset refid="org.jboss.security:jboss-security-spi:jar"/>
+ <fileset refid="org.picketbox:jboss-security-spi:jar"/>
<fileset refid="org.jboss.naming:jnp-client:jar"/>
- <fileset refid="org.jboss.security:jbosssx-client:jar"/>
+ <fileset refid="org.picketbox:jbosssx-client:jar"/>
<fileset refid="org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec:jar"/>
<fileset refid="org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec:jar"/>
<fileset refid="org.jboss.spec.javax.el:jboss-el-api_2.2_spec:jar"/>
@@ -2371,7 +2371,7 @@
<fileset refid="log4j:log4j:jar"/>
<fileset refid="gnu-getopt:getopt:jar"/>
<fileset refid="oswego-concurrent:concurrent:jar"/>
- <fileset refid="org.jboss.security:jbosssx-client:jar"/>
+ <fileset refid="org.picketbox:jbosssx-client:jar"/>
<fileset refid="org.apache.ws.scout:scout:jar"/>
<fileset refid="jacorb:jacorb:jar"/>
<fileset refid="logkit:logkit:jar"/>
Modified: trunk/client/pom.xml
===================================================================
--- trunk/client/pom.xml 2010-09-30 18:23:41 UTC (rev 108394)
+++ trunk/client/pom.xml 2010-09-30 18:38:58 UTC (rev 108395)
@@ -390,7 +390,7 @@
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jboss-security-spi</artifactId>
</dependency>
@@ -418,7 +418,7 @@
<!-- jbosssx-as-client.jar -->
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-09-30 18:23:41 UTC (rev 108394)
+++ trunk/component-matrix/pom.xml 2010-09-30 18:38:58 UTC (rev 108395)
@@ -126,8 +126,7 @@
<version.org.jboss.remoting3>3.1.0.Beta2</version.org.jboss.remoting3>
<version.org.jboss.remoting3.metadata>1.0.0.Beta2</version.org.jboss.remoting3.metadata>
<version.org.jboss.scanning>1.0.0.Alpha6</version.org.jboss.scanning>
- <version.org.jboss.security>3.0.0.Beta4</version.org.jboss.security>
- <version.org.picketbox>3.0.0.CR1</version.org.picketbox>
+ <version.org.picketbox>3.0.0.CR2</version.org.picketbox>
<version.org.jboss.security.negotiation>2.0.3.SP1</version.org.jboss.security.negotiation>
<version.org.jboss.service.binding>1.1.1.Final</version.org.jboss.service.binding>
<version.org.jboss.shrinkwrap>1.0.0-alpha-11</version.org.jboss.shrinkwrap>
@@ -3403,9 +3402,9 @@
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jbosssx</artifactId>
- <version>${version.org.jboss.security}</version>
+ <version>${version.org.picketbox}</version>
</dependency>
<dependency>
@@ -3557,15 +3556,15 @@
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jbosssx-client</artifactId>
- <version>${version.org.jboss.security}</version>
+ <version>${version.org.picketbox}</version>
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jboss-security-spi</artifactId>
- <version>${version.org.jboss.security}</version>
+ <version>${version.org.picketbox}</version>
</dependency>
<dependency>
Modified: trunk/connector/pom.xml
===================================================================
--- trunk/connector/pom.xml 2010-09-30 18:23:41 UTC (rev 108394)
+++ trunk/connector/pom.xml 2010-09-30 18:38:58 UTC (rev 108395)
@@ -237,11 +237,11 @@
<artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jboss-security-spi</artifactId>
</dependency>
<dependency>
Modified: trunk/depchain/pom.xml
===================================================================
--- trunk/depchain/pom.xml 2010-09-30 18:23:41 UTC (rev 108394)
+++ trunk/depchain/pom.xml 2010-09-30 18:38:58 UTC (rev 108395)
@@ -339,6 +339,14 @@
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -353,6 +361,10 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -369,6 +381,10 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -385,6 +401,10 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -553,6 +573,10 @@
<groupId>apache-xerces</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>jboss-security-spi</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -763,6 +787,10 @@
<artifactId>jboss-ejb3-security</artifactId>
<classifier>client</classifier>
<exclusions>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jacc-api</artifactId>
@@ -787,6 +815,10 @@
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>jboss-security-spi</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: trunk/deployment/pom.xml
===================================================================
--- trunk/deployment/pom.xml 2010-09-30 18:23:41 UTC (rev 108394)
+++ trunk/deployment/pom.xml 2010-09-30 18:38:58 UTC (rev 108395)
@@ -93,12 +93,12 @@
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jboss-security-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml 2010-09-30 18:23:41 UTC (rev 108394)
+++ trunk/ejb3/pom.xml 2010-09-30 18:38:58 UTC (rev 108395)
@@ -332,6 +332,14 @@
<groupId>sun-jaxws</groupId>
<artifactId>jaxws-api</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>jbosssx</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-security-spi</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
</exclusions>
<type>pom</type>
</dependency>
@@ -397,6 +405,14 @@
<groupId>sun-jaxws</groupId>
<artifactId>jaxws-api</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>jbosssx</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-security-spi</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
</exclusions>
</dependency>
Modified: trunk/hornetq-int/pom.xml
===================================================================
--- trunk/hornetq-int/pom.xml 2010-09-30 18:23:41 UTC (rev 108394)
+++ trunk/hornetq-int/pom.xml 2010-09-30 18:38:58 UTC (rev 108395)
@@ -157,11 +157,11 @@
<artifactId>jboss-jms-api_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jboss-security-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
<dependency>
@@ -198,4 +198,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/iiop/pom.xml
===================================================================
--- trunk/iiop/pom.xml 2010-09-30 18:23:41 UTC (rev 108394)
+++ trunk/iiop/pom.xml 2010-09-30 18:38:58 UTC (rev 108395)
@@ -155,6 +155,14 @@
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>jbosssx</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jbosssx-client</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
</exclusions>
</dependency>
@@ -301,12 +309,12 @@
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jboss-security-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
Modified: trunk/jbossas-remoting/pom.xml
===================================================================
--- trunk/jbossas-remoting/pom.xml 2010-09-30 18:23:41 UTC (rev 108394)
+++ trunk/jbossas-remoting/pom.xml 2010-09-30 18:38:58 UTC (rev 108395)
@@ -65,7 +65,7 @@
<artifactId>jboss-as-security</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jboss-security-spi</artifactId>
</dependency>
</dependencies>
Modified: trunk/profileservice/pom.xml
===================================================================
--- trunk/profileservice/pom.xml 2010-09-30 18:23:41 UTC (rev 108394)
+++ trunk/profileservice/pom.xml 2010-09-30 18:38:58 UTC (rev 108395)
@@ -107,6 +107,14 @@
<groupId>jboss.web</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>jboss-security-spi</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jbosssx</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: trunk/security/pom.xml
===================================================================
--- trunk/security/pom.xml 2010-09-30 18:23:41 UTC (rev 108394)
+++ trunk/security/pom.xml 2010-09-30 18:38:58 UTC (rev 108395)
@@ -105,12 +105,12 @@
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jboss-security-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jbosssx</artifactId>
</dependency>
@@ -155,7 +155,7 @@
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2010-09-30 18:23:41 UTC (rev 108394)
+++ trunk/server/pom.xml 2010-09-30 18:38:58 UTC (rev 108395)
@@ -315,7 +315,7 @@
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jbosssx</artifactId>
</dependency>
@@ -482,7 +482,7 @@
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2010-09-30 18:23:41 UTC (rev 108394)
+++ trunk/testsuite/build.xml 2010-09-30 18:38:58 UTC (rev 108395)
@@ -423,8 +423,8 @@
<fileset refid="org.jboss.jbossas:jboss-as-management:jar:jsr77-client"/>
<fileset refid="org.jboss.naming:jnpserver:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-profileservice:jar"/>
- <fileset refid="org.jboss.security:jboss-security-spi:jar"/>
- <fileset refid="org.jboss.security:jbosssx:jar"/>
+ <fileset refid="org.picketbox:jboss-security-spi:jar"/>
+ <fileset refid="org.picketbox:jbosssx:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-security:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-server:jar:jboss"/>
<fileset refid="org.jboss.jbossas:jboss-as-main:jar"/>
Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml 2010-09-30 18:23:41 UTC (rev 108394)
+++ trunk/tomcat/pom.xml 2010-09-30 18:38:58 UTC (rev 108395)
@@ -183,7 +183,7 @@
<artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jboss-security-spi</artifactId>
</dependency>
<dependency>
@@ -205,7 +205,7 @@
<artifactId>jboss-deployment-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
<dependency>
@@ -368,6 +368,14 @@
<groupId>sun-jaxws</groupId>
<artifactId>jaxws-api</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>jboss-security-spi</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jbosssx</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: trunk/varia/pom.xml
===================================================================
--- trunk/varia/pom.xml 2010-09-30 18:23:41 UTC (rev 108394)
+++ trunk/varia/pom.xml 2010-09-30 18:38:58 UTC (rev 108395)
@@ -339,7 +339,7 @@
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml 2010-09-30 18:23:41 UTC (rev 108394)
+++ trunk/webservices/pom.xml 2010-09-30 18:38:58 UTC (rev 108395)
@@ -275,6 +275,10 @@
<groupId> org.jboss.microcontainer</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>jbosssx</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
</exclusions>
<type>pom</type>
<version>${version.org.jboss.ejb3.depchain}</version>
@@ -315,6 +319,10 @@
<groupId>apache-xerces</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>jboss-security-spi</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
</exclusions>
</dependency>
<!-- transitive dependencies -->
@@ -373,7 +381,7 @@
<artifactId>jboss-kernel</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.security</groupId>
+ <groupId>org.picketbox</groupId>
<artifactId>jboss-security-spi</artifactId>
</dependency>
</dependencies>
Modified: trunk/weld-int/deployer-mc-int/pom.xml
===================================================================
--- trunk/weld-int/deployer-mc-int/pom.xml 2010-09-30 18:23:41 UTC (rev 108394)
+++ trunk/weld-int/deployer-mc-int/pom.xml 2010-09-30 18:38:58 UTC (rev 108395)
@@ -331,6 +331,14 @@
<groupId>sun-jaxws</groupId>
<artifactId>jaxws-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-client</artifactId>
+ </exclusion>
</exclusions>
</dependency>
Modified: trunk/weld-int/ejb/pom.xml
===================================================================
--- trunk/weld-int/ejb/pom.xml 2010-09-30 18:23:41 UTC (rev 108394)
+++ trunk/weld-int/ejb/pom.xml 2010-09-30 18:38:58 UTC (rev 108395)
@@ -221,6 +221,14 @@
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -281,6 +289,18 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx-client</artifactId>
+ </exclusion>
</exclusions>
</dependency>
More information about the jboss-cvs-commits
mailing list