enh(samples): using BOM instead of importing individual SpringBoot de…

…pendencies
apache · Dec 19, 2023 · ba01d28 · ba01d28
1 parent c1fcedd
commit ba01d28
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 49 deletions.
diff --git a/pom.xml b/pom.xml
@@ -998,24 +998,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <!-- Shiro samples: -->
-            <dependency>
-                <groupId>org.apache.shiro.samples</groupId>
-                <artifactId>samples-spring-client</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.shiro</groupId>
-                <artifactId>shiro-spring-boot-starter</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.shiro</groupId>
-                <artifactId>shiro-spring-boot-web-starter</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-
             <!-- Intra project test dependencies: -->
             <dependency>
                 <groupId>org.apache.shiro</groupId>
@@ -1403,33 +1385,6 @@
                 </exclusions>
             </dependency>
 
-            <!-- Spring Boot-->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter</artifactId>
-                <version>${spring-boot.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-autoconfigure</artifactId>
-                <version>${spring-boot.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-configuration-processor</artifactId>
-                <version>${spring-boot.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-test</artifactId>
-                <version>${spring-boot.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-web</artifactId>
-                <version>${spring-boot.version}</version>
-            </dependency>
-
             <!-- Guice -->
             <dependency>
                 <groupId>com.google.inject</groupId>

diff --git a/samples/spring-boot-web/pom.xml b/samples/spring-boot-web/pom.xml
@@ -40,6 +40,7 @@
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-spring-boot-web-starter</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -73,6 +74,18 @@
         </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>

diff --git a/samples/spring-boot/pom.xml b/samples/spring-boot/pom.xml
@@ -36,10 +36,10 @@
     </properties>
 
     <dependencies>
-
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-spring-boot-starter</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- Spring -->
@@ -67,9 +67,20 @@
             <artifactId>log4j-core</artifactId>
             <scope>runtime</scope>
         </dependency>
-
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>

diff --git a/samples/web-jakarta/pom.xml b/samples/web-jakarta/pom.xml
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>org.glassfish.web</groupId>
             <artifactId>jakarta.servlet.jsp.jstl</artifactId>
-            <version>2.0.0</version>
+            <version>3.0.1</version>
             <scope>compile</scope>
         </dependency>
 
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>jakarta.servlet.jsp.jstl</groupId>
             <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
-            <version>2.0.0</version>
+            <version>3.0.0</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>

diff --git a/support/spring-boot/pom.xml b/support/spring-boot/pom.xml
@@ -38,6 +38,13 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <!--
             The spring test API uses mockito, as much as I prefer mockito over easymock, one mock framework is
             probably enough, so putting in this pom makes that more obvious.

diff --git a/support/spring-boot/spring-boot-web-starter/pom.xml b/support/spring-boot/spring-boot-web-starter/pom.xml
@@ -40,6 +40,7 @@
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-spring-boot-starter</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- Spring -->

diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml
@@ -106,10 +106,12 @@
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-spring-boot-starter</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-spring-boot-web-starter</artifactId>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>