aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--archiva-base/archiva-common/pom.xml5
-rw-r--r--archiva-base/archiva-dependency-graph/pom.xml4
-rw-r--r--archiva-base/archiva-policies/pom.xml5
-rw-r--r--archiva-base/archiva-proxy/pom.xml5
-rw-r--r--archiva-base/archiva-repository-layer/pom.xml4
-rw-r--r--archiva-base/archiva-xml-tools/pom.xml4
-rwxr-xr-xarchiva-reporting/archiva-artifact-reports/pom.xml5
-rw-r--r--archiva-scheduled/pom.xml5
-rw-r--r--archiva-web/archiva-webapp/pom.xml1
-rw-r--r--pom.xml11
10 files changed, 1 insertions, 48 deletions
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
@@ -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>
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
@@ -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>
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>
@@ -672,11 +666,6 @@
<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>
<version>1.1.2</version>