diff --git a/build-plugin/spring-boot-maven-plugin/build.gradle b/build-plugin/spring-boot-maven-plugin/build.gradle index 79e6d7c1ba3..4cb02fc1766 100644 --- a/build-plugin/spring-boot-maven-plugin/build.gradle +++ b/build-plugin/spring-boot-maven-plugin/build.gradle @@ -107,18 +107,12 @@ tasks.named("checkCompileClasspathForProhibitedDependencies") { permittedGroups = ["javax.inject"] } -tasks.register("copySettingsXml", Copy) { - from file("src/intTest/projects/settings.xml") - into layout.buildDirectory.dir("generated-resources/settings") - filter(springRepositoryTransformers.mavenSettings()) -} - sourceSets { main { output.dir(layout.buildDirectory.dir("generated/resources/xsd"), builtBy: "xsdResources") } intTest { - output.dir(layout.buildDirectory.dir("generated-resources"), builtBy: ["extractVersionProperties", "copySettingsXml"]) + output.dir(layout.buildDirectory.dir("generated-resources"), builtBy: ["extractVersionProperties"]) } dockerTest { output.dir(layout.buildDirectory.dir("generated-resources"), builtBy: "extractVersionProperties") diff --git a/build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuild.java b/build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuild.java index d2ecefe0050..0a781e72ce3 100644 --- a/build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuild.java +++ b/build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuild.java @@ -163,7 +163,7 @@ class MavenBuild { } }); - String settingsXml = Files.readString(Paths.get("build", "generated-resources", "settings", "settings.xml")) + String settingsXml = Files.readString(Paths.get("src", "intTest", "projects", "settings.xml")) .replace("@localCentralUrl@", new File("build/test-maven-repository").toURI().toURL().toString()) .replace("@localRepositoryPath@", new File("build/local-maven-repository").getAbsolutePath()); Files.writeString(destination.resolve("settings.xml"), settingsXml, StandardOpenOption.CREATE_NEW); diff --git a/buildSrc/src/main/java/org/springframework/boot/build/RepositoryTransformersExtension.java b/buildSrc/src/main/java/org/springframework/boot/build/RepositoryTransformersExtension.java index 74772a8ef44..3ec3ee08ab7 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/RepositoryTransformersExtension.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/RepositoryTransformersExtension.java @@ -43,8 +43,6 @@ public class RepositoryTransformersExtension { private static final String REPOSITORIES_MARKER = "{spring.mavenRepositories}"; - private static final String PLUGIN_REPOSITORIES_MARKER = "{spring.mavenPluginRepositories}"; - private final Project project; @Inject @@ -80,20 +78,6 @@ public class RepositoryTransformersExtension { return line; } - public Transformer mavenSettings() { - return this::transformMavenSettings; - } - - private String transformMavenSettings(String line) { - if (line.contains(REPOSITORIES_MARKER)) { - return transformMavenRepositories(line, false); - } - if (line.contains(PLUGIN_REPOSITORIES_MARKER)) { - return transformMavenRepositories(line, true); - } - return line; - } - private String transformMavenRepositories(String line, boolean pluginRepository) { return transform(line, (repository, indent) -> mavenRepositoryXml(indent, repository, pluginRepository)); }