Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.3.x'

Browse Source 
Closes gh-42689
This commit is contained in:
Stéphane Nicoll
2024-10-15 10:42:41 +02:00
parent 389deadf44 056e2b6029
commit a66d3d2f00
6 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
View File

@@ -50,7 +50,7 @@ public class ConventionsPlugin implements Plugin<Project> {
new KotlinConventions().apply(project);
new WarConventions().apply(project);
new EclipseConventions().apply(project);
RepoistoryTransformersExtension.apply(project);
RepositoryTransformersExtension.apply(project);
}
}

44
buildSrc/src/main/java/org/springframework/boot/build/RepoistoryTransformersExtension.java → buildSrc/src/main/java/org/springframework/boot/build/RepositoryTransformersExtension.java
View File

@@ -23,18 +23,20 @@ import org.gradle.api.Transformer;
import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
/**
* Extension to add {@code springRepoistoryTransformers} utility methods.
* Extension to add {@code springRepositoryTransformers} utility methods.
*
* @author Phillip Webb
*/
public class RepoistoryTransformersExtension {
public class RepositoryTransformersExtension {
private static final String MARKER = "{spring.mavenRepositories}";
private static final String MARKER_PLUGIN = "{spring.mavenPluginRepositories}";
private final Project project;
@Inject
public RepoistoryTransformersExtension(Project project) {
public RepositoryTransformersExtension(Project project) {
this.project = project;
}
@@ -65,24 +67,32 @@ public class RepoistoryTransformersExtension {
private String transformMavenSettings(String line) {
if (line.contains(MARKER)) {
StringBuilder result = new StringBuilder();
String indent = getIndent(line);
this.project.getRepositories().withType(MavenArtifactRepository.class, (repository) -> {
String name = repository.getName();
if (name.startsWith("spring-")) {
result.append(!result.isEmpty() ? "\n" : "");
result.append(mavenRepositoryXml(indent, repository));
}
});
return result.toString();
return transformMarker(line, false);
}
if (line.contains(MARKER_PLUGIN)) {
return transformMarker(line, true);
}
return line;
}
private String mavenRepositoryXml(String indent, MavenArtifactRepository repository) {
private String transformMarker(String line, boolean pluginRepository) {
StringBuilder result = new StringBuilder();
String indent = getIndent(line);
this.project.getRepositories().withType(MavenArtifactRepository.class, (repository) -> {
String name = repository.getName();
if (name.startsWith("spring-")) {
result.append(!result.isEmpty() ? "\n" : "");
result.append(mavenRepositoryXml(indent, repository, pluginRepository));
}
});
return result.toString();
}
private String mavenRepositoryXml(String indent, MavenArtifactRepository repository, boolean pluginRepository) {
String rootTag = pluginRepository ? "pluginRepository" : "repository";
boolean snapshots = repository.getName().endsWith("-snapshot");
StringBuilder xml = new StringBuilder();
xml.append("%s<repository>%n".formatted(indent));
xml.append("%s<%s>%n".formatted(indent, rootTag));
xml.append("%s\t<id>%s</id>%n".formatted(indent, repository.getName()));
xml.append("%s\t<url>%s</url>%n".formatted(indent, repository.getUrl()));
xml.append("%s\t<releases>%n".formatted(indent));
@@ -91,7 +101,7 @@ public class RepoistoryTransformersExtension {
xml.append("%s\t<snapshots>%n".formatted(indent));
xml.append("%s\t\t<enabled>%s</enabled>%n".formatted(indent, snapshots));
xml.append("%s\t</snapshots>%n".formatted(indent));
xml.append("%s</repository>".formatted(indent));
xml.append("%s</%s>".formatted(indent, rootTag));
return xml.toString();
}
@@ -100,7 +110,7 @@ public class RepoistoryTransformersExtension {
}
static void apply(Project project) {
project.getExtensions().create("springRepoistoryTransformers", RepoistoryTransformersExtension.class, project);
project.getExtensions().create("springRepositoryTransformers", RepositoryTransformersExtension.class, project);
}
}