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

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

Author: pgier
Date: 2008-11-26 12:01:38 -0500 (Wed, 26 Nov 2008)
New Revision: 81649

Modified:
   trunk/component-matrix/pom.xml
   trunk/thirdparty/pom.xml
Log:
[JBAS-6055] Exclude extra log4j dependency.

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-11-26 16:53:24 UTC (rev 81648)
+++ trunk/component-matrix/pom.xml	2008-11-26 17:01:38 UTC (rev 81649)
@@ -113,6 +113,7 @@
                     <exclude>com.sun.xml.ws:jaxws-tools</exclude>
                     <exclude>apache-xerces:xercesImpl</exclude>
                     <exclude>ant:ant</exclude>
+                    <exclude>apache-log4j:log4j</exclude>
                   </excludes>
                 </bannedDependencies>
               </rules>
@@ -208,7 +209,7 @@
       </dependency>
       
       <dependency>
-        <groupId>apache-log4j</groupId>
+        <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
         <version>1.2.14</version>
       </dependency>
@@ -563,6 +564,12 @@
         <groupId>org.jboss.logging</groupId>
         <artifactId>jboss-logging-log4j</artifactId>
         <version>2.0.5.GA</version>
+        <exclusions>
+          <exclusion>
+            <groupId>apache-log4j</groupId>
+            <artifactId>log4j</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       
       <dependency>
@@ -1223,6 +1230,12 @@
         <groupId>org.jboss.test</groupId>
         <artifactId>jboss-test</artifactId>
         <version>1.1.3.GA</version>
+        <exclusions>
+          <exclusion>
+            <groupId>apache-log4j</groupId>
+            <artifactId>log4j</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       
       <dependency>

Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml	2008-11-26 16:53:24 UTC (rev 81648)
+++ trunk/thirdparty/pom.xml	2008-11-26 17:01:38 UTC (rev 81649)
@@ -941,6 +941,13 @@
                 <componentId>apache-maven-ant-tasks</componentId>
               </mapping>
             </dependency>
+            <dependency>
+              <groupId>log4j</groupId>
+              <artifactId>log4j</artifactId>
+              <mapping>
+                <componentId>apache-log4j</componentId>
+              </mapping>
+            </dependency>
             
             <!-- End mapped dependecies -->
             
@@ -1023,7 +1030,7 @@
       <artifactId>commons-lang</artifactId>
     </dependency>
     <dependency>
-      <groupId>apache-log4j</groupId>
+      <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
     </dependency>
     <dependency>