[SHIRO-683] Upgrade to spring-boot 1.5.19.RELEASE

apache · Mar 31, 2019 · ac03c74 · ac03c74
1 parent d173006
commit ac03c74
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -95,7 +95,7 @@
         <quartz.version>1.6.1</quartz.version>
         <slf4j.version>1.7.21</slf4j.version>
         <spring.version>4.3.22.RELEASE</spring.version>
-        <spring-boot.version>1.4.1.RELEASE</spring-boot.version>
+        <spring-boot.version>1.5.19.RELEASE</spring-boot.version>
         <guice.version>3.0</guice.version>
 
         <!-- Test 3rd-party dependencies: -->

diff --git a/samples/spring-boot-web/pom.xml b/samples/spring-boot-web/pom.xml
@@ -62,6 +62,12 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.2</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/support/spring-boot/pom.xml b/support/spring-boot/pom.xml
@@ -31,11 +31,6 @@
     <name>Apache Shiro :: Support :: Spring Boot Parent</name>
     <packaging>pom</packaging>
 
-    <properties>
-        <!-- These spring-boot modules require spring 4 -->
-        <spring.version>4.3.2.RELEASE</spring.version>
-    </properties>
-
     <modules>
         <module>spring-boot-starter</module>
         <module>spring-boot-web-starter</module>

diff --git a/support/spring-boot/spring-boot-starter/pom.xml b/support/spring-boot/spring-boot-starter/pom.xml
@@ -67,6 +67,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.2</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
 </project>
diff --git a/...ng-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/...ng-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -2,7 +2,7 @@
   "groups": [
     {
       "name": "shiro"
-    },
+    }
   ],
   "properties": [
 
@@ -11,6 +11,6 @@
       "type": "java.lang.Boolean",
       "description": "A boolean flag that can disable all Shiro Spring Boot starters.  This is mostly useful during testing or debugging, or if you want to compare behavior when Shiro is enabled or disabled.",
       "defaultValue": true
-    },
+    }
   ]
 }
diff --git a/...oot-web-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/...oot-web-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -2,7 +2,7 @@
   "groups": [
     {
       "name": "shiro"
-    },
+    }
   ],
   "properties": [
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
       "groups": [
         {
           "name": "shiro"
-        },
+        }
       ],
       "properties": [
@@ Expand Down @@