From d7c9038e2344a32355f4298468e7eae28ceac310 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 19 Jun 2018 20:45:59 -0700 Subject: [PATCH] Remove Spring IO Platform Dependency Management. Declare Spring's Dependency Management Gradle Plugin to manage project dependency versions. --- docs/spring-session-docs.gradle | 10 +++++++++- ...on-sample-boot-gemfire-with-scoped-proxies.gradle | 9 +++++++++ .../spring-session-sample-boot-gemfire.gradle | 12 ++++++++++-- ...ion-sample-javaconfig-gemfire-clientserver.gradle | 10 +++++++++- ...ring-session-sample-javaconfig-gemfire-p2p.gradle | 10 +++++++++- ...ng-session-sample-xml-gemfire-clientserver.gradle | 10 +++++++++- .../spring-session-sample-xml-gemfire-p2p.gradle | 10 +++++++++- .../spring-session-data-gemfire.gradle | 10 +++++++++- .../spring-session-data-geode.gradle | 10 +++++++++- 9 files changed, 82 insertions(+), 9 deletions(-) diff --git a/docs/spring-session-docs.gradle b/docs/spring-session-docs.gradle index f23a1a7..90f5c37 100644 --- a/docs/spring-session-docs.gradle +++ b/docs/spring-session-docs.gradle @@ -1,8 +1,16 @@ +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/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 71e54c0..f53ee51 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,4 +1,7 @@ +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 @@ -7,6 +10,12 @@ 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 b238224..eee0b33 100644 --- a/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle +++ b/samples/boot/gemfire/spring-session-sample-boot-gemfire.gradle @@ -1,12 +1,20 @@ -apply plugin: 'io.spring.convention.spring-sample-boot' -apply plugin: "application" +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/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle b/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle index efe43e5..376d7ad 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,9 +1,17 @@ +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 181cc6a..bc6fe41 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,7 +1,15 @@ -apply plugin: 'io.spring.convention.spring-sample-war' +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 efe43e5..376d7ad 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,9 +1,17 @@ +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 181cc6a..bc6fe41 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,7 +1,15 @@ -apply plugin: 'io.spring.convention.spring-sample-war' +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 216aeac..362e140 100644 --- a/spring-session-data-gemfire/spring-session-data-gemfire.gradle +++ b/spring-session-data-gemfire/spring-session-data-gemfire.gradle @@ -1,9 +1,17 @@ -apply plugin: 'io.spring.convention.spring-module' +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 f4d4cc3..ff603be 100644 --- a/spring-session-data-geode/spring-session-data-geode.gradle +++ b/spring-session-data-geode/spring-session-data-geode.gradle @@ -1,7 +1,15 @@ -apply plugin: 'io.spring.convention.spring-module' +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 {