Skip to content

Commit 63edd3d

Browse files
committed
Merge branch '3.2.x' into 3.3.x
Closes gh-43220
2 parents a3eb0dd + 0e1f2e8 commit 63edd3d

File tree

1 file changed

+9
-6
lines changed
  • buildSrc/src/main/java/org/springframework/boot/build/bom

1 file changed

+9
-6
lines changed

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

+9-6
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.gradle.api.DefaultTask;
3333
import org.gradle.api.GradleException;
3434
import org.gradle.api.artifacts.ConfigurationContainer;
35+
import org.gradle.api.artifacts.ResolvedArtifact;
3536
import org.gradle.api.artifacts.dsl.DependencyHandler;
3637
import org.gradle.api.tasks.TaskAction;
3738

@@ -46,6 +47,7 @@
4647
* Checks the validity of a bom.
4748
*
4849
* @author Andy Wilkinson
50+
* @author Wick Dynex
4951
*/
5052
public abstract class CheckBom extends DefaultTask {
5153

@@ -209,14 +211,15 @@ private void checkDependencyManagementAlignment(Library library, List<String> er
209211

210212
private File resolveBom(Library library, String alignsWithBom) {
211213
String coordinates = alignsWithBom + ":" + library.getVersion().getVersion() + "@pom";
212-
Set<File> files = this.configurations.detachedConfiguration(this.dependencies.create(coordinates))
214+
Set<ResolvedArtifact> artifacts = this.configurations
215+
.detachedConfiguration(this.dependencies.create(coordinates))
213216
.getResolvedConfiguration()
214-
.getFiles();
215-
if (files.size() != 1) {
216-
throw new IllegalStateException(
217-
"Expected a single file but '" + coordinates + "' resolved to " + files.size());
217+
.getResolvedArtifacts();
218+
if (artifacts.size() != 1) {
219+
throw new IllegalStateException("Expected a single file but '%s' resolved to %d artifacts"
220+
.formatted(coordinates, artifacts.size()));
218221
}
219-
return files.iterator().next();
222+
return artifacts.iterator().next().getFile();
220223
}
221224

222225
}

0 commit comments

Comments
 (0)