[jboss-cvs] JBossAS SVN: r81676 - in trunk: thirdparty and 1 other directory.

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

Author: pgier
Date: 2008-11-26 17:26:13 -0500 (Wed, 26 Nov 2008)
New Revision: 81676

Modified:
   trunk/component-matrix/pom.xml
   trunk/thirdparty/pom.xml
Log:
[JBAS-6055] Exclude duplicate javax activation and mail jars.

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-11-26 22:12:03 UTC (rev 81675)
+++ trunk/component-matrix/pom.xml	2008-11-26 22:26:13 UTC (rev 81676)
@@ -116,6 +116,8 @@
                     <exclude>apache-log4j:log4j</exclude>
                     <exclude>jboss:jboss-test</exclude>
                     <exclude>apache-logging:commons-logging</exclude>
+                    <exclude>sun-jaf:activation</exclude>
+                    <exclude>sun-javamail:mail</exclude>
                   </excludes>
                 </bannedDependencies>
               </rules>
@@ -463,12 +465,6 @@
       </dependency>
       
       <dependency>
-        <groupId>javax.mail</groupId>
-        <artifactId>mail</artifactId>
-        <version>1.4</version>
-      </dependency>
-      
-      <dependency>
         <groupId>javax.security</groupId>
         <artifactId>jaas</artifactId>
         <version>1.0.01</version>
@@ -1903,13 +1899,13 @@
       </dependency>
       
       <dependency>
-        <groupId>sun-jaf</groupId>
+        <groupId>javax.activation</groupId>
         <artifactId>activation</artifactId>
         <version>1.1</version>
       </dependency>
       
       <dependency>
-        <groupId>sun-javamail</groupId>
+        <groupId>javax.mail</groupId>
         <artifactId>mail</artifactId>
         <version>1.4</version>
       </dependency>
@@ -1954,6 +1950,12 @@
         <groupId>org.jboss.security</groupId>
         <artifactId>jboss-xacml</artifactId>
         <version>2.0.2.SP1</version>
+        <exclusions>
+          <exclusion>
+            <groupId>sun-jaf</groupId>
+            <artifactId>activation</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       
       <dependency>

Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml	2008-11-26 22:12:03 UTC (rev 81675)
+++ trunk/thirdparty/pom.xml	2008-11-26 22:26:13 UTC (rev 81676)
@@ -923,6 +923,13 @@
                 <componentId>apache-logging</componentId>
               </mapping>
             </dependency>
+            <dependency>
+              <groupId>javax.activation</groupId>
+              <artifactId>activation</artifactId>
+              <mapping>
+                <componentId>sun-jaf</componentId>
+              </mapping>
+            </dependency>
             <!-- End mapped dependecies -->
             
           </mappedDependencies>
@@ -1762,7 +1769,7 @@
       <artifactId>FastInfosetUtilities</artifactId>
     </dependency>
     <dependency>
-      <groupId>sun-jaf</groupId>
+      <groupId>javax.activation</groupId>
       <artifactId>activation</artifactId>
     </dependency>
     <dependency>
@@ -1869,10 +1876,6 @@
       <artifactId>snmpTrapAppender</artifactId>
     </dependency>
     <dependency>
-      <groupId>sun-javamail</groupId>
-      <artifactId>mail</artifactId>
-    </dependency>
-    <dependency>
       <groupId>xdoclet</groupId>
       <artifactId>xdoclet</artifactId>
     </dependency>