diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/BomPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/BomPlugin.java index bb100034e1..9c5c4b3588 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/bom/BomPlugin.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/bom/BomPlugin.java @@ -34,7 +34,6 @@ import org.gradle.api.publish.maven.MavenPom; import org.gradle.api.publish.maven.MavenPublication; import org.gradle.api.tasks.TaskProvider; -import org.springframework.boot.build.DeployedPlugin; import org.springframework.boot.build.MavenRepositoryPlugin; import org.springframework.boot.build.bom.Library.Group; import org.springframework.boot.build.bom.Library.Module; @@ -55,7 +54,6 @@ public class BomPlugin implements Plugin { @Override public void apply(Project project) { PluginContainer plugins = project.getPlugins(); - plugins.apply(DeployedPlugin.class); plugins.apply(MavenRepositoryPlugin.class); plugins.apply(JavaPlatformPlugin.class); JavaPlatformExtension javaPlatform = project.getExtensions().getByType(JavaPlatformExtension.class); diff --git a/buildSrc/src/test/java/org/springframework/boot/build/bom/BomPluginIntegrationTests.java b/buildSrc/src/test/java/org/springframework/boot/build/bom/BomPluginIntegrationTests.java index ad86cc204e..cf3c8ced8c 100644 --- a/buildSrc/src/test/java/org/springframework/boot/build/bom/BomPluginIntegrationTests.java +++ b/buildSrc/src/test/java/org/springframework/boot/build/bom/BomPluginIntegrationTests.java @@ -55,6 +55,7 @@ class BomPluginIntegrationTests { try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) { out.println("plugins {"); out.println(" id 'org.springframework.boot.bom'"); + out.println(" id 'org.springframework.boot.deployed'"); out.println("}"); out.println("bom {"); out.println(" library('ActiveMQ', '5.15.10') {"); @@ -91,6 +92,7 @@ class BomPluginIntegrationTests { try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) { out.println("plugins {"); out.println(" id 'org.springframework.boot.bom'"); + out.println(" id 'org.springframework.boot.deployed'"); out.println("}"); out.println("bom {"); out.println(" library('Flyway', '6.0.8') {"); @@ -118,6 +120,7 @@ class BomPluginIntegrationTests { try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) { out.println("plugins {"); out.println(" id 'org.springframework.boot.bom'"); + out.println(" id 'org.springframework.boot.deployed'"); out.println("}"); out.println("bom {"); out.println(" library('Jackson Bom', '2.10.0') {"); @@ -144,6 +147,7 @@ class BomPluginIntegrationTests { try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) { out.println("plugins {"); out.println(" id 'org.springframework.boot.bom'"); + out.println(" id 'org.springframework.boot.deployed'"); out.println("}"); out.println("bom {"); out.println(" library('MySQL', '8.0.18') {"); @@ -177,6 +181,7 @@ class BomPluginIntegrationTests { try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) { out.println("plugins {"); out.println(" id 'org.springframework.boot.bom'"); + out.println(" id 'org.springframework.boot.deployed'"); out.println("}"); out.println("bom {"); out.println(" library('Elasticsearch', '7.15.2') {"); @@ -208,6 +213,7 @@ class BomPluginIntegrationTests { try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) { out.println("plugins {"); out.println(" id 'org.springframework.boot.bom'"); + out.println(" id 'org.springframework.boot.deployed'"); out.println("}"); out.println("bom {"); out.println(" library('Kafka', '2.7.2') {"); @@ -266,6 +272,7 @@ class BomPluginIntegrationTests { try (PrintWriter out = new PrintWriter(new FileWriter(this.buildFile))) { out.println("plugins {"); out.println(" id 'org.springframework.boot.bom'"); + out.println(" id 'org.springframework.boot.deployed'"); out.println("}"); out.println("bom {"); out.println(" library('Spring Boot', '1.2.3') {"); diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle index eafdbbf2f9..ef5028e417 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle @@ -15,7 +15,6 @@ configurations { dependencies { app project(path: ":spring-boot-project:spring-boot-dependencies", configuration: "mavenRepository") - app project(path: ":spring-boot-project:spring-boot-parent", configuration: "mavenRepository") app project(path: ":spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin", configuration: "mavenRepository") dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))