Rename Gradle 'springVersion' property to 'springFrameworkVersion'

This commit is contained in:
Roy Clarkson
2019-10-28 13:53:44 -04:00
committed by Roy Clarkson
parent fd245587af
commit cd1e1d628f
2 changed files with 6 additions and 6 deletions

View File

@@ -51,7 +51,7 @@ configure(allprojects) {
ext {
springBootVersion = project.findProperty("springBootVersion") ?: "2.1.10.RELEASE"
springVersion = project.findProperty("springVersion") ?: "5.1.11.RELEASE"
springVersion = project.findProperty("springFrameworkVersion") ?: "5.1.11.RELEASE"
reactorVersion = project.findProperty("reactorVersion") ?: "Californium-SR13"
openServiceBrokerVersion = "3.0.4.RELEASE"
springCredhubVersion = "2.0.1.RELEASE"
@@ -59,8 +59,8 @@ configure(allprojects) {
}
//override managed Spring Boot versions
if (project.hasProperty("springVersion")) {
ext['spring-framework.version'] = ext.springVersion
if (project.hasProperty("springFrameworkVersion")) {
ext['spring-framework.version'] = ext.springFrameworkVersion
}
if (project.hasProperty("reactorVersion")) {
ext['reactor-bom.version'] = ext.reactorVersion
@@ -75,7 +75,7 @@ configure(allprojects) {
testRuntimeOnly("io.spring.nohttp:nohttp:0.0.3.RELEASE")
}
if (project.hasProperty("springVersion") || project.hasProperty("springBootVersion") || project.hasProperty("reactorVersion")) {
if (project.hasProperty("springFrameworkVersion") || project.hasProperty("springBootVersion") || project.hasProperty("reactorVersion")) {
repositories {
maven { url "https://repo.spring.io/libs-snapshot" }
}
@@ -83,7 +83,7 @@ configure(allprojects) {
ext.javadocLinks = [
"https://docs.oracle.com/javase/8/docs/api/",
"https://docs.spring.io/spring/docs/${springVersion}/javadoc-api/",
"https://docs.spring.io/spring/docs/${springFrameworkVersion}/javadoc-api/",
] as String[]
}

View File

@@ -24,7 +24,7 @@ ext {
dependencyManagement {
imports {
mavenBom "org.springframework:spring-framework-bom:${springVersion}"
mavenBom "org.springframework:spring-framework-bom:${springFrameworkVersion}"
mavenBom "io.projectreactor:reactor-bom:${reactorVersion}"
}
}