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 cba5382b9a7fb3975d1685b32607234a8eb89c88..fe8b0b96c617f4853ec9d3fec58c8a2c9d1bde30 100644 (file)
--- 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 4fe9683f342cf431dfa53a938a22b0d59b30ce43..ba1b4c9055ebc4b3f0f0e28bba90843ee80037ee 100644 (file)
--- 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 852a4689c5bf461c2a2673ef2733fec888dfb5f0..4e3acf2b6912ce590c1fe62dd7fbdee755a1b824 100644 (file)
--- 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 456e845dda630aa38dc8901317754940633f1fe7..2a12567e7bb92d39255847faad397533b196f6d6 100644 (file)
--- 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 c1c4cbd1834d53896fbc59f3faa859f7fdf2ba2b..bc837346f057aa5393c5e6d2410c6831ec877d17 100644 (file)
--- 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 9f752f7b6cf7059e0d8356e6e78ca95e3e5273de..c6d4e5e91abcc62053e0f4ce951ff0265adb519a 100644 (file)
--- 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 b010c26215ced5985ef2b2a2eb7ad6f2478d009d..24f3684529329236a26bc4c7bc66606047a166f7 100755 (executable)
--- 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 678e848ae66253010f43aa0264e64718d6313c10..0b10132af570a11f193c6e448c911b63251c6089 100644 (file)
--- 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 e798ef016ebf40794a92a76096d4cb90a584fa11..4bedf01d551fc37c3b2b6d5f67bdbaddac23b332 100644 (file)
--- 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 e4b9cfba7404255cfc79e6aafa0fe48e38676776..061ceec7ba357e8fcb8ff87e7decc4c3e5f37e09 100644 (file)
--- 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>