Merge branch '3.3.x' into 3.4.x

Closes gh-44892

Author: wilkinsona

buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java

@@ -35,7 +35,9 @@
 import org.antora.gradle.AntoraTask;
 import org.gradle.StartParameter;
 import org.gradle.api.Project;
+import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.file.Directory;
+import org.gradle.api.file.FileCollection;
 import org.gradle.api.logging.LogLevel;
 import org.gradle.api.plugins.JavaBasePlugin;
 import org.gradle.api.provider.Provider;
@@ -46,7 +48,7 @@
 import org.springframework.boot.build.antora.AntoraAsciidocAttributes;
 import org.springframework.boot.build.antora.GenerateAntoraPlaybook;
 import org.springframework.boot.build.bom.BomExtension;
-import org.springframework.boot.build.constraints.ExtractVersionConstraints;
+import org.springframework.boot.build.bom.ResolvedBom;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -76,7 +78,10 @@ void apply(Project project) {
 	}
 
 	private void apply(Project project, AntoraPlugin antoraPlugin) {
-		TaskProvider<ExtractVersionConstraints> dependencyVersionsTask = addDependencyVersionsTask(project);
+		Configuration resolvedBom = project.getConfigurations().create("resolveBom");
+		project.getDependencies()
+			.add(resolvedBom.getName(), project.getDependencies()
+				.project(Map.of("path", DEPENDENCIES_PATH, "configuration", "resolvedBom")));
 		project.getPlugins().apply(GenerateAntoraYmlPlugin.class);
 		TaskContainer tasks = project.getTasks();
 		TaskProvider<GenerateAntoraPlaybook> generateAntoraPlaybookTask = tasks.register(
@@ -86,8 +91,8 @@ private void apply(Project project, AntoraPlugin antoraPlugin) {
 				(task) -> configureCopyAntoraPackageJsonTask(project, task));
 		TaskProvider<NpmInstallTask> npmInstallTask = tasks.register("antoraNpmInstall", NpmInstallTask.class,
 				(task) -> configureNpmInstallTask(project, task, copyAntoraPackageJsonTask));
-		tasks.withType(GenerateAntoraYmlTask.class, (generateAntoraYmlTask) -> configureGenerateAntoraYmlTask(project,
-				generateAntoraYmlTask, dependencyVersionsTask));
+		tasks.withType(GenerateAntoraYmlTask.class,
+				(generateAntoraYmlTask) -> configureGenerateAntoraYmlTask(project, generateAntoraYmlTask, resolvedBom));
 		tasks.withType(AntoraTask.class,
 				(antoraTask) -> configureAntoraTask(project, antoraTask, npmInstallTask, generateAntoraPlaybookTask));
 		project.getExtensions()
@@ -118,21 +123,15 @@ private void configureNpmInstallTask(Project project, NpmInstallTask npmInstallT
 		npmInstallTask.getNpmCommand().set(List.of("ci", "--silent", "--no-progress"));
 	}
 
-	private TaskProvider<ExtractVersionConstraints> addDependencyVersionsTask(Project project) {
-		return project.getTasks()
-			.register("dependencyVersions", ExtractVersionConstraints.class,
-					(task) -> task.enforcedPlatform(DEPENDENCIES_PATH));
-	}
-
 	private void configureGenerateAntoraYmlTask(Project project, GenerateAntoraYmlTask generateAntoraYmlTask,
-			TaskProvider<ExtractVersionConstraints> dependencyVersionsTask) {
+			Configuration resolvedBom) {
 		generateAntoraYmlTask.getOutputs().doNotCacheIf("getAsciidocAttributes() changes output", (task) -> true);
-		generateAntoraYmlTask.dependsOn(dependencyVersionsTask);
+		generateAntoraYmlTask.dependsOn(resolvedBom);
 		generateAntoraYmlTask.setProperty("componentName", "boot");
 		generateAntoraYmlTask.setProperty("outputFile",
 				project.getLayout().getBuildDirectory().file("generated/docs/antora-yml/antora.yml"));
 		generateAntoraYmlTask.setProperty("yml", getDefaultYml(project));
-		generateAntoraYmlTask.getAsciidocAttributes().putAll(getAsciidocAttributes(project, dependencyVersionsTask));
+		generateAntoraYmlTask.getAsciidocAttributes().putAll(getAsciidocAttributes(project, resolvedBom));
 	}
 
 	private Map<String, ?> getDefaultYml(Project project) {
@@ -151,11 +150,11 @@ private void configureGenerateAntoraYmlTask(Project project, GenerateAntoraYmlTa
 		return defaultYml;
 	}
 
-	private Provider<Map<String, String>> getAsciidocAttributes(Project project,
-			TaskProvider<ExtractVersionConstraints> dependencyVersionsTask) {
-		return dependencyVersionsTask.map((task) -> task.getVersionConstraints()).map((constraints) -> {
+	private Provider<Map<String, String>> getAsciidocAttributes(Project project, FileCollection resolvedBoms) {
+		return project.provider(() -> {
 			BomExtension bom = (BomExtension) project.project(DEPENDENCIES_PATH).getExtensions().getByName("bom");
-			return new AntoraAsciidocAttributes(project, bom, constraints).get();
+			ResolvedBom resolvedBom = ResolvedBom.readFrom(resolvedBoms.getSingleFile());
+			return new AntoraAsciidocAttributes(project, bom, resolvedBom).get();
 		});
 	}
 

buildSrc/src/main/java/org/springframework/boot/build/antora/AntoraAsciidocAttributes.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,9 @@
 import java.io.InputStream;
 import java.io.UncheckedIOException;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -32,6 +34,10 @@
 import org.springframework.boot.build.artifacts.ArtifactRelease;
 import org.springframework.boot.build.bom.BomExtension;
 import org.springframework.boot.build.bom.Library;
+import org.springframework.boot.build.bom.ResolvedBom;
+import org.springframework.boot.build.bom.ResolvedBom.Bom;
+import org.springframework.boot.build.bom.ResolvedBom.Id;
+import org.springframework.boot.build.bom.ResolvedBom.ResolvedLibrary;
 import org.springframework.boot.build.properties.BuildProperties;
 import org.springframework.boot.build.properties.BuildType;
 import org.springframework.util.Assert;
@@ -59,17 +65,48 @@ public class AntoraAsciidocAttributes {
 
 	private final Map<String, ?> projectProperties;
 
-	public AntoraAsciidocAttributes(Project project, BomExtension dependencyBom,
-			Map<String, String> dependencyVersions) {
+	public AntoraAsciidocAttributes(Project project, BomExtension dependencyBom, ResolvedBom resolvedBom) {
 		this.version = String.valueOf(project.getVersion());
 		this.latestVersion = Boolean.parseBoolean(String.valueOf(project.findProperty("latestVersion")));
 		this.buildType = BuildProperties.get(project).buildType();
 		this.artifactRelease = ArtifactRelease.forProject(project);
 		this.libraries = dependencyBom.getLibraries();
-		this.dependencyVersions = dependencyVersions;
+		this.dependencyVersions = dependencyVersionsOf(resolvedBom);
 		this.projectProperties = project.getProperties();
 	}
 
+	private static Map<String, String> dependencyVersionsOf(ResolvedBom resolvedBom) {
+		Map<String, String> dependencyVersions = new HashMap<>();
+		for (ResolvedLibrary library : resolvedBom.libraries()) {
+			dependencyVersions.putAll(dependencyVersionsOf(library.managedDependencies()));
+			for (Bom importedBom : library.importedBoms()) {
+				dependencyVersions.putAll(dependencyVersionsOf(importedBom));
+			}
+		}
+		return dependencyVersions;
+	}
+
+	private static Map<String, String> dependencyVersionsOf(Bom bom) {
+		Map<String, String> dependencyVersions = new HashMap<>();
+		if (bom != null) {
+			dependencyVersions.putAll(dependencyVersionsOf(bom.managedDependencies()));
+			dependencyVersions.putAll(dependencyVersionsOf(bom.parent()));
+			for (Bom importedBom : bom.importedBoms()) {
+				dependencyVersions.putAll(dependencyVersionsOf(importedBom));
+			}
+		}
+		return dependencyVersions;
+	}
+
+	private static Map<String, String> dependencyVersionsOf(Collection<Id> managedDependencies) {
+		Map<String, String> dependencyVersions = new HashMap<>();
+		for (Id managedDependency : managedDependencies) {
+			dependencyVersions.put(managedDependency.groupId() + ":" + managedDependency.artifactId(),
+					managedDependency.version());
+		}
+		return dependencyVersions;
+	}
+
 	AntoraAsciidocAttributes(String version, boolean latestVersion, BuildType buildType, List<Library> libraries,
 			Map<String, String> dependencyVersions, Map<String, ?> projectProperties) {
 		this.version = version;