diff --git a/build-tools/dependency-constraints/src/main/groovy/com/vmware/gemfire/gradle/plugins/DependencyConstraints.groovy b/build-tools/dependency-constraints/src/main/groovy/com/vmware/gemfire/gradle/plugins/DependencyConstraints.groovy index 09aceab..29292ea 100644 --- a/build-tools/dependency-constraints/src/main/groovy/com/vmware/gemfire/gradle/plugins/DependencyConstraints.groovy +++ b/build-tools/dependency-constraints/src/main/groovy/com/vmware/gemfire/gradle/plugins/DependencyConstraints.groovy @@ -39,7 +39,6 @@ class DependencyConstraints { depVersionMapping.put("springVersion","6.0.12") depVersionMapping.put("springBootVersion","3.0.11") depVersionMapping.put("springDataCommonsVersion","3.0.10") - depVersionMapping.put("springSessionVersion","3.0.3") depVersionMapping.put("multithreadedtcVersion","1.01") depVersionMapping.put("apacheLogging","2.14.1") depVersionMapping.put("jsr305Version","3.0.2") @@ -75,7 +74,6 @@ class DependencyConstraints { api(group: 'org.springframework.security', name: 'spring-security-test', version: get('springSecurityVersion')) api(group: 'org.springframework.security', name: 'spring-security-web', version: get('springSecurityVersion')) api(group: 'org.springframework.security', name: 'spring-security-core', version: get('springSecurityVersion')) - api(group: 'org.springframework.session', name: 'spring-session-core', version: get('springSessionVersion')) api(group: 'org.springframework.shell', name: 'spring-shell', version: get('springShellVersion')) api(group: 'org.webjars', name: 'bootstrap', version: '2.3.2') api(group: 'org.webjars', name: 'jquery', version: '1.12.4') diff --git a/gradle.properties b/gradle.properties index 59ff368..d89b8e2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,7 @@ springDataGemFireVersion=1.1.2 version=1.1.1-build.9999 gemfireVersion=9.15.8 springDataBaseVersion=SD30 +springSessionVersion=3.0.3 additionalMavenRepoURLs='' mavenPushRepository= diff --git a/spring-session-data-gemfire/build.gradle b/spring-session-data-gemfire/build.gradle index 18b5852..78ae37b 100644 --- a/spring-session-data-gemfire/build.gradle +++ b/spring-session-data-gemfire/build.gradle @@ -19,7 +19,7 @@ java { } javadoc { - title = "Spring Session for VMware GemFire Java API Reference" + title = "Spring Session ${getSpringSessionBaseVersion()} for VMware GemFire ${getGemFireBaseVersion()} Java API Reference" failOnError=false } @@ -34,7 +34,7 @@ dependencies { implementation 'org.springframework:spring-jcl' api "com.vmware.gemfire:spring-data-3.0-gemfire-${getGemFireBaseVersion()}:${springDataGemFireVersion}" - api 'org.springframework.session:spring-session-core:3.0.2' + api "org.springframework.session:spring-session-core:$springSessionVersion" implementation 'com.google.code.findbugs:jsr305' @@ -134,9 +134,17 @@ repositories { } String getGemFireBaseVersion() { - def split = "${gemfireVersion}".split("\\.") + return getBaseVersion(gemfireVersion) +} + +String getSpringSessionBaseVersion() { + return getBaseVersion(springSessionVersion) +} + +static String getBaseVersion(String version) { + def split = "${version}".split("\\.") if (split.length < 2) { - throw new RuntimeException("gemfireVersion is malformed") + throw new RuntimeException("version '$version' is malformed") } return "${split[0]}.${split[1]}" }