From 6977fa87e647452cdcc889c162e4527b19bf3e4f Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@vmware.com>
Date: Tue, 13 Nov 2012 17:49:57 +0100
Subject: [PATCH] DATAMONGO-573 - Moved to Logback for test logging.

---
 .../src/test/resources/log4j.properties        | 12 ------------
 .../src/test/resources/logback.xml             | 18 ++++++++++++++++++
 spring-data-mongodb-log4j/pom.xml              |  4 ++++
 spring-data-mongodb-parent/pom.xml             | 14 ++++----------
 spring-data-mongodb/pom.xml                    |  6 ------
 .../src/test/resources/log4j.properties        | 11 -----------
 .../src/test/resources/logback.xml             | 18 ++++++++++++++++++
 7 files changed, 44 insertions(+), 39 deletions(-)
 delete mode 100644 spring-data-mongodb-cross-store/src/test/resources/log4j.properties
 create mode 100644 spring-data-mongodb-cross-store/src/test/resources/logback.xml
 delete mode 100644 spring-data-mongodb/src/test/resources/log4j.properties
 create mode 100644 spring-data-mongodb/src/test/resources/logback.xml

diff --git a/spring-data-mongodb-cross-store/src/test/resources/log4j.properties b/spring-data-mongodb-cross-store/src/test/resources/log4j.properties
deleted file mode 100644
index 9f0d437da..000000000
--- a/spring-data-mongodb-cross-store/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-log4j.rootCategory=INFO, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %40.40c:%4L - %m%n
-
-log4j.category.org.springframework=INFO
-log4j.category.org.springframework.data=TRACE
-
-log4j.category.org.hibernate.SQL=DEBUG
-# for debugging datasource initialization
-# log4j.category.test.jdbc=DEBUG
diff --git a/spring-data-mongodb-cross-store/src/test/resources/logback.xml b/spring-data-mongodb-cross-store/src/test/resources/logback.xml
new file mode 100644
index 000000000..5ecc71909
--- /dev/null
+++ b/spring-data-mongodb-cross-store/src/test/resources/logback.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<!-- 
+	<logger name="org.springframework" level="debug" />
+	 -->
+
+	<root level="error">
+		<appender-ref ref="console" />
+	</root>
+
+</configuration>
\ No newline at end of file
diff --git a/spring-data-mongodb-log4j/pom.xml b/spring-data-mongodb-log4j/pom.xml
index 2b7caa8d6..63924d6fb 100644
--- a/spring-data-mongodb-log4j/pom.xml
+++ b/spring-data-mongodb-log4j/pom.xml
@@ -10,6 +10,10 @@
   <artifactId>spring-data-mongodb-log4j</artifactId>
   <name>Spring Data MongoDB Log4J Appender</name>
 
+  <properties>
+    <log4j.version>1.2.16</log4j.version>
+  </properties>
+
   <dependencies>
 
     <!-- MongoDB -->
diff --git a/spring-data-mongodb-parent/pom.xml b/spring-data-mongodb-parent/pom.xml
index a18849de3..8e5d8b9d3 100644
--- a/spring-data-mongodb-parent/pom.xml
+++ b/spring-data-mongodb-parent/pom.xml
@@ -86,7 +86,7 @@
     <!-- versions for commonly-used dependencies -->
     <mongo.version>2.9.2</mongo.version>
     <junit.version>4.10</junit.version>
-    <log4j.version>1.2.16</log4j.version>
+    <logback.version>1.0.6</logback.version>
     <org.mockito.version>1.9.0</org.mockito.version>
     <org.slf4j.version>1.6.1</org.slf4j.version>
     <org.codehaus.jackson.version>1.6.1</org.codehaus.jackson.version>
@@ -162,15 +162,9 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>${org.slf4j.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>${log4j.version}</version>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>${logback.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml
index 350087d38..e80a6dcad 100644
--- a/spring-data-mongodb/pom.xml
+++ b/spring-data-mongodb/pom.xml
@@ -64,12 +64,6 @@
 			<groupId>org.mongodb</groupId>
 			<artifactId>mongo-java-driver</artifactId>
 			<version>${mongo.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.persistence</groupId>
-					<artifactId>persistence-api</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
 		<dependency>
diff --git a/spring-data-mongodb/src/test/resources/log4j.properties b/spring-data-mongodb/src/test/resources/log4j.properties
deleted file mode 100644
index 37f4dbd7a..000000000
--- a/spring-data-mongodb/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-log4j.rootCategory=ERROR, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %40.40c:%4L - %m%n
-
-#log4j.category.org.springframework.data=DEBUG
-
-log4j.category.org.hibernate.SQL=DEBUG
-# for debugging datasource initialization
-# log4j.category.test.jdbc=DEBUG
diff --git a/spring-data-mongodb/src/test/resources/logback.xml b/spring-data-mongodb/src/test/resources/logback.xml
new file mode 100644
index 000000000..5ecc71909
--- /dev/null
+++ b/spring-data-mongodb/src/test/resources/logback.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<!-- 
+	<logger name="org.springframework" level="debug" />
+	 -->
+
+	<root level="error">
+		<appender-ref ref="console" />
+	</root>
+
+</configuration>
\ No newline at end of file