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/28 17:05:57 UTC
[shiro] branch main updated: [GH-904] Add Spring 6-related exclusions to Shiro BOM
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 6f954123f [GH-904] Add Spring 6-related exclusions to Shiro BOM
new 232cb0e56 Merge pull request #955 from fpapon/GH-904
6f954123f is described below
commit 6f954123ff09bf13ed6dd5d059835b1a64563b4c
Author: francois papon <fp...@apache.org>
AuthorDate: Wed Jun 21 10:57:45 2023 +0200
[GH-904] Add Spring 6-related exclusions to Shiro BOM
---
bom/pom.xml | 36 ++++++++++++++++++++++
pom.xml | 2 +-
samples/pom.xml | 1 -
.../spring-boot/spring-boot-web-starter/pom.xml | 17 +++++-----
4 files changed, 46 insertions(+), 10 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 12c32f965..b9cb6b177 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -87,6 +87,42 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-spring</artifactId>
+ <classifier>jakarta</classifier>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-spring-boot-web-starter</artifactId>
+ <classifier>jakarta</classifier>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-spring-boot-starter</artifactId>
+ <classifier>jakarta</classifier>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
diff --git a/pom.xml b/pom.xml
index cd9db33e2..296463ebe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,10 +147,10 @@
<module>web</module>
<module>support</module>
<module>tools</module>
+ <module>bom</module>
<module>integration-tests</module>
<module>samples</module>
<module>test-coverage</module>
- <module>bom</module>
</modules>
<mailingLists>
diff --git a/samples/pom.xml b/samples/pom.xml
index 2b4c08389..7f53a2655 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -63,4 +63,3 @@
</plugins>
</reporting>
</project>
-
diff --git a/support/spring-boot/spring-boot-web-starter/pom.xml b/support/spring-boot/spring-boot-web-starter/pom.xml
index 629f86c22..07bb176e9 100644
--- a/support/spring-boot/spring-boot-web-starter/pom.xml
+++ b/support/spring-boot/spring-boot-web-starter/pom.xml
@@ -38,13 +38,6 @@
<artifactId>shiro-spring-boot-starter</artifactId>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- <scope>provided</scope>
- </dependency>
-
<!-- Spring -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -64,7 +57,15 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
-
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>