diff --git a/samples/standalone/kotlin/http-client/build.gradle.kts b/samples/standalone/kotlin/http-client/build.gradle.kts index c2f23f16ba..3f5b4d062e 100644 --- a/samples/standalone/kotlin/http-client/build.gradle.kts +++ b/samples/standalone/kotlin/http-client/build.gradle.kts @@ -2,7 +2,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id("org.springframework.boot") version "2.2.0.BUILD-SNAPSHOT" + id("org.springframework.boot") id("io.spring.dependency-management") version "1.0.7.RELEASE" id("maven-publish") kotlin("jvm") version "1.3.41" diff --git a/samples/standalone/kotlin/http-client/gradle.properties b/samples/standalone/kotlin/http-client/gradle.properties index 535ecb91d1..6b3c50fd63 100644 --- a/samples/standalone/kotlin/http-client/gradle.properties +++ b/samples/standalone/kotlin/http-client/gradle.properties @@ -1,2 +1,3 @@ org.gradle.daemon=false BOM_VERSION=Hoxton.BUILD-SNAPSHOT +bootVersion=2.2.0.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/kotlin/http-client/settings.gradle.kts b/samples/standalone/kotlin/http-client/settings.gradle.kts index c2f731718d..8bf301bc86 100644 --- a/samples/standalone/kotlin/http-client/settings.gradle.kts +++ b/samples/standalone/kotlin/http-client/settings.gradle.kts @@ -8,9 +8,10 @@ pluginManagement { gradlePluginPortal() } resolutionStrategy { + val bootVersion: String by settings eachPlugin { if (requested.id.id == "org.springframework.boot") { - useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}") + useModule("org.springframework.boot:spring-boot-gradle-plugin:$bootVersion") } } } diff --git a/samples/standalone/kotlin/http-server/build.gradle.kts b/samples/standalone/kotlin/http-server/build.gradle.kts index 750276716f..f6ac804fe6 100644 --- a/samples/standalone/kotlin/http-server/build.gradle.kts +++ b/samples/standalone/kotlin/http-server/build.gradle.kts @@ -2,9 +2,9 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id("org.springframework.boot") version "2.2.0.M5" + id("org.springframework.boot") id("io.spring.dependency-management") version "1.0.7.RELEASE" - id("spring-cloud-contract") version "2.2.0.BUILD-SNAPSHOT" + id("spring-cloud-contract") id("maven-publish") kotlin("jvm") version "1.3.41" kotlin("plugin.spring") version "1.3.41" @@ -91,4 +91,4 @@ tasks.withType { freeCompilerArgs = listOf("-Xjsr305=strict") jvmTarget = "1.8" } -} +} \ No newline at end of file diff --git a/samples/standalone/kotlin/http-server/gradle.properties b/samples/standalone/kotlin/http-server/gradle.properties index 535ecb91d1..4e2909074c 100644 --- a/samples/standalone/kotlin/http-server/gradle.properties +++ b/samples/standalone/kotlin/http-server/gradle.properties @@ -1,2 +1,4 @@ org.gradle.daemon=false +verifierVersion=2.2.0.BUILD-SNAPSHOT BOM_VERSION=Hoxton.BUILD-SNAPSHOT +bootVersion=2.2.0.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/kotlin/http-server/settings.gradle.kts b/samples/standalone/kotlin/http-server/settings.gradle.kts index a512bc3448..34bf28a9e3 100644 --- a/samples/standalone/kotlin/http-server/settings.gradle.kts +++ b/samples/standalone/kotlin/http-server/settings.gradle.kts @@ -8,12 +8,14 @@ pluginManagement { gradlePluginPortal() } resolutionStrategy { + val bootVersion: String by settings + val verifierVersion: String by settings eachPlugin { if (requested.id.id == "org.springframework.boot") { - useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}") + useModule("org.springframework.boot:spring-boot-gradle-plugin:$bootVersion") } if (requested.id.id == "spring-cloud-contract") { - useModule("org.springframework.cloud:spring-cloud-contract-gradle-plugin:${requested.version}") + useModule("org.springframework.cloud:spring-cloud-contract-gradle-plugin:$verifierVersion") } } }