diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index fc1f86e751..48dcded173 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -84,15 +84,9 @@
- org.slf4j
- slf4j-log4j12
- ${slf4j.version}
-
-
-
- log4j
- log4j
- 1.2.16
+ ch.qos.logback
+ logback-classic
+ 0.9.27
@@ -131,6 +125,12 @@
org.sonatype.aether
aether-connector-wagon
${aether.version}
+
+
+ xbean-reflect
+ org.apache.xbean
+
+
@@ -166,6 +166,12 @@
scm-test
1.0-M7-SNAPSHOT
test
+
+
+ org.slf4j
+ slf4j-simple
+
+
diff --git a/scm-webapp/src/main/resources/log4j.properties b/scm-webapp/src/main/resources/log4j.properties
deleted file mode 100644
index 031665ca5d..0000000000
--- a/scm-webapp/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2010, Sebastian Sdorra
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-# 3. Neither the name of SCM-Manager; nor the names of its
-# contributors may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# http://bitbucket.org/sdorra/scm-manager
-#
-#
-
-log4j.rootLogger=WARN, SoniaConsole
-
-log4j.category.sonia.scm = DEBUG
-log4j.category.sonia.scm.util.ServiceUtil = WARN
-
-log4j.appender.SoniaConsole=org.apache.log4j.ConsoleAppender
-log4j.appender.SoniaConsole.layout=org.apache.log4j.PatternLayout
-log4j.appender.SoniaConsole.layout.ConversionPattern=%d %-5p [%c] - %m%n
-
-log4j.appender.SoniaFile=org.apache.log4j.RollingFileAppender
-log4j.appender.SoniaFile.layout=org.apache.log4j.PatternLayout
-log4j.appender.SoniaFile.layout.ConversionPattern=%d %-5p [%c] - %m%n
-log4j.appender.SoniaFile.maxFileSize=10MB
-log4j.appender.SoniaFile.MaxBackupIndex=20
-log4j.appender.SoniaFile.File=/sonia/scm/logs/scm.log
diff --git a/scm-webapp/src/main/resources/logback.xml b/scm-webapp/src/main/resources/logback.xml
new file mode 100644
index 0000000000..a16642c7dd
--- /dev/null
+++ b/scm-webapp/src/main/resources/logback.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ %d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file