From bd01ef5be048ed5b141183300be2a8161c97c8c4 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 30 May 2018 21:46:29 -0700 Subject: [PATCH] Remove Spring Boot (Gradle) Plugin. Apply the 'io.spring.dependency-management' (Gradle) plugin and import Spring Boot's BOM. --- .../geode-spring-boot-autoconfigure.gradle | 9 ++++++++- geode-spring-boot/geode-spring-boot.gradle | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/geode-spring-boot-autoconfigure/geode-spring-boot-autoconfigure.gradle b/geode-spring-boot-autoconfigure/geode-spring-boot-autoconfigure.gradle index 0228b7fe..47aea3f9 100644 --- a/geode-spring-boot-autoconfigure/geode-spring-boot-autoconfigure.gradle +++ b/geode-spring-boot-autoconfigure/geode-spring-boot-autoconfigure.gradle @@ -1,6 +1,7 @@ +import org.springframework.boot.gradle.plugin.SpringBootPlugin + apply plugin: 'io.spring.convention.spring-module' apply plugin: 'io.spring.dependency-management' -apply plugin: 'org.springframework.boot' apply from: IDE_GRADLE description = "Spring Boot for Apache Geode Auto-Configuration" @@ -9,6 +10,12 @@ repositories { maven { url "https://repo.spring.io/libs-snapshot" } } +dependencyManagement { + imports { + mavenBom SpringBootPlugin.BOM_COORDINATES + } +} + dependencies { compile project(":geode-spring-boot") diff --git a/geode-spring-boot/geode-spring-boot.gradle b/geode-spring-boot/geode-spring-boot.gradle index 66f2793f..62a92385 100644 --- a/geode-spring-boot/geode-spring-boot.gradle +++ b/geode-spring-boot/geode-spring-boot.gradle @@ -1,6 +1,7 @@ +import org.springframework.boot.gradle.plugin.SpringBootPlugin + apply plugin: 'io.spring.convention.spring-module' apply plugin: 'io.spring.dependency-management' -apply plugin: 'org.springframework.boot' apply from: IDE_GRADLE description = "Spring Boot for Apache Geode" @@ -9,6 +10,12 @@ repositories { maven { url "https://repo.spring.io/libs-snapshot" } } +dependencyManagement { + imports { + mavenBom SpringBootPlugin.BOM_COORDINATES + } +} + dependencies { compile "org.springframework:spring-context-support"