You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by fp...@apache.org on 2023/06/15 16:55:13 UTC
[shiro] branch main updated: [GH-935] Upgrade to log4j 2.20.0
This is an automated email from the ASF dual-hosted git repository.
fpapon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/main by this push:
new dae1edb64 [GH-935] Upgrade to log4j 2.20.0
new c120e6891 Merge pull request #936 from fpapon/GH-935
dae1edb64 is described below
commit dae1edb646c20e04bbcaf7d7ebeefeec71cf2c45
Author: francois papon <fp...@apache.org>
AuthorDate: Thu Jun 15 17:45:03 2023 +0200
[GH-935] Upgrade to log4j 2.20.0
---
core/pom.xml | 3 +--
.../test/java/org/apache/shiro/authc/AbstractAuthenticatorTest.java | 5 ++---
pom.xml | 5 ++---
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 599145c36..3d5f827ff 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -157,8 +157,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <classifier>tests</classifier>
+ <artifactId>log4j-core-test</artifactId>
<scope>test</scope>
</dependency>
diff --git a/core/src/test/java/org/apache/shiro/authc/AbstractAuthenticatorTest.java b/core/src/test/java/org/apache/shiro/authc/AbstractAuthenticatorTest.java
index 7434912a1..6b1b5bfb4 100644
--- a/core/src/test/java/org/apache/shiro/authc/AbstractAuthenticatorTest.java
+++ b/core/src/test/java/org/apache/shiro/authc/AbstractAuthenticatorTest.java
@@ -18,11 +18,10 @@
*/
package org.apache.shiro.authc;
-import org.apache.logging.log4j.junit.LoggerContextRule;
-import org.apache.logging.log4j.test.appender.ListAppender;
+import org.apache.logging.log4j.core.test.appender.ListAppender;
+import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.junit.Before;
import org.junit.ClassRule;
-import org.junit.Rule;
import org.junit.Test;
import static org.easymock.EasyMock.createMock;
diff --git a/pom.xml b/pom.xml
index 4703a0cc8..2a3c78a1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@
<quartz.version>2.3.2</quartz.version>
<slf4j.version>1.7.33</slf4j.version>
<logback.version>1.2.10</logback.version>
- <log4j.version>2.19.0</log4j.version>
+ <log4j.version>2.20.0</log4j.version>
<spring.version>5.3.27</spring.version>
<spring-boot.version>2.7.12</spring-boot.version>
<guice.version>4.2.3</guice.version>
@@ -1156,9 +1156,8 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
+ <artifactId>log4j-core-test</artifactId>
<version>${log4j.version}</version>
- <classifier>tests</classifier>
<scope>test</scope>
</dependency>