spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-25 10:59:03 +00:00
Code Issues Projects Releases Wiki Activity

Speed up Maven plugin integration tests

Browse Source 
Closes gh-49396
This commit is contained in:
Andy Wilkinson
2026-03-04 12:13:45 +00:00
parent 018c215e54
commit 48cf7ebe6d
3 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/java/org/springframework/boot/build/RepositoryTransformersExtension.java
-16
View File
@@ -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<String, String> 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));
}
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
+1 -7
View File
@@ -108,18 +108,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")
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuild.java
+1 -1
View File
@@ -160,7 +160,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);