Skip to content

Commit 4feceb4

Browse files
committed
Use slf4j-simple to replace log4j impl (#2753)
1 parent 67289c5 commit 4feceb4

File tree

6 files changed

+9
-38
lines changed

6 files changed

+9
-38
lines changed

pom.xml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@
4646

4747
<properties>
4848
<github.global.server>github</github.global.server>
49-
<log4j.version>2.16.0</log4j.version>
49+
<slf4j.version>1.7.30</slf4j.version>
5050
<jedis.module.name>redis.clients.jedis</jedis.module.name>
5151
</properties>
5252

5353
<dependencies>
5454
<dependency>
5555
<groupId>org.slf4j</groupId>
5656
<artifactId>slf4j-api</artifactId>
57-
<version>1.7.30</version>
57+
<version>${slf4j.version}</version>
5858
</dependency>
5959
<dependency>
6060
<groupId>org.apache.commons</groupId>
@@ -72,15 +72,9 @@
7272
<scope>test</scope>
7373
</dependency>
7474
<dependency>
75-
<groupId>org.apache.logging.log4j</groupId>
76-
<artifactId>log4j-core</artifactId>
77-
<version>${log4j.version}</version>
78-
<scope>test</scope>
79-
</dependency>
80-
<dependency>
81-
<groupId>org.apache.logging.log4j</groupId>
82-
<artifactId>log4j-slf4j-impl</artifactId>
83-
<version>${log4j.version}</version>
75+
<groupId>org.slf4j</groupId>
76+
<artifactId>slf4j-simple</artifactId>
77+
<version>${slf4j.version}</version>
8478
<scope>test</scope>
8579
</dependency>
8680
<dependency>

src/test/java/redis/clients/jedis/tests/JedisClusterTest.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
import org.junit.AfterClass;
3131
import org.junit.Before;
3232
import org.junit.Test;
33-
import org.slf4j.Logger;
34-
import org.slf4j.LoggerFactory;
3533

3634
import redis.clients.jedis.GeoCoordinate;
3735
import redis.clients.jedis.GeoUnit;
@@ -69,7 +67,6 @@ public class JedisClusterTest {
6967
private HostAndPort nodeInfo3 = HostAndPortUtil.getClusterServers().get(2);
7068
private HostAndPort nodeInfo4 = HostAndPortUtil.getClusterServers().get(3);
7169
private HostAndPort nodeInfoSlave2 = HostAndPortUtil.getClusterServers().get(4);
72-
protected Logger log = LoggerFactory.getLogger(getClass().getName());
7370

7471
@Before
7572
public void setUp() throws InterruptedException {
@@ -287,7 +284,6 @@ public void testReadonlyAndReadwrite() throws Exception {
287284
*/
288285
@Test
289286
public void testMigrate() {
290-
log.info("test migrate slot");
291287
Set<HostAndPort> jedisClusterNode = new HashSet<HostAndPort>();
292288
jedisClusterNode.add(nodeInfo1);
293289
try (JedisCluster jc = new JedisCluster(jedisClusterNode, DEFAULT_TIMEOUT, DEFAULT_TIMEOUT,
@@ -338,7 +334,6 @@ public void testMigrate() {
338334

339335
@Test
340336
public void testMigrateToNewNode() throws InterruptedException {
341-
log.info("test migrate slot to new node");
342337
Set<HostAndPort> jedisClusterNode = new HashSet<HostAndPort>();
343338
jedisClusterNode.add(nodeInfo1);
344339
try (JedisCluster jc = new JedisCluster(jedisClusterNode, DEFAULT_TIMEOUT, DEFAULT_TIMEOUT,

src/test/java/redis/clients/jedis/tests/PipeliningTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ public void execAbort() {
741741
scriptKillWait();
742742
} else {
743743
// #2656: Checking if this status is actually 'OK' when error occurs in next command.
744-
org.apache.logging.log4j.LogManager.getLogger().error(
744+
org.slf4j.LoggerFactory.getLogger(PipeliningTest.class).error(
745745
String.format("Status if SCRIPT KILL command is \"%s\"", status));
746746
}
747747
} finally {

src/test/java/redis/clients/jedis/tests/commands/ListCommandsTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@
1313
import java.util.Collections;
1414
import java.util.List;
1515

16-
import org.apache.logging.log4j.LogManager;
17-
import org.apache.logging.log4j.Logger;
18-
1916
import org.junit.Test;
17+
import org.slf4j.Logger;
18+
import org.slf4j.LoggerFactory;
2019

2120
import redis.clients.jedis.Jedis;
2221
import redis.clients.jedis.ListPosition;
@@ -27,7 +26,7 @@
2726

2827
public class ListCommandsTest extends JedisCommandTestBase {
2928

30-
private static final Logger logger = LogManager.getLogger();
29+
private final Logger logger = LoggerFactory.getLogger(getClass());
3130

3231
final byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 };
3332
final byte[] bfoo1 = { 0x01, 0x02, 0x03, 0x04, 0x05 };

src/test/resources/MySimpson.png

-28.8 KB
Binary file not shown.

src/test/resources/log4j2.xml

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)