aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Friedrich2012-06-30 16:39:16 (EDT)
committerMatthias Friedrich2012-06-30 16:39:16 (EDT)
commitdf6f17ff92b9285198b335decd7b96d5bb0aae68 (patch)
tree05470a7e14b57adf57bf1b1d48b391f83abfb285
parentff36d0a9fed35303352ac7716fb2418a6fe6fc1d (diff)
downloadorg.eclipse.hudson.core-df6f17ff92b9285198b335decd7b96d5bb0aae68.zip
org.eclipse.hudson.core-df6f17ff92b9285198b335decd7b96d5bb0aae68.tar.gz
org.eclipse.hudson.core-df6f17ff92b9285198b335decd7b96d5bb0aae68.tar.bz2
Clean up logging dependencies.refs/changes/83/6583/1
Replace log4j and commons-logging with slf4j logging bridges in hudson.war. Make sure all slf4j libraries have the same version number.
-rw-r--r--hudson-war/pom.xml22
-rw-r--r--pom.xml17
2 files changed, 29 insertions, 10 deletions
diff --git a/hudson-war/pom.xml b/hudson-war/pom.xml
index 9cc3cd4..c42c5a0 100644
--- a/hudson-war/pom.xml
+++ b/hudson-war/pom.xml
@@ -382,6 +382,28 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<profiles>
diff --git a/pom.xml b/pom.xml
index 91df80f..180baf1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,10 +139,7 @@
<wagon-http.version>1.0-beta-7</wagon-http.version>
<test-annotations.version>1.0</test-annotations.version>
<servlet-api.version>2.4</servlet-api.version>
- <slf4j-api.version>1.6.1</slf4j-api.version>
- <jcl-over-slf4j.version>1.6.1</jcl-over-slf4j.version>
- <slf4j-jdk14.version>1.6.1</slf4j-jdk14.version>
- <jul-to-slf4j.version>1.6.1</jul-to-slf4j.version>
+ <slf4j.version>1.6.1</slf4j.version>
<logback-classic.version>0.9.28</logback-classic.version>
<guava.version>10.0.1</guava.version>
<ant.version>1.8.2</ant.version>
@@ -683,25 +680,25 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j-api.version}</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>${jcl-over-slf4j.version}</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j-jdk14.version}</version>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jul-to-slf4j</artifactId>
- <version>${jul-to-slf4j.version}</version>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>