Browse Source

Speed up Maven plugin integration tests

Closes gh-49396
pull/49591/head
Andy Wilkinson 2 weeks ago
parent
commit
48cf7ebe6d
  1. 16
      buildSrc/src/main/java/org/springframework/boot/build/RepositoryTransformersExtension.java
  2. 8
      spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
  3. 2
      spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuild.java

16
buildSrc/src/main/java/org/springframework/boot/build/RepositoryTransformersExtension.java

@ -43,8 +43,6 @@ public class RepositoryTransformersExtension { @@ -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 { @@ -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));
}

8
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle

@ -108,18 +108,12 @@ tasks.named("checkCompileClasspathForProhibitedDependencies") { @@ -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")

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuild.java

@ -160,7 +160,7 @@ class MavenBuild { @@ -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);

Loading…
Cancel
Save