From: Joakim Erdfelt <joakime@apache.org>
Date: Thu, 21 Feb 2008 07:25:33 +0000 (+0000)
Subject: MRM-708 - Migrate from Plexus Logging to Slf4J
X-Git-Tag: archiva-r676265~359
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=23203d1a1157023ddbbd29ef86a7f40256c887a1;p=archiva.git

MRM-708 - Migrate from Plexus Logging to Slf4J
* Fixing dependencies for slf4j



git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@629701 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-base/archiva-common/pom.xml b/archiva-base/archiva-common/pom.xml
index cba5382b9..fe8b0b96c 100644
--- a/archiva-base/archiva-common/pom.xml
+++ b/archiva-base/archiva-common/pom.xml
@@ -54,11 +54,6 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/archiva-base/archiva-dependency-graph/pom.xml b/archiva-base/archiva-dependency-graph/pom.xml
index 4fe9683f3..ba1b4c905 100644
--- a/archiva-base/archiva-dependency-graph/pom.xml
+++ b/archiva-base/archiva-dependency-graph/pom.xml
@@ -56,10 +56,6 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus.cache</groupId>
       <artifactId>plexus-cache-api</artifactId>
diff --git a/archiva-base/archiva-policies/pom.xml b/archiva-base/archiva-policies/pom.xml
index 852a4689c..4e3acf2b6 100644
--- a/archiva-base/archiva-policies/pom.xml
+++ b/archiva-base/archiva-policies/pom.xml
@@ -45,11 +45,6 @@
       <artifactId>plexus-slf4j-logging</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/archiva-base/archiva-proxy/pom.xml b/archiva-base/archiva-proxy/pom.xml
index 456e845dd..2a12567e7 100644
--- a/archiva-base/archiva-proxy/pom.xml
+++ b/archiva-base/archiva-proxy/pom.xml
@@ -81,11 +81,6 @@
       <artifactId>plexus-slf4j-logging</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/archiva-base/archiva-repository-layer/pom.xml b/archiva-base/archiva-repository-layer/pom.xml
index c1c4cbd18..bc837346f 100644
--- a/archiva-base/archiva-repository-layer/pom.xml
+++ b/archiva-base/archiva-repository-layer/pom.xml
@@ -64,10 +64,6 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus.cache</groupId>
       <artifactId>plexus-cache-api</artifactId>
diff --git a/archiva-base/archiva-xml-tools/pom.xml b/archiva-base/archiva-xml-tools/pom.xml
index 9f752f7b6..c6d4e5e91 100644
--- a/archiva-base/archiva-xml-tools/pom.xml
+++ b/archiva-base/archiva-xml-tools/pom.xml
@@ -68,10 +68,6 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>
   </dependencies>
   <!--
   <build>
diff --git a/archiva-reporting/archiva-artifact-reports/pom.xml b/archiva-reporting/archiva-artifact-reports/pom.xml
index b010c2621..24f368452 100755
--- a/archiva-reporting/archiva-artifact-reports/pom.xml
+++ b/archiva-reporting/archiva-artifact-reports/pom.xml
@@ -63,10 +63,5 @@
       <artifactId>plexus-slf4j-logging</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/archiva-scheduled/pom.xml b/archiva-scheduled/pom.xml
index 678e848ae..0b10132af 100644
--- a/archiva-scheduled/pom.xml
+++ b/archiva-scheduled/pom.xml
@@ -86,11 +86,6 @@
       <artifactId>plexus-slf4j-logging</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/archiva-web/archiva-webapp/pom.xml b/archiva-web/archiva-webapp/pom.xml
index e798ef016..4bedf01d5 100644
--- a/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-web/archiva-webapp/pom.xml
@@ -118,6 +118,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
+      <version>1.4.3</version>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
diff --git a/pom.xml b/pom.xml
index e4b9cfba7..061ceec7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -524,12 +524,6 @@
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-slf4j-logging</artifactId>
         <version>1.1-alpha-1</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
@@ -671,11 +665,6 @@
         <artifactId>sitemesh</artifactId>
         <version>2.2.1</version>
       </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-        <version>1.2</version>
-      </dependency>
       <dependency>
         <groupId>taglibs</groupId>
         <artifactId>standard</artifactId>