[jboss-cvs] JBossAS SVN: r85175 - in branches/Branch_5_x: thirdparty and 1 other directory.

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

Author: anil.saldhana at jboss.com
Date: 2009-03-03 13:07:48 -0500 (Tue, 03 Mar 2009)
New Revision: 85175

Modified:
   branches/Branch_5_x/component-matrix/pom.xml
   branches/Branch_5_x/thirdparty/pom.xml
Log:
JBAS-6468: upgrade to JBossXACML 2.0.3.CR1. The jbossxacml jar contains the jboss-sunxacml jar also as a consolidated jar

Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-03-03 17:56:43 UTC (rev 85174)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-03-03 18:07:48 UTC (rev 85175)
@@ -2034,14 +2034,8 @@
       
       <dependency>
         <groupId>org.jboss.security</groupId>
-        <artifactId>jboss-sunxacml</artifactId>
-        <version>2.0.2.SP1</version>
-      </dependency>
-      
-      <dependency>
-        <groupId>org.jboss.security</groupId>
-        <artifactId>jboss-xacml</artifactId>
-        <version>2.0.2.SP1</version>
+        <artifactId>jbossxacml</artifactId>
+        <version>2.0.3.CR1</version>
         <exclusions>
           <exclusion>
             <groupId>sun-jaf</groupId>

Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml	2009-03-03 17:56:43 UTC (rev 85174)
+++ branches/Branch_5_x/thirdparty/pom.xml	2009-03-03 18:07:48 UTC (rev 85175)
@@ -876,21 +876,13 @@
             </dependency>
             <dependency>
               <groupId>org.jboss.security</groupId>
-              <artifactId>jboss-xacml</artifactId>
+              <artifactId>jbossxacml</artifactId>
               <mapping>
                 <componentId>jboss.security</componentId>
-                <artifactId>jboss-xacml</artifactId>
+                <artifactId>jbossxacml</artifactId>
               </mapping>
             </dependency>
             <dependency>
-              <groupId>org.jboss.security</groupId>
-              <artifactId>jboss-sunxacml</artifactId>
-              <mapping>
-                <componentId>jboss.security</componentId>
-                <artifactId>jboss-sunxacml</artifactId>
-              </mapping>
-            </dependency>
-            <dependency>
               <groupId>wsdl4j</groupId>
               <artifactId>wsdl4j</artifactId>
               <mapping>
@@ -1867,13 +1859,9 @@
     </dependency>    
     <dependency>
       <groupId>org.jboss.security</groupId>
-      <artifactId>jboss-xacml</artifactId>
+      <artifactId>jbossxacml</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.security</groupId>
-      <artifactId>jboss-sunxacml</artifactId>
-    </dependency>
-    <dependency>
       <groupId>stax</groupId>
       <artifactId>stax-api</artifactId>
     </dependency>