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

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

Author: anil.saldhana at jboss.com
Date: 2009-03-03 15:42:58 -0500 (Tue, 03 Mar 2009)
New Revision: 85185

Modified:
   trunk/build/build-distr.xml
   trunk/component-matrix/pom.xml
   trunk/thirdparty/pom.xml
Log:
JBAS-6565: upgrade to JBossXACML 2.0.3.CR1

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2009-03-03 20:39:41 UTC (rev 85184)
+++ trunk/build/build-distr.xml	2009-03-03 20:42:58 UTC (rev 85185)
@@ -1811,8 +1811,7 @@
         <include name="jbosssx.jar"/>
       </fileset>
       <fileset dir="${jboss.security.lib}">
-        <include name="jboss-sunxacml.jar"/>
-        <include name="jboss-xacml.jar"/>
+        <include name="jbossxacml.jar"/>
       </fileset>
       <fileset dir="${org.slf4j.lib}">
         <include name="slf4j-api.jar"/>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2009-03-03 20:39:41 UTC (rev 85184)
+++ trunk/component-matrix/pom.xml	2009-03-03 20:42:58 UTC (rev 85185)
@@ -2052,14 +2052,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: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml	2009-03-03 20:39:41 UTC (rev 85184)
+++ trunk/thirdparty/pom.xml	2009-03-03 20:42:58 UTC (rev 85185)
@@ -890,21 +890,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>
@@ -1892,13 +1884,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>