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

Merge branch '3.2.x' into 3.3.x 

Closes gh-43220
This commit is contained in:
Moritz Halbritter 2024-11-19 11:17:41 +01:00
parent a3eb0dd688 0e1f2e8599
commit 63edd3d65f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
buildSrc/src/main/java/org/springframework/boot/build/bom/CheckBom.java
View File

@ -32,6 +32,7 @@ import org.apache.maven.artifact.versioning.VersionRange;
import org.gradle.api.DefaultTask; import org.gradle.api.DefaultTask;
import org.gradle.api.GradleException; import org.gradle.api.GradleException;
import org.gradle.api.artifacts.ConfigurationContainer; import org.gradle.api.artifacts.ConfigurationContainer;
import org.gradle.api.artifacts.ResolvedArtifact;
import org.gradle.api.artifacts.dsl.DependencyHandler; import org.gradle.api.artifacts.dsl.DependencyHandler;
import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.TaskAction;
@ -46,6 +47,7 @@ import org.springframework.boot.build.bom.bomr.version.DependencyVersion;
* Checks the validity of a bom. * Checks the validity of a bom.
* *
* @author Andy Wilkinson * @author Andy Wilkinson
* @author Wick Dynex
*/ */
public abstract class CheckBom extends DefaultTask { public abstract class CheckBom extends DefaultTask {
@ -209,14 +211,15 @@ public abstract class CheckBom extends DefaultTask {
private File resolveBom(Library library, String alignsWithBom) { private File resolveBom(Library library, String alignsWithBom) {
String coordinates = alignsWithBom + ":" + library.getVersion().getVersion() + "@pom"; String coordinates = alignsWithBom + ":" + library.getVersion().getVersion() + "@pom";
Set<File> files = this.configurations.detachedConfiguration(this.dependencies.create(coordinates)) Set<ResolvedArtifact> artifacts = this.configurations
.detachedConfiguration(this.dependencies.create(coordinates))
.getResolvedConfiguration() .getResolvedConfiguration()
.getFiles(); .getResolvedArtifacts();
if (files.size() != 1) { if (artifacts.size() != 1) {
throw new IllegalStateException( throw new IllegalStateException("Expected a single file but '%s' resolved to %d artifacts"
"Expected a single file but '" + coordinates + "' resolved to " + files.size()); .formatted(coordinates, artifacts.size()));
} }
return files.iterator().next(); return artifacts.iterator().next().getFile();
} }
} }