Upgrade dependencies and samples to Spring Boot 1.4.7.RELEASE levels

Resolves: #1108
2018-09-26 12:25:08 +02:00
parent 46bac131d0
commit eb4ce12915
15 changed files with 35 additions and 25 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ plugins {

 group = 'org.springframework.session'

-ext.springBootVersion = '1.4.2.RELEASE'
+ext.springBootVersion = '1.4.7.RELEASE'
 ext.IDE_GRADLE = "$rootDir/gradle/ide.gradle"
 ext.JAVA_GRADLE = "$rootDir/gradle/java.gradle"
 ext.SPRING3_GRADLE = "$rootDir/gradle/spring3.gradle"
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,11 +1,11 @@
 bootstrapVersion=2.3.2
 commonsPoolVersion=2.4.2
-jacksonVersion=2.6.5
+jacksonVersion=2.8.8
 jspApiVersion=2.0
 servletApiVersion=3.0.1
 jstlelVersion=1.2.5
 version=1.3.4.BUILD-SNAPSHOT
-springDataRedisVersion=1.7.10.RELEASE
+springDataRedisVersion=1.7.11.RELEASE
 html5ShivVersion=3.7.3
 commonsLoggingVersion=1.2
 junitVersion=4.12
@@ -13,19 +13,19 @@ springDataRedisSpring3Version=1.7.1.RELEASE
 lettuceVersion=3.5.0.Final
 gebVersion=0.13.1
 mockitoVersion=1.10.19
-hazelcastVersion=3.6.5
+hazelcastVersion=3.6.8
 seleniumVersion=2.52.0
 springDataGeodeVersion=1.0.0.INCUBATING-RELEASE
-springSecurityVersion=4.2.0.RELEASE
-springVersion=4.3.4.RELEASE
-httpClientVersion=4.5.1
-h2Version=1.4.192
-jedisVersion=2.8.1
-springDataMongoVersion=1.9.4.RELEASE
+springSecurityVersion=4.2.8.RELEASE
+springVersion=4.3.9.RELEASE
+httpClientVersion=4.5.3
+h2Version=1.4.195
+jedisVersion=2.8.2
+springDataMongoVersion=1.9.11.RELEASE
 springShellVersion=1.1.0.RELEASE
-springDataGemFireVersion=1.8.10.RELEASE
+springDataGemFireVersion=1.8.11.RELEASE
 assertjVersion=2.5.0
 spockVersion=1.0-groovy-2.4
 webjarsTaglibVersion=0.3
 jstlVersion=1.2.1
-groovyVersion=2.4.4
+groovyVersion=2.4.11
--- a/samples/boot/build.gradle
+++ b/samples/boot/build.gradle
@@ -14,6 +14,8 @@ apply from: SAMPLE_GRADLE

 group = 'samples'

+ext['spring-security.version'] = springSecurityVersion
+
 dependencies {
 	compile project(':spring-session'),
 			"org.springframework.boot:spring-boot-starter-data-redis",
--- a/samples/findbyusername/build.gradle
+++ b/samples/findbyusername/build.gradle
@@ -14,6 +14,8 @@ apply from: SAMPLE_GRADLE

 group = 'samples'

+ext['spring-security.version'] = springSecurityVersion
+
 dependencies {
 	compile project(':spring-session'),
 			"org.springframework.boot:spring-boot-starter-data-redis",
--- a/samples/httpsession-gemfire-boot/build.gradle
+++ b/samples/httpsession-gemfire-boot/build.gradle
@@ -12,6 +12,8 @@ apply plugin: "application"
 apply plugin: 'org.springframework.boot'
 apply from: SAMPLE_GRADLE

+ext['spring-security.version'] = springSecurityVersion
+
 dependencies {
 	compile project(':spring-session-data-gemfire'),
 		"org.springframework.boot:spring-boot-starter-thymeleaf",
@@ -19,14 +21,14 @@ dependencies {
 		"org.webjars:bootstrap:$bootstrapVersion",
 		"org.webjars:webjars-locator"

-	runtime "org.springframework.shell:spring-shell:1.0.0.RELEASE"
+	runtime "org.springframework.shell:spring-shell:$springShellVersion"

 	testCompile "org.springframework.boot:spring-boot-starter-test"

 	integrationTestCompile gebDependencies,
 		"org.spockframework:spock-spring:$spockVersion"

-	integrationTestRuntime "org.springframework.shell:spring-shell:1.0.0.RELEASE"
+	integrationTestRuntime "org.springframework.shell:spring-shell:$springShellVersion"
 }

 run {
--- a/samples/httpsession-gemfire-clientserver-xml/build.gradle
+++ b/samples/httpsession-gemfire-clientserver-xml/build.gradle
@@ -12,13 +12,13 @@ dependencies {

 	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"

-	runtime "org.springframework.shell:spring-shell:1.0.0.RELEASE"
+	runtime "org.springframework.shell:spring-shell:$springShellVersion"

 	testCompile "junit:junit:$junitVersion"

 	integrationTestCompile gebDependencies

-	integrationTestRuntime "org.springframework.shell:spring-shell:1.0.0.RELEASE"
+	integrationTestRuntime "org.springframework.shell:spring-shell:$springShellVersion"
 }

 mainClassName = 'sample.Application'
--- a/samples/httpsession-gemfire-clientserver/build.gradle
+++ b/samples/httpsession-gemfire-clientserver/build.gradle
@@ -12,13 +12,13 @@ dependencies {

 	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"

-	runtime "org.springframework.shell:spring-shell:1.0.0.RELEASE"
+	runtime "org.springframework.shell:spring-shell:$springShellVersion"

 	testCompile "junit:junit:$junitVersion"

 	integrationTestCompile gebDependencies

-	integrationTestRuntime "org.springframework.shell:spring-shell:1.0.0.RELEASE"
+	integrationTestRuntime "org.springframework.shell:spring-shell:$springShellVersion"
 }


--- a/samples/httpsession-gemfire-p2p-xml/build.gradle
+++ b/samples/httpsession-gemfire-p2p-xml/build.gradle
@@ -15,5 +15,5 @@ dependencies {

 	integrationTestCompile gebDependencies

-	integrationTestRuntime "org.springframework.shell:spring-shell:1.0.0.RELEASE"
+	integrationTestRuntime "org.springframework.shell:spring-shell:$springShellVersion"
 }
--- a/samples/httpsession-gemfire-p2p/build.gradle
+++ b/samples/httpsession-gemfire-p2p/build.gradle
@@ -15,5 +15,5 @@ dependencies {

 	integrationTestCompile gebDependencies

-	integrationTestRuntime "org.springframework.shell:spring-shell:1.0.0.RELEASE"
+	integrationTestRuntime "org.springframework.shell:spring-shell:$springShellVersion"
 }
--- a/samples/httpsession-jdbc-boot/build.gradle
+++ b/samples/httpsession-jdbc-boot/build.gradle
@@ -14,6 +14,8 @@ apply from: SAMPLE_GRADLE

 group = 'samples'

+ext['spring-security.version'] = springSecurityVersion
+
 dependencies {
 	compile project(':spring-session-jdbc'),
 			"org.springframework.boot:spring-boot-starter-jdbc",
--- a/samples/httpsession-redis-json/build.gradle
+++ b/samples/httpsession-redis-json/build.gradle
@@ -15,7 +15,6 @@ apply from: SAMPLE_GRADLE
 group = 'samples'
 ext {
    jsonassertVersion="1.3.0"
-    assertjVersion = "2.4.0"
 }

 ext['spring-security.version'] = springSecurityVersion
--- a/samples/mongo/build.gradle
+++ b/samples/mongo/build.gradle
@@ -14,6 +14,8 @@ apply from: SAMPLE_GRADLE

 group = 'samples'

+ext['spring-security.version'] = springSecurityVersion
+
 dependencies {
 	compile project(':spring-session'),
 			"org.springframework.boot:spring-boot-starter-data-mongodb",
--- a/samples/websocket/build.gradle
+++ b/samples/websocket/build.gradle
@@ -15,6 +15,8 @@ apply from: SAMPLE_GRADLE

 group = 'samples'

+ext['spring-security.version'] = springSecurityVersion
+
 dependencies {
 	compile(project(':spring-session-data-redis')) {
 		exclude module: 'jedis'
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,7 +23,6 @@ include 'samples:security'
 include 'samples:users'
 include 'samples:websocket'
 include 'samples:mongo'
-include 'samples:grails3'

 include 'spring-session'
 include 'spring-session-data-gemfire'
--- a/spring-session/build.gradle
+++ b/spring-session/build.gradle
@@ -29,14 +29,14 @@ dependencies {
 			"org.springframework.security:spring-security-web:$springSecurityVersion"
 	provided "javax.servlet:javax.servlet-api:$servletApiVersion"
 	integrationTestCompile "redis.clients:jedis:$jedisVersion",
-			"org.apache.commons:commons-pool2:2.2",
+			"org.apache.commons:commons-pool2:$commonsPoolVersion",
 			"com.hazelcast:hazelcast-client:$hazelcastVersion",
 			"com.h2database:h2:$h2Version",
 			"org.hsqldb:hsqldb:2.3.3",
 			"org.apache.derby:derby:10.12.1.1",
-			"de.flapdoodle.embed:de.flapdoodle.embed.mongo:1.50.2"
+			"de.flapdoodle.embed:de.flapdoodle.embed.mongo:1.50.5"

-	integrationTestRuntime "org.springframework.shell:spring-shell:1.0.0.RELEASE"
+	integrationTestRuntime "org.springframework.shell:spring-shell:$springShellVersion"

 	testCompile "junit:junit:$junitVersion",
 			"org.mockito:mockito-core:$mockitoVersion",