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 2022/06/22 06:49:29 UTC
[shiro] branch main updated: fix SHIRO-881
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 541b2a9a fix SHIRO-881
new acc7c17a Merge pull request #355 from hugbgithub/SHIRO_881
541b2a9a is described below
commit 541b2a9a73e9b19e3bdfc08bc198c8797d5bfde4
Author: huguobiao <hu...@unionpay.com>
AuthorDate: Tue May 3 13:20:47 2022 +0800
fix SHIRO-881
---
samples/web/pom.xml | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/samples/web/pom.xml b/samples/web/pom.xml
index 2d6402ff..f771559c 100644
--- a/samples/web/pom.xml
+++ b/samples/web/pom.xml
@@ -76,11 +76,6 @@
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <scope>runtime</scope>
- </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
@@ -104,6 +99,20 @@
<artifactId>jcl-over-slf4j</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jsp</artifactId>
@@ -122,7 +131,6 @@
<artifactId>shiro-its-support</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
</project>