Author: joakime
Date: Wed Feb 20 23:25:33 2008
New Revision: 629701
URL: http://svn.apache.org/viewvc?rev=629701&view=rev
Log:
MRM-708 - Migrate from Plexus Logging to Slf4J
* Fixing dependencies for slf4j
Modified:
maven/archiva/trunk/archiva-base/archiva-common/pom.xml
maven/archiva/trunk/archiva-base/archiva-dependency-graph/pom.xml
maven/archiva/trunk/archiva-base/archiva-policies/pom.xml
maven/archiva/trunk/archiva-base/archiva-proxy/pom.xml
maven/archiva/trunk/archiva-base/archiva-repository-layer/pom.xml
maven/archiva/trunk/archiva-base/archiva-xml-tools/pom.xml
maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/pom.xml
maven/archiva/trunk/archiva-scheduled/pom.xml
maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml
maven/archiva/trunk/pom.xml
Modified: maven/archiva/trunk/archiva-base/archiva-common/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-common/pom.xml?rev=629701&r1=629700&r2=629701&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-common/pom.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-common/pom.xml Wed Feb 20 23:25:33
2008
@@ -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>
Modified: maven/archiva/trunk/archiva-base/archiva-dependency-graph/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-dependency-graph/pom.xml?rev=629701&r1=629700&r2=629701&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-dependency-graph/pom.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-dependency-graph/pom.xml Wed Feb
20 23:25:33 2008
@@ -57,10 +57,6 @@
<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>
<scope>compile</scope>
Modified: maven/archiva/trunk/archiva-base/archiva-policies/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-policies/pom.xml?rev=629701&r1=629700&r2=629701&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-policies/pom.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-policies/pom.xml Wed Feb 20
23:25:33 2008
@@ -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>
Modified: maven/archiva/trunk/archiva-base/archiva-proxy/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-proxy/pom.xml?rev=629701&r1=629700&r2=629701&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-proxy/pom.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-proxy/pom.xml Wed Feb 20 23:25:33
2008
@@ -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>
Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/pom.xml?rev=629701&r1=629700&r2=629701&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-repository-layer/pom.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-repository-layer/pom.xml Wed Feb
20 23:25:33 2008
@@ -65,10 +65,6 @@
<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>
<scope>compile</scope>
Modified: maven/archiva/trunk/archiva-base/archiva-xml-tools/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-xml-tools/pom.xml?rev=629701&r1=629700&r2=629701&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-xml-tools/pom.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-xml-tools/pom.xml Wed Feb 20
23:25:33 2008
@@ -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>
Modified: maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/pom.xml?rev=629701&r1=629700&r2=629701&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/pom.xml
(original)
+++ maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/pom.xml Wed
Feb 20 23:25:33 2008
@@ -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>
Modified: maven/archiva/trunk/archiva-scheduled/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-scheduled/pom.xml?rev=629701&r1=629700&r2=629701&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-scheduled/pom.xml (original)
+++ maven/archiva/trunk/archiva-scheduled/pom.xml Wed Feb 20 23:25:33 2008
@@ -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>
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml?rev=629701&r1=629700&r2=629701&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml Wed Feb 20 23:25:33
2008
@@ -118,6 +118,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.3</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Modified: maven/archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?rev=629701&r1=629700&r2=629701&view=diff
==============================================================================
--- maven/archiva/trunk/pom.xml (original)
+++ maven/archiva/trunk/pom.xml Wed Feb 20 23:25:33 2008
@@ -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>
@@ -670,11 +664,6 @@
<groupId>opensymphony</groupId>
<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>
