diff --git a/gradle.properties b/gradle.properties index 35d2a7f5..e4ed6b23 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,15 +1,7 @@ antlrVersion=2.7.7 apacheGeodeVersion=1.2.1 -assertjVersion=3.9.1 -cacheApiVersion=1.0.0 -hamcrestVersion=1.3 -junitVersion=4.12 -logbackVersion=1.2.3 -lombokVersion=1.16.20 -mockitoVersion=2.18.3 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 diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index a4dd2d49..49262b64 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -1,23 +1,10 @@ dependencyManagement { imports { - mavenBom "org.springframework:spring-framework-bom:$springVersion" - mavenBom "org.springframework.data:spring-data-releasetrain:$springDataReleaseTrainVersion" + mavenBom "org.springframework.boot:spring-boot-dependencies:$springBootVersion" } dependencies { - dependency "javax.cache:cache-api:$cacheApiVersion" 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 "junit:junit:$junitVersion" - dependency "org.assertj:assertj-core:$assertjVersion" - dependency "org.hamcrest:hamcrest-core:$hamcrestVersion" - dependency "org.projectlombok:lombok:$lombokVersion" - 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.data:spring-data-geode-test:$springDataGeodeTest" dependency "org.springframework.shell:spring-shell:$springShellVersion" } diff --git a/spring-gemfire-starter/spring-gemfire-starter.gradle b/spring-gemfire-starter/spring-gemfire-starter.gradle index 282331a4..fc8d7707 100644 --- a/spring-gemfire-starter/spring-gemfire-starter.gradle +++ b/spring-gemfire-starter/spring-gemfire-starter.gradle @@ -1,18 +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 Boot Starter for Pivotal GemFire" -dependencyManagement { - imports { - mavenBom SpringBootPlugin.BOM_COORDINATES - } -} - //ext['spring-data-releasetrain.version'] = "$springDataReleaseTrainVersion" dependencies { diff --git a/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle b/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle index 9997d9af..2e43560d 100644 --- a/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle +++ b/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle @@ -1,7 +1,4 @@ -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 Boot for Apache Geode Auto-Configuration" @@ -10,12 +7,6 @@ repositories { maven { url "https://repo.spring.io/libs-snapshot" } } -dependencyManagement { - imports { - mavenBom SpringBootPlugin.BOM_COORDINATES - } -} - //ext['spring-data-releasetrain.version'] = "$springDataReleaseTrainVersion" dependencies { diff --git a/spring-geode-starter/spring-geode-starter.gradle b/spring-geode-starter/spring-geode-starter.gradle index 5107a903..79f13639 100644 --- a/spring-geode-starter/spring-geode-starter.gradle +++ b/spring-geode-starter/spring-geode-starter.gradle @@ -1,18 +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 Boot Starter for Apache Geode" -dependencyManagement { - imports { - mavenBom SpringBootPlugin.BOM_COORDINATES - } -} - //ext['spring-data-releasetrain.version'] = "$springDataReleaseTrainVersion" dependencies { diff --git a/spring-geode/spring-geode.gradle b/spring-geode/spring-geode.gradle index c2202a42..16ec0c14 100644 --- a/spring-geode/spring-geode.gradle +++ b/spring-geode/spring-geode.gradle @@ -1,7 +1,4 @@ -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 Boot for Apache Geode" @@ -10,12 +7,6 @@ repositories { maven { url "https://repo.spring.io/libs-snapshot" } } -dependencyManagement { - imports { - mavenBom SpringBootPlugin.BOM_COORDINATES - } -} - //ext['spring-data-releasetrain.version'] = "$springDataReleaseTrainVersion" dependencies {