Merge pull request #128 from fpapon/SHIRO-683
[SHIRO-683] Upgrade to spring-boot 1.5.19.RELEASE
diff --git a/pom.xml b/pom.xml
index 587c827..ce571bb 100644
--- 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
index bdd3766..7313962 100644
--- 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
index aaf2810..926c109 100644
--- 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
index b1134e9..9ad2122 100644
--- 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/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index c498c16..3737aac 100644
--- a/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/support/spring-boot/spring-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
- },
+ }
]
}
\ No newline at end of file
diff --git a/support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index a5157d3..ff13832 100644
--- a/support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -2,7 +2,7 @@
"groups": [
{
"name": "shiro"
- },
+ }
],
"properties": [
