diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml
index 52aabde3a..78721811c 100644
--- a/archiva-cli/pom.xml
+++ b/archiva-cli/pom.xml
@@ -61,7 +61,7 @@
org.slf4j
- jcl104-over-slf4j
+ jcl-over-slf4j
compile
diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml
index c59fcf4a9..d3e59efb5 100755
--- a/archiva-modules/archiva-base/archiva-model/pom.xml
+++ b/archiva-modules/archiva-base/archiva-model/pom.xml
@@ -36,7 +36,7 @@
org.slf4j
- jcl104-over-slf4j
+ jcl-over-slf4j
runtime
@@ -175,4 +175,4 @@
-
\ No newline at end of file
+
diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml
index d015e9788..da6a18c2a 100644
--- a/archiva-modules/archiva-base/archiva-policies/pom.xml
+++ b/archiva-modules/archiva-base/archiva-policies/pom.xml
@@ -56,7 +56,7 @@
org.slf4j
- jcl104-over-slf4j
+ jcl-over-slf4j
runtime
diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml
index fa8bb9e1c..96722daac 100644
--- a/archiva-modules/archiva-base/archiva-transaction/pom.xml
+++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml
@@ -56,7 +56,7 @@
org.slf4j
- jcl104-over-slf4j
+ jcl-over-slf4j
runtime
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index af049d723..71a0bff85 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -242,6 +242,8 @@
commons-logging
commons-logging-api
1.1
+
+ provided
com.atlassian.xmlrpc
@@ -325,7 +327,7 @@
Specifically setting this to false to avoid accidental jar file creation. -->
false
META-INF/**,WEB-INF/web.xml,WEB-INF/classes/xwork.xml,WEB-INF/lib/**
- WEB-INF/lib/xalan-*.jar,WEB-INF/lib/velocity-dep-*.jar,WEB-INF/lib/xml-apis-*.jar,WEB-INF/lib/wstx-asl-*.jar,WEB-INF/lib/stax-utils-*.jar,WEB-INF/lib/xercesImpl-*.jar,WEB-INF/lib/slf4j-api-1.5.6.jar,WEB-INF/lib/slf4j-log4j12-1.5.6.jar
+ WEB-INF/lib/xalan-*.jar,WEB-INF/lib/velocity-dep-*.jar,WEB-INF/lib/xml-apis-*.jar,WEB-INF/lib/wstx-asl-*.jar,WEB-INF/lib/stax-utils-*.jar,WEB-INF/lib/xercesImpl-*.jar
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml
index b759c40bf..cc0aa6a40 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml
@@ -35,114 +35,97 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+-->
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml
index 1a0b4c48d..b7c33027e 100644
--- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml
+++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml
@@ -42,7 +42,7 @@
org.slf4j
- jcl104-over-slf4j
+ jcl-over-slf4j
compile
diff --git a/pom.xml b/pom.xml
index 52ab923d1..b17e49896 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,7 @@
org.codehaus.plexus:plexus-container-default
org.codehaus.plexus:plexus-log4j-logging
commons-logging:commons-logging
+ org.slf4j:jcl104-over-slf4j
velocity:velocity-dep
classworlds:classworlds
javax.transaction:jta
@@ -84,6 +85,7 @@
ant:ant-optional
xom:xom
org.codehaus.plexus:plexus-xwork-integration
+ plexus:plexus-utils
@@ -814,6 +816,10 @@
classworlds
classworlds
+
+ plexus
+ plexus-utils
+
velocity
velocity-dep
@@ -861,6 +867,11 @@
+
+ commons-logging
+ commons-logging-api
+ 1.1
+
javax.servlet
servlet-api
@@ -873,25 +884,31 @@
org.slf4j
- jcl104-over-slf4j
- 1.5.0
+ slf4j-api
+ ${slf4j.version}
+
+
+ org.slf4j
+ jcl-over-slf4j
+ ${slf4j.version}
runtime
org.slf4j
- slf4j-api
- 1.5.0
+ slf4j-jdk14
+ ${slf4j.version}
+ runtime
org.slf4j
slf4j-simple
- 1.5.0
+ ${slf4j.version}
test
org.slf4j
slf4j-log4j12
- 1.5.0
+ ${slf4j.version}
runtime
@@ -1084,6 +1101,7 @@
1.0-beta-5
1.2.1
6.1.19
+ 1.5.8
0.9
2.5.6