You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lp...@apache.org on 2023/02/13 03:20:05 UTC

[shiro] branch 1.11.x updated: [SHIRO-889] (backport to 1.11.x branch) Fix BOM for jakarta usage

This is an automated email from the ASF dual-hosted git repository.

lprimak pushed a commit to branch 1.11.x
in repository https://gitbox.apache.org/repos/asf/shiro.git


The following commit(s) were added to refs/heads/1.11.x by this push:
     new a7885fc7 [SHIRO-889] (backport to 1.11.x branch) Fix BOM for jakarta usage
a7885fc7 is described below

commit a7885fc7e9a015c7f82c27f0080e8c9220adc5c2
Author: lprimak <le...@flowlogix.com>
AuthorDate: Sun Feb 12 21:19:34 2023 -0600

    [SHIRO-889] (backport to 1.11.x branch) Fix BOM for jakarta usage
---
 bom/pom.xml                 | 62 +++++++++++++++++++++++++--------------------
 samples/web-jakarta/pom.xml | 19 +++++++++-----
 2 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 492c3571..2798c783 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -29,30 +29,38 @@
     <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-core</artifactId>
+                <classifier>jakarta</classifier>
+                <version>${project.version}</version>
+            </dependency>
+            <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 ecd8cce1..1b03b4c3 100644
--- a/samples/web-jakarta/pom.xml
+++ b/samples/web-jakarta/pom.xml
@@ -34,6 +34,18 @@
         <tomcat.version>10.0.27</tomcat.version>
     </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>
@@ -45,13 +57,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>