From d6be6dacc462b6525d93e3b32ac7055e860cd5c5 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 19 Jun 2018 22:18:20 -0700 Subject: [PATCH] Switch to Spring Boot Dependencies BOM for complete project dependency management. --- build.gradle | 4 ++++ docs/spring-session-docs.gradle | 9 --------- gradle.properties | 20 ++++++------------- gradle/dependency-management.gradle | 14 +------------ ...le-boot-gemfire-with-scoped-proxies.gradle | 10 ---------- .../spring-session-sample-boot-gemfire.gradle | 9 --------- ...ple-javaconfig-gemfire-clientserver.gradle | 9 --------- ...ssion-sample-javaconfig-gemfire-p2p.gradle | 9 --------- ...ion-sample-xml-gemfire-clientserver.gradle | 9 --------- ...ring-session-sample-xml-gemfire-p2p.gradle | 9 --------- .../spring-session-data-gemfire.gradle | 9 --------- .../spring-session-data-geode.gradle | 11 +--------- 12 files changed, 12 insertions(+), 110 deletions(-) diff --git a/build.gradle b/build.gradle index 9109d8b..57ac224 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,10 @@ buildscript { apply plugin: 'io.spring.convention.root' +//ext['spring.version'] = "$springVersion" +//ext['spring-data-releasetrain.version'] = "$springDataReleaseTrainVersion" +//ext['spring-session-bom.version'] = "$springSessionVersion" + group = 'org.springframework.session' description = 'Spring Session for Apache Geode' diff --git a/docs/spring-session-docs.gradle b/docs/spring-session-docs.gradle index 90f5c37..fe90541 100644 --- a/docs/spring-session-docs.gradle +++ b/docs/spring-session-docs.gradle @@ -1,16 +1,7 @@ -import org.springframework.boot.gradle.plugin.SpringBootPlugin - apply plugin: 'io.spring.convention.docs' apply plugin: 'io.spring.convention.spring-test' -apply plugin: 'io.spring.dependency-management' apply from: IDE_GRADLE -dependencyManagement { - imports { - mavenBom SpringBootPlugin.BOM_COORDINATES - } -} - dependencies { testCompile project(':spring-session-data-geode') diff --git a/gradle.properties b/gradle.properties index 510d059..8ba1e78 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,21 +1,13 @@ antlrVersion=2.7.7 -apacheGeodeVersion=1.2.1 apacheTaglibsStandardVersion=1.2.5 -assertjVersion=3.9.1 -hamcrestVersion=1.3 javaxServletJspJstlApiVersion=1.2.1 -junitVersion=4.12 -logbackVersion=1.2.3 -mockitoVersion=2.19.0 multithreadedtcVersion=1.01 -pivotalGemFireVersion=9.1.1 -slf4jVersion=1.7.25 -springVersion=5.0.7.RELEASE -springBootVersion=2.0.3.RELEASE -springDataGemFireVersion=2.0.8.RELEASE -springDataGeodeVersion=2.0.8.RELEASE -springDataReleaseTrainVersion=Kay-SR8 -springSecurityVersion=5.0.6.RELEASE +springVersion=5.0.6.RELEASE +springBootVersion=2.0.2.RELEASE +springDataGemFireVersion=2.0.7.RELEASE +springDataGeodeVersion=2.0.7.RELEASE +springDataReleaseTrainVersion=Kay-SR7 springSessionVersion=2.0.3.RELEASE +springSessionBomVersion=Apple-SR3 springShellVersion=1.2.0.RELEASE version=2.0.3.BUILD-SNAPSHOT diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 1bfe59d..910c978 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -1,26 +1,14 @@ dependencyManagement { imports { - mavenBom "org.springframework:spring-framework-bom:$springVersion" - mavenBom "org.springframework.data:spring-data-releasetrain:$springDataReleaseTrainVersion" - mavenBom "org.springframework.security:spring-security-bom:$springSecurityVersion" + mavenBom "org.springframework.boot:spring-boot-dependencies:$springBootVersion" } dependencies { dependency "antlr:antlr:$antlrVersion" - dependency "ch.qos.logback:logback-classic:$logbackVersion" - dependency "ch.qos.logback:logback-core:$logbackVersion" dependency "edu.umd.cs.mtc:multithreadedtc:$multithreadedtcVersion" dependency "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$javaxServletJspJstlApiVersion" - dependency "junit:junit:$junitVersion" dependency "org.apache.taglibs:taglibs-standard-impl:$apacheTaglibsStandardVersion" dependency "org.apache.taglibs:taglibs-standard-jstlel:$apacheTaglibsStandardVersion" dependency "org.apache.taglibs:taglibs-standard-spec:$apacheTaglibsStandardVersion" - dependency "org.assertj:assertj-core:$assertjVersion" - dependency "org.hamcrest:hamcrest-core:$hamcrestVersion" - dependency "org.hamcrest:hamcrest-library:$hamcrestVersion" - dependency "org.mockito:mockito-core:$mockitoVersion" - dependency "org.slf4j:jcl-over-slf4j:$slf4jVersion" - dependency "org.slf4j:jul-to-slf4j:$slf4jVersion" - dependency "org.slf4j:log4j-over-slf4j:$slf4jVersion" dependency "org.springframework.shell:spring-shell:$springShellVersion" dependency 'org.webjars:bootstrap:2.3.2' dependency 'org.webjars:jquery:1.12.4' diff --git a/samples/boot/gemfire-with-scoped-proxies/spring-session-sample-boot-gemfire-with-scoped-proxies.gradle b/samples/boot/gemfire-with-scoped-proxies/spring-session-sample-boot-gemfire-with-scoped-proxies.gradle index f53ee51..146fc3c 100644 --- a/samples/boot/gemfire-with-scoped-proxies/spring-session-sample-boot-gemfire-with-scoped-proxies.gradle +++ b/samples/boot/gemfire-with-scoped-proxies/spring-session-sample-boot-gemfire-with-scoped-proxies.gradle @@ -1,21 +1,11 @@ -import org.springframework.boot.gradle.plugin.SpringBootPlugin - apply plugin: 'io.spring.convention.spring-sample-boot' -apply plugin: 'io.spring.dependency-management' apply plugin: "application" - apply from: IDE_GRADLE repositories { mavenCentral() } -dependencyManagement { - imports { - mavenBom SpringBootPlugin.BOM_COORDINATES - } -} - dependencies { compile project(':spring-session-data-geode') diff --git a/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle b/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle index eee0b33..6ea7414 100644 --- a/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle +++ b/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle @@ -1,7 +1,4 @@ -import org.springframework.boot.gradle.plugin.SpringBootPlugin - apply plugin: 'io.spring.convention.spring-sample-boot' -apply plugin: 'io.spring.dependency-management' apply plugin: "application" apply from: IDE_GRADLE @@ -9,12 +6,6 @@ repositories { mavenCentral() } -dependencyManagement { - imports { - mavenBom SpringBootPlugin.BOM_COORDINATES - } -} - dependencies { compile project(':spring-session-data-geode') diff --git a/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle b/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle index 376d7ad..15fb96c 100644 --- a/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle +++ b/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle @@ -1,17 +1,8 @@ -import org.springframework.boot.gradle.plugin.SpringBootPlugin - apply plugin: 'io.spring.convention.spring-sample-war' -apply plugin: 'io.spring.dependency-management' apply plugin: "gemfire-server" apply plugin: "application" apply from: IDE_GRADLE -dependencyManagement { - imports { - mavenBom SpringBootPlugin.BOM_COORDINATES - } -} - dependencies { compile project(':spring-session-data-geode') diff --git a/samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle b/samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle index bc6fe41..112b2a3 100644 --- a/samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle +++ b/samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle @@ -1,15 +1,6 @@ -import org.springframework.boot.gradle.plugin.SpringBootPlugin - apply plugin: 'io.spring.convention.spring-sample-war' -apply plugin: 'io.spring.dependency-management' apply from: IDE_GRADLE -dependencyManagement { - imports { - mavenBom SpringBootPlugin.BOM_COORDINATES - } -} - dependencies { compile project(':spring-session-data-geode') diff --git a/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle b/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle index 376d7ad..15fb96c 100644 --- a/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle +++ b/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle @@ -1,17 +1,8 @@ -import org.springframework.boot.gradle.plugin.SpringBootPlugin - apply plugin: 'io.spring.convention.spring-sample-war' -apply plugin: 'io.spring.dependency-management' apply plugin: "gemfire-server" apply plugin: "application" apply from: IDE_GRADLE -dependencyManagement { - imports { - mavenBom SpringBootPlugin.BOM_COORDINATES - } -} - dependencies { compile project(':spring-session-data-geode') diff --git a/samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle b/samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle index bc6fe41..112b2a3 100644 --- a/samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle +++ b/samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle @@ -1,15 +1,6 @@ -import org.springframework.boot.gradle.plugin.SpringBootPlugin - apply plugin: 'io.spring.convention.spring-sample-war' -apply plugin: 'io.spring.dependency-management' apply from: IDE_GRADLE -dependencyManagement { - imports { - mavenBom SpringBootPlugin.BOM_COORDINATES - } -} - dependencies { compile project(':spring-session-data-geode') diff --git a/spring-session-data-gemfire/spring-session-data-gemfire.gradle b/spring-session-data-gemfire/spring-session-data-gemfire.gradle index 362e140..1bb6326 100644 --- a/spring-session-data-gemfire/spring-session-data-gemfire.gradle +++ b/spring-session-data-gemfire/spring-session-data-gemfire.gradle @@ -1,17 +1,8 @@ -import org.springframework.boot.gradle.plugin.SpringBootPlugin - apply plugin: 'io.spring.convention.spring-module' -apply plugin: 'io.spring.dependency-management' apply from: IDE_GRADLE description = "Spring Session for Pivotal GemFire" -dependencyManagement { - imports { - mavenBom SpringBootPlugin.BOM_COORDINATES - } -} - dependencies { compile(project(':spring-session-data-geode')) { diff --git a/spring-session-data-geode/spring-session-data-geode.gradle b/spring-session-data-geode/spring-session-data-geode.gradle index ff603be..3b49c98 100644 --- a/spring-session-data-geode/spring-session-data-geode.gradle +++ b/spring-session-data-geode/spring-session-data-geode.gradle @@ -1,22 +1,13 @@ -import org.springframework.boot.gradle.plugin.SpringBootPlugin - apply plugin: 'io.spring.convention.spring-module' -apply plugin: 'io.spring.dependency-management' apply from: IDE_GRADLE -dependencyManagement { - imports { - mavenBom SpringBootPlugin.BOM_COORDINATES - } -} - description = "Spring Session for Apache Geode" dependencies { compile "org.springframework:spring-context-support" compile "org.springframework:spring-jcl" - compile "org.springframework.data:spring-data-geode:$springDataGeodeVersion" + compile "org.springframework.data:spring-data-geode" compile "org.springframework.session:spring-session-core:$springSessionVersion" optional "org.springframework.security:spring-security-core"