root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '3.4.x' 

Closes gh-44896
This commit is contained in:
Andy Wilkinson 2025-03-25 17:54:08 +00:00
parent 14060a2116 d78a208730
commit 0ea2775f23
3 changed files with 0 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
buildSrc/src/main/java/org/springframework/boot/build/bom/BomExtension.java
View File

@ -16,10 +16,6 @@
package org.springframework.boot.build.bom;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@ -29,37 +25,19 @@ import java.util.Map;
import java.util.function.Function;
import javax.inject.Inject;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
import groovy.lang.Closure;
import groovy.lang.GroovyObjectSupport;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
import org.gradle.api.Action;
import org.gradle.api.GradleException;
import org.gradle.api.InvalidUserCodeException;
import org.gradle.api.InvalidUserDataException;
import org.gradle.api.Project;
import org.gradle.api.Task;
import org.gradle.api.artifacts.Configuration;
import org.gradle.api.artifacts.dsl.DependencyHandler;
import org.gradle.api.model.ObjectFactory;
import org.gradle.api.plugins.JavaPlatformPlugin;
import org.gradle.api.publish.maven.tasks.GenerateMavenPom;
import org.gradle.api.tasks.Sync;
import org.gradle.api.tasks.TaskExecutionException;
import org.gradle.api.tasks.TaskProvider;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.springframework.boot.build.DeployedPlugin;
import org.springframework.boot.build.RepositoryTransformersExtension;
import org.springframework.boot.build.bom.Library.Exclusion;
import org.springframework.boot.build.bom.Library.Group;
import org.springframework.boot.build.bom.Library.LibraryVersion;
@ -68,9 +46,7 @@ import org.springframework.boot.build.bom.Library.Module;
import org.springframework.boot.build.bom.Library.ProhibitedVersion;
import org.springframework.boot.build.bom.Library.VersionAlignment;
import org.springframework.boot.build.bom.bomr.version.DependencyVersion;
import org.springframework.boot.build.mavenplugin.MavenExec;
import org.springframework.boot.build.properties.BuildProperties;
import org.springframework.util.FileCopyUtils;
import org.springframework.util.PropertyPlaceholderHelper;
import org.springframework.util.PropertyPlaceholderHelper.PlaceholderResolver;
@ -138,65 +114,6 @@ public class BomExtension {
libraryHandler.links));
}
public void effectiveBomArtifact() {
Configuration effectiveBomConfiguration = this.project.getConfigurations().create("effectiveBom");
RepositoryTransformersExtension repositoryTransformers = this.project.getExtensions()
.getByType(RepositoryTransformersExtension.class);
this.project.getTasks()
.matching((task) -> task.getName().equals(DeployedPlugin.GENERATE_POM_TASK_NAME))
.all((task) -> {
File generatedBomDir = this.project.getLayout()
.getBuildDirectory()
.dir("generated/bom")
.get()
.getAsFile();
TaskProvider<Sync> syncBom = this.project.getTasks().register("syncBom", Sync.class, (sync) -> {
sync.dependsOn(task);
sync.setDestinationDir(generatedBomDir);
sync.from(((GenerateMavenPom) task).getDestination(), (pom) -> pom.rename((name) -> "pom.xml"));
sync.from(this.project.getResources().getText().fromString(loadSettingsXml()), (settingsXml) -> {
settingsXml.rename((name) -> "settings.xml");
settingsXml.filter(repositoryTransformers.mavenSettings());
});
});
File effectiveBom = this.project.getLayout()
.getBuildDirectory()
.file("generated/effective-bom/" + this.project.getName() + "-effective-bom.xml")
.get()
.getAsFile();
TaskProvider<MavenExec> generateEffectiveBom = this.project.getTasks()
.register("generateEffectiveBom", MavenExec.class, (maven) -> {
maven.getProjectDir().set(generatedBomDir);
maven.args("--settings", "settings.xml", "help:effective-pom", "-Doutput=" + effectiveBom);
maven.dependsOn(syncBom);
maven.getOutputs().file(effectiveBom);
maven.doLast(new StripUnrepeatableOutputAction(effectiveBom));
});
this.project.getArtifacts()
.add(effectiveBomConfiguration.getName(), effectiveBom,
(artifact) -> artifact.builtBy(generateEffectiveBom));
});
}
private String loadSettingsXml() {
try {
return FileCopyUtils
.copyToString(new InputStreamReader(
getClass().getClassLoader().getResourceAsStream("effective-bom-settings.xml"),
StandardCharsets.UTF_8))
.replace("localRepositoryPath",
this.project.getLayout()
.getBuildDirectory()
.dir("local-m2-repository")
.get()
.getAsFile()
.getAbsolutePath());
}
catch (IOException ex) {
throw new GradleException("Failed to prepare settings.xml", ex);
}
}
private String createDependencyNotation(String groupId, String artifactId, DependencyVersion version) {
return groupId + ":" + artifactId + ":" + version;
}
@ -654,39 +571,4 @@ public class BomExtension {
}
private static final class StripUnrepeatableOutputAction implements Action<Task> {
private final File effectiveBom;
private StripUnrepeatableOutputAction(File xmlFile) {
this.effectiveBom = xmlFile;
}
@Override
public void execute(Task task) {
try {
Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(this.effectiveBom);
XPath xpath = XPathFactory.newInstance().newXPath();
NodeList comments = (NodeList) xpath.evaluate("//comment()", document, XPathConstants.NODESET);
for (int i = 0; i < comments.getLength(); i++) {
org.w3c.dom.Node comment = comments.item(i);
comment.getParentNode().removeChild(comment);
}
org.w3c.dom.Node build = (org.w3c.dom.Node) xpath.evaluate("/project/build", document,
XPathConstants.NODE);
build.getParentNode().removeChild(build);
org.w3c.dom.Node reporting = (org.w3c.dom.Node) xpath.evaluate("/project/reporting", document,
XPathConstants.NODE);
reporting.getParentNode().removeChild(reporting);
TransformerFactory.newInstance()
.newTransformer()
.transform(new DOMSource(document), new StreamResult(this.effectiveBom));
}
catch (Exception ex) {
throw new TaskExecutionException(task, ex);
}
}
}
}

14
buildSrc/src/main/resources/effective-bom-settings.xml
View File

@ -1,14 +0,0 @@
<settings>
<localRepository>localRepositoryPath</localRepository>
<profiles>
<profile>
<id>spring-repositories</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
<!-- {spring.mavenRepositories} -->
</repositories>
</profile>
</profiles>
</settings>

1
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -6,7 +6,6 @@ plugins {
description = "Spring Boot Dependencies"
bom {
effectiveBomArtifact()
upgrade {
policy = "any"
gitHub {