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/02/12 20:55:28 UTC
[shiro] branch main updated: [SHIRO-889] Fix BOM for jakarta usage
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 b9f4b779 [SHIRO-889] Fix BOM for jakarta usage
new a01d29fc Merge pull request #734 from fpapon/jakarta-bom
b9f4b779 is described below
commit b9f4b779a46df7830218105f6147952019815d84
Author: francois papon <fp...@apache.org>
AuthorDate: Sun Feb 12 20:42:19 2023 +0100
[SHIRO-889] Fix BOM for jakarta usage
---
bom/pom.xml | 56 +++++++++++++++++++++++----------------------
samples/web-jakarta/pom.xml | 19 +++++++++------
2 files changed, 41 insertions(+), 34 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 8429b735..5fff1fc7 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -31,30 +31,32 @@
<name>Apache Shiro :: BOM</name>
<packaging>pom</packaging>
- <dependencies>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-web</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-jaxrs</artifactId>
- <classifier>jakarta</classifier>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.shiro</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-web</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-jaxrs</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/samples/web-jakarta/pom.xml b/samples/web-jakarta/pom.xml
index 39a8c46f..bec56793 100644
--- a/samples/web-jakarta/pom.xml
+++ b/samples/web-jakarta/pom.xml
@@ -37,6 +37,18 @@
<jacoco.skip>true</jacoco.skip>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-bom</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.shiro</groupId>
@@ -48,13 +60,6 @@
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
<classifier>jakarta</classifier>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.shiro</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>