From 2c982260df4117d341db38b900b6c98c10bc3029 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 16 Oct 2024 12:08:44 +0100 Subject: [PATCH] Use platform dependencies instead of the dependency management plugin Closes gh-42712 --- .../spring-boot-launch-script-tests-app/build.gradle | 3 +-- .../spring-boot-loader-classic-tests-app/build.gradle | 3 +-- .../spring-boot-loader-tests-app/build.gradle | 3 +-- .../spring-boot-loader-tests-signed-jar/build.gradle | 3 +-- .../spring-boot-server-tests-app/build.gradle | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/build.gradle index 8330c1e3fa2..221663c7b8b 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/build.gradle @@ -3,8 +3,6 @@ plugins { id "org.springframework.boot" } -apply plugin: "io.spring.dependency-management" - repositories { maven { url "file:${rootDir}/../docker-test-maven-repository"} mavenCentral() @@ -12,6 +10,7 @@ repositories { } dependencies { + implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.apache.tomcat.embed:tomcat-embed-core") } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/spring-boot-loader-classic-tests-app/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/spring-boot-loader-classic-tests-app/build.gradle index 9a17edbe694..d986def75b0 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/spring-boot-loader-classic-tests-app/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/spring-boot-loader-classic-tests-app/build.gradle @@ -3,8 +3,6 @@ plugins { id "org.springframework.boot" } -apply plugin: "io.spring.dependency-management" - repositories { maven { url "file:${rootDir}/../docker-test-maven-repository"} mavenCentral() @@ -12,6 +10,7 @@ repositories { } dependencies { + implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.webjars:jquery:3.5.0") } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/build.gradle index d69aa8eaf0d..1cfe7de2e58 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/build.gradle @@ -3,8 +3,6 @@ plugins { id "org.springframework.boot" } -apply plugin: "io.spring.dependency-management" - repositories { maven { url "file:${rootDir}/../docker-test-maven-repository"} mavenCentral() @@ -12,6 +10,7 @@ repositories { } dependencies { + implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.webjars:jquery:3.5.0") } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar/build.gradle index a7e9b0225fd..bcbdc256cee 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar/build.gradle @@ -5,8 +5,6 @@ plugins { id "org.springframework.boot" } -apply plugin: "io.spring.dependency-management" - repositories { maven { url "file:${rootDir}/../docker-test-maven-repository"} mavenCentral() @@ -14,6 +12,7 @@ repositories { } dependencies { + implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter") implementation("org.bouncycastle:bcprov-jdk18on:1.78.1") } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/spring-boot-server-tests-app/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/spring-boot-server-tests-app/build.gradle index 60379bb2c43..39eab45a3ea 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/spring-boot-server-tests-app/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/spring-boot-server-tests-app/build.gradle @@ -7,8 +7,6 @@ plugins { id "war" } -apply plugin: "io.spring.dependency-management" - repositories { maven { url "file:${rootDir}/../test-repository"} mavenCentral() @@ -50,6 +48,7 @@ dependencies { compileOnly("org.eclipse.jetty.ee10:jetty-ee10-servlet") compileOnly("org.springframework:spring-web") + implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter") app(files(resourcesJar))