root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Remove implicit deployment of bom projects

This commit is contained in:
Andy Wilkinson 2025-05-27 08:09:10 +01:00
parent 3dd227f1f7
commit f799fc4777
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/java/org/springframework/boot/build/bom/BomPlugin.java
View File

@ -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<Project> {
@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);

7
buildSrc/src/test/java/org/springframework/boot/build/bom/BomPluginIntegrationTests.java
View File

@ -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') {");

1
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle
View File

@ -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"))