Merge branch 'spring-projects:main' into fix_alias_x509_extended_key_manager

Author: ecnabogs

Diff for: .github/actions/create-github-release/action.yml

@@ -18,7 +18,7 @@ runs:
   using: composite
   steps:
     - name: Generate Changelog
-      uses: spring-io/github-changelog-generator@185319ad7eaa75b0e8e72e4b6db19c8b2cb8c4c1 #v0.0.11
+      uses: spring-io/github-changelog-generator@86958813a62af8fb223b3fd3b5152035504bcb83 #v0.0.12
       with:
         config-file: ${{ inputs.commercial && '.github/actions/create-github-release/changelog-generator-commercial.yml' || '.github/actions/create-github-release/changelog-generator-oss.yml' }}
         milestone: ${{ inputs.milestone }}

Diff for: .github/actions/prepare-gradle-build/action.yml

@@ -42,12 +42,12 @@ runs:
           ${{ inputs.java-toolchain == 'true' && '17' || '' }}
     - name: Set Up Gradle With Read/Write Cache
       if: ${{ inputs.cache-read-only == 'false' }}
-      uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
+      uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
       with:
         cache-read-only: false
         develocity-access-key: ${{ inputs.develocity-access-key }}
     - name: Set Up Gradle
-      uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
+      uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
       with:
         develocity-access-key: ${{ inputs.develocity-access-key }}
         develocity-token-expiry: 4

Diff for: .github/workflows/verify.yml

@@ -55,7 +55,7 @@ jobs:
         if: ${{ !vars.COMMERCIAL }}
         uses: Homebrew/actions/setup-homebrew@7657c9512f50e1c35b640971116425935bab3eea
       - name: Set Up Gradle
-        uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
+        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
         with:
           cache-read-only: false
       - name: Configure Gradle Properties

Diff for: .idea/scopes/java.xml

@@ -11,7 +11,7 @@
     "@springio/antora-xref-extension": "1.0.0-alpha.4",
     "@springio/antora-zip-contents-collector-extension": "1.0.0-alpha.8",
     "@asciidoctor/tabs": "1.0.0-beta.6",
-    "@springio/asciidoctor-extensions": "1.0.0-alpha.16",
+    "@springio/asciidoctor-extensions": "1.0.0-alpha.17",
     "patch-package": "^8.0.0"
   },
   "config": {

Diff for: antora/package-lock.json

@@ -39,7 +39,7 @@ dependencies {
 	implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}")
 	implementation("io.spring.nohttp:nohttp-gradle:0.0.11")
 	implementation("org.apache.httpcomponents.client5:httpclient5:5.3.1")
-	implementation("org.apache.maven:maven-embedder:${mavenVersion}")
+	implementation("org.apache.maven:maven-artifact:${mavenVersion}")
 	implementation("org.antora:gradle-antora-plugin:1.0.0")
 	implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
 	implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:${kotlinVersion}")

Diff for: antora/package.json

@@ -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();
 		});
 	}
 

Diff for: buildSrc/build.gradle

@@ -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.
@@ -16,8 +16,8 @@
 
 package org.springframework.boot.build;
 
-import org.apache.maven.artifact.repository.MavenArtifactRepository;
 import org.gradle.api.Project;
+import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 import org.gradle.api.attributes.Usage;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.JavaPluginExtension;

Diff for: buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.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;

Diff for: buildSrc/src/main/java/org/springframework/boot/build/MavenPublishingConventions.java

@@ -31,7 +31,6 @@
 import com.tngtech.archunit.lang.ArchRule;
 import com.tngtech.archunit.lang.EvaluationResult;
 import org.gradle.api.DefaultTask;
-import org.gradle.api.GradleException;
 import org.gradle.api.Task;
 import org.gradle.api.Transformer;
 import org.gradle.api.file.DirectoryProperty;
@@ -49,6 +48,7 @@
 import org.gradle.api.tasks.PathSensitivity;
 import org.gradle.api.tasks.SkipWhenEmpty;
 import org.gradle.api.tasks.TaskAction;
+import org.gradle.api.tasks.VerificationException;
 
 /**
  * {@link Task} that checks for architecture problems.
@@ -86,7 +86,7 @@ void checkArchitecture() throws IOException {
 		File outputFile = getOutputDirectory().file("failure-report.txt").get().getAsFile();
 		writeViolationReport(violations, outputFile);
 		if (!violations.isEmpty()) {
-			throw new GradleException("Architecture check failed. See '" + outputFile + "' for details.");
+			throw new VerificationException("Architecture check failed. See '" + outputFile + "' for details.");
 		}
 	}
 

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

@@ -34,6 +34,7 @@
 import com.tngtech.archunit.core.domain.JavaClass;
 import com.tngtech.archunit.core.domain.JavaClass.Predicates;
 import com.tngtech.archunit.core.domain.JavaMethod;
+import com.tngtech.archunit.core.domain.JavaModifier;
 import com.tngtech.archunit.core.domain.JavaParameter;
 import com.tngtech.archunit.core.domain.JavaType;
 import com.tngtech.archunit.core.domain.properties.CanBeAnnotated;
@@ -94,6 +95,7 @@ static List<ArchRule> standard() {
 		rules.add(enumSourceShouldNotSpecifyOnlyATypeThatIsTheSameAsMethodParameterType());
 		rules.add(classLevelConfigurationPropertiesShouldNotSpecifyOnlyPrefixAttribute());
 		rules.add(methodLevelConfigurationPropertiesShouldNotSpecifyOnlyPrefixAttribute());
+		rules.add(conditionsShouldNotBePublic());
 		return List.copyOf(rules);
 	}
 
@@ -290,6 +292,20 @@ private static void notSpecifyOnlyPrefixAttributeOfConfigurationProperties(HasAn
 		}
 	}
 
+	private static ArchRule conditionsShouldNotBePublic() {
+		String springBootCondition = "org.springframework.boot.autoconfigure.condition.SpringBootCondition";
+		return ArchRuleDefinition.noClasses()
+			.that()
+			.areAssignableTo(springBootCondition)
+			.and()
+			.doNotHaveModifier(JavaModifier.ABSTRACT)
+			.and()
+			.areNotAnnotatedWith(Deprecated.class)
+			.should()
+			.bePublic()
+			.allowEmptyShould(true);
+	}
+
 	private static boolean containsOnlySingleType(JavaType[] types, JavaType type) {
 		return types.length == 1 && type.equals(types[0]);
 	}