switch to slf4j-log4j12 binding (instead of log4j-slf4j) - this only …

…has internal/test effect as those dependencies are in provided scope
searchbox-io · Mar 31, 2015 · bc3178a · bc3178a
1 parent ee7938b
commit bc3178a
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 49 deletions.
diff --git a/jest-common/pom.xml b/jest-common/pom.xml
@@ -91,13 +91,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
         </dependency>
 
         <dependency>

diff --git a/jest-droid/pom.xml b/jest-droid/pom.xml
@@ -96,13 +96,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
         </dependency>
 
         <dependency>

diff --git a/jest/pom.xml b/jest/pom.xml
@@ -129,20 +129,16 @@
             <artifactId>mockito-all</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>

diff --git a/jest/src/test/resources/log4j.properties b/jest/src/test/resources/log4j.properties
@@ -0,0 +1,10 @@
+# Root logger option
+log4j.rootLogger=INFO, stdout
+log4j.logger.org.elasticsearch=WARN
+log4j.logger.io.searchbox.client.config.discovery.NodeChecker=FATAL
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c{1}:%L - %m%n
diff --git a/jest/src/test/resources/log4j2.xml b/jest/src/test/resources/log4j2.xml
diff --git a/pom.xml b/pom.xml
@@ -81,7 +81,6 @@
         <httpclientandroid.version>4.3.5.1</httpclientandroid.version>
 
         <slf4j.version>1.7.10</slf4j.version>
-        <log4j.version>2.1</log4j.version>
 
         <guava.version>18.0</guava.version>
         <gson.version>2.3.1</gson.version>
@@ -280,16 +279,9 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-slf4j-impl</artifactId>
-                <version>${log4j.version}</version>
-                <scope>provided</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-core</artifactId>
-                <version>${log4j.version}</version>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-log4j12</artifactId>
+                <version>${slf4j.version}</version>
                 <scope>provided</scope>
             </dependency>