[jboss-cvs] JBossAS SVN: r103219 - in trunk: component-matrix and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: sguilhen at redhat.com
Date: 2010-03-29 22:10:25 -0400 (Mon, 29 Mar 2010)
New Revision: 103219

Modified:
   trunk/build/build.xml
   trunk/component-matrix/pom.xml
   trunk/security/pom.xml
Log:
SECURITY-478: Upgraded security libraries to PicketBox 3.0.0.Beta4

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-03-30 02:10:18 UTC (rev 103218)
+++ trunk/build/build.xml	2010-03-30 02:10:25 UTC (rev 103219)
@@ -1850,6 +1850,7 @@
       <fileset refid="org.jboss.security:jboss-security-spi:jar"/>
       <fileset refid="org.jboss.security:jbosssx:jar"/>
       <fileset refid="org.jboss.security:jbossxacml:jar"/>
+      <fileset refid="org.picketbox:picketbox-bare:jar"/>
       <fileset refid="org.jboss.slf4j:slf4j-jboss-logmanager:jar"/>
       <fileset refid="org.slf4j:slf4j-api:jar"/>
       <fileset refid="org.slf4j:jcl-over-slf4j:jar"/>
@@ -1913,9 +1914,9 @@
       <fileset refid="org.jboss.ejb3:jboss-ejb3-timerservice-spi:jar"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-transactions:jar"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3_1:jar"/>
-	  <fileset refid="org.jboss.ejb3.proxy:proxy-spi:jar"/>
-	  <fileset refid="org.jboss.ejb3.proxy:proxy-javassist:jar"/>
-	  <fileset refid="org.jboss.ejb3.timeout:jboss-ejb3-timeout-spi:jar"/>
+      <fileset refid="org.jboss.ejb3.proxy:proxy-spi:jar"/>
+      <fileset refid="org.jboss.ejb3.proxy:proxy-javassist:jar"/>
+      <fileset refid="org.jboss.ejb3.timeout:jboss-ejb3-timeout-spi:jar"/>
       <fileset refid="org.jboss.ejb3.timeout:jboss-ejb3-timeout-3.1:jar"/>
       <fileset refid="org.jboss.ejb3.vfs:jboss-ejb3-vfs-spi:jar"/>
       <fileset refid="org.jboss.ejb3.vfs:jboss-ejb3-vfs-impl-vfs3:jar"/>      

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-03-30 02:10:18 UTC (rev 103218)
+++ trunk/component-matrix/pom.xml	2010-03-30 02:10:25 UTC (rev 103219)
@@ -107,7 +107,7 @@
     <version.org.jboss.remoting>2.5.2.SP2</version.org.jboss.remoting>
     <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.security>2.1.0.20091223</version.org.jboss.security>
+    <version.org.jboss.security>3.0.0.Beta4</version.org.jboss.security>
     <version.org.jboss.security.negotiation>2.0.3.SP1</version.org.jboss.security.negotiation>
     <version.org.jboss.service.binding>1.1.0.CR1</version.org.jboss.service.binding>
     <version.org.jboss.slf4j>1.0.2.GA</version.org.jboss.slf4j>
@@ -2290,6 +2290,12 @@
       </dependency>
       
       <dependency>
+        <groupId>org.picketbox</groupId>
+        <artifactId>picketbox-bare</artifactId>
+        <version>${version.org.jboss.security}</version>
+      </dependency>
+
+      <dependency>
         <groupId>org.jboss.security</groupId>
         <artifactId>jboss-negotiation</artifactId>
         <version>${version.org.jboss.security.negotiation}</version>

Modified: trunk/security/pom.xml
===================================================================
--- trunk/security/pom.xml	2010-03-30 02:10:18 UTC (rev 103218)
+++ trunk/security/pom.xml	2010-03-30 02:10:25 UTC (rev 103219)
@@ -115,6 +115,11 @@
     </dependency>
         
     <dependency>
+      <groupId>org.picketbox</groupId>
+      <artifactId>picketbox-bare</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>org.jboss</groupId>
       <artifactId>jboss-common-core</artifactId>
     </dependency>