Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit bc3178a

Browse files
author
Cihat Keser
committed
switch to slf4j-log4j12 binding (instead of log4j-slf4j) - this only has internal/test effect as those dependencies are in provided scope
1 parent ee7938b commit bc3178a

File tree

6 files changed

+20
-49
lines changed

6 files changed

+20
-49
lines changed

jest-common/pom.xml

+2-7
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,8 @@
9191
</dependency>
9292

9393
<dependency>
94-
<groupId>org.apache.logging.log4j</groupId>
95-
<artifactId>log4j-slf4j-impl</artifactId>
96-
</dependency>
97-
98-
<dependency>
99-
<groupId>org.apache.logging.log4j</groupId>
100-
<artifactId>log4j-core</artifactId>
94+
<groupId>org.slf4j</groupId>
95+
<artifactId>slf4j-log4j12</artifactId>
10196
</dependency>
10297

10398
<dependency>

jest-droid/pom.xml

+2-7
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,8 @@
9696
</dependency>
9797

9898
<dependency>
99-
<groupId>org.apache.logging.log4j</groupId>
100-
<artifactId>log4j-slf4j-impl</artifactId>
101-
</dependency>
102-
103-
<dependency>
104-
<groupId>org.apache.logging.log4j</groupId>
105-
<artifactId>log4j-core</artifactId>
99+
<groupId>org.slf4j</groupId>
100+
<artifactId>slf4j-log4j12</artifactId>
106101
</dependency>
107102

108103
<dependency>

jest/pom.xml

+3-7
Original file line numberDiff line numberDiff line change
@@ -129,20 +129,16 @@
129129
<artifactId>mockito-all</artifactId>
130130
</dependency>
131131

132-
<dependency>
133-
<groupId>org.apache.logging.log4j</groupId>
134-
<artifactId>log4j-slf4j-impl</artifactId>
135-
</dependency>
136-
137132
<dependency>
138133
<groupId>org.slf4j</groupId>
139134
<artifactId>slf4j-api</artifactId>
140135
</dependency>
141136

142137
<dependency>
143-
<groupId>org.apache.logging.log4j</groupId>
144-
<artifactId>log4j-core</artifactId>
138+
<groupId>org.slf4j</groupId>
139+
<artifactId>slf4j-log4j12</artifactId>
145140
</dependency>
141+
146142
<dependency>
147143
<groupId>org.codehaus.groovy</groupId>
148144
<artifactId>groovy-all</artifactId>
+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Root logger option
2+
log4j.rootLogger=INFO, stdout
3+
log4j.logger.org.elasticsearch=WARN
4+
log4j.logger.io.searchbox.client.config.discovery.NodeChecker=FATAL
5+
6+
# Direct log messages to stdout
7+
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
8+
log4j.appender.stdout.Target=System.out
9+
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
10+
log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c{1}:%L - %m%n

jest/src/test/resources/log4j2.xml

-17
This file was deleted.

pom.xml

+3-11
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@
8181
<httpclientandroid.version>4.3.5.1</httpclientandroid.version>
8282

8383
<slf4j.version>1.7.10</slf4j.version>
84-
<log4j.version>2.1</log4j.version>
8584

8685
<guava.version>18.0</guava.version>
8786
<gson.version>2.3.1</gson.version>
@@ -280,16 +279,9 @@
280279
</dependency>
281280

282281
<dependency>
283-
<groupId>org.apache.logging.log4j</groupId>
284-
<artifactId>log4j-slf4j-impl</artifactId>
285-
<version>${log4j.version}</version>
286-
<scope>provided</scope>
287-
</dependency>
288-
289-
<dependency>
290-
<groupId>org.apache.logging.log4j</groupId>
291-
<artifactId>log4j-core</artifactId>
292-
<version>${log4j.version}</version>
282+
<groupId>org.slf4j</groupId>
283+
<artifactId>slf4j-log4j12</artifactId>
284+
<version>${slf4j.version}</version>
293285
<scope>provided</scope>
294286
</dependency>
295287

0 commit comments

Comments
 (0)