diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index a8683f63a31c..336d090dd536 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -127,4 +127,3 @@ eclipse.classpath.file.whenMerged { jreEntry.entryAttributes['module'] = 'true' jreEntry.entryAttributes['limit-modules'] = 'java.base' } - diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/CheckBom.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/CheckBom.java index 20e52fd3305d..2651c4f5f4f8 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/bom/CheckBom.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/bom/CheckBom.java @@ -32,6 +32,7 @@ import org.gradle.api.DefaultTask; import org.gradle.api.GradleException; import org.gradle.api.artifacts.ConfigurationContainer; +import org.gradle.api.artifacts.ResolvedArtifact; import org.gradle.api.artifacts.dsl.DependencyHandler; import org.gradle.api.tasks.TaskAction; @@ -46,6 +47,7 @@ * Checks the validity of a bom. * * @author Andy Wilkinson + * @author Wick Dynex */ public abstract class CheckBom extends DefaultTask { @@ -209,14 +211,17 @@ private void checkDependencyManagementAlignment(Library library, List er private File resolveBom(Library library, String alignsWithBom) { String coordinates = alignsWithBom + ":" + library.getVersion().getVersion() + "@pom"; - Set files = this.configurations.detachedConfiguration(this.dependencies.create(coordinates)) - .getResolvedConfiguration() - .getFiles(); - if (files.size() != 1) { + + Set artifacts = this.configurations + .detachedConfiguration(this.dependencies.create(coordinates)) + .getResolvedConfiguration() + .getResolvedArtifacts(); + + if (artifacts.size() != 1) { throw new IllegalStateException( - "Expected a single file but '" + coordinates + "' resolved to " + files.size()); + "Expected a single file but '" + coordinates + "' resolved to " + artifacts.size()); } - return files.iterator().next(); - } + return artifacts.iterator().next().getFile(); + } }