spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x' into 4.1.x

Browse Source 
Closes gh-51267
This commit is contained in:
Stéphane Nicoll
2026-08-04 15:52:30 +02:00
parent d2395ca569 4c8de39294
commit d70bcd5389
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-plugin/spring-boot-maven-plugin/build.gradle
+8 -2
View File
@@ -108,15 +108,21 @@ 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"])
output.dir(layout.buildDirectory.dir("generated-resources"), builtBy: ["extractVersionProperties", "copySettingsXml"])
}
dockerTest {
output.dir(layout.buildDirectory.dir("generated-resources"), builtBy: "extractVersionProperties")
output.dir(layout.buildDirectory.dir("generated-resources"), builtBy: ["extractVersionProperties", "copySettingsXml"])
}
}
build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuild.java
+7 -1
View File
@@ -69,6 +69,8 @@ class MavenBuild {
private final Properties properties = new Properties();
private String root = "intTest";
private @Nullable ProjectCallback preparation;
private @Nullable File projectDir;
@@ -102,6 +104,7 @@ class MavenBuild {
}
MavenBuild project(String root, String project) {
this.root = root;
this.projectDir = new File("src/" + root + "/projects/" + project);
return this;
}
@@ -163,7 +166,10 @@ class MavenBuild {
}
});
String settingsXml = Files.readString(Paths.get("src", "intTest", "projects", "settings.xml"))
Path settingsXmlPath = "dockerTest".equals(this.root)
? Paths.get("build", "generated-resources", "settings", "settings.xml")
: Paths.get("src", "intTest", "projects", "settings.xml");
String settingsXml = Files.readString(settingsXmlPath)
.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);