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.1.x'

Browse Source
This commit is contained in:
Stéphane Nicoll
2026-08-04 16:37:53 +02:00
parent c9efe39904 7b2cf7f27b
commit 5b2dbdbb8b
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuild.java
+1 -7
View File
@@ -69,8 +69,6 @@ class MavenBuild {
private final Properties properties = new Properties();
private String root = "intTest";
private @Nullable ProjectCallback preparation;
private @Nullable File projectDir;
@@ -104,7 +102,6 @@ class MavenBuild {
}
MavenBuild project(String root, String project) {
this.root = root;
this.projectDir = new File("src/" + root + "/projects/" + project);
return this;
}
@@ -166,10 +163,7 @@ class MavenBuild {
}
});
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)
String settingsXml = Files.readString(Paths.get("build", "generated-resources", "settings", "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);