Merge branch '3.3.x'

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

@@ -175,10 +175,21 @@ public class AntoraAsciidocAttributes {
 	private void addUrlLibraryLinkAttributes(Map<String, String> attributes) {
 		this.libraries.forEach((library) -> {
 			String prefix = "url-" + library.getLinkRootName() + "-";
-			library.getLinks().forEach((name, link) -> attributes.put(prefix + name, link));
+			library.getLinks().forEach((name, link) -> {
+				String linkName = prefix + name;
+				attributes.put(linkName, link.url(library));
+				link.packages()
+					.stream()
+					.map(this::packageAttributeName)
+					.forEach((packageAttributeName) -> attributes.put(packageAttributeName, "{" + linkName + "}"));
+			});
 		});
 	}
 
+	private String packageAttributeName(String packageName) {
+		return "javadoc-location-" + packageName.replace('.', '-');
+	}
+
 	private void addPropertyAttributes(Map<String, String> attributes) {
 		Properties properties = new Properties() {
 

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

@@ -61,6 +61,7 @@ import org.springframework.boot.build.DeployedPlugin;
 import org.springframework.boot.build.bom.Library.Exclusion;
 import org.springframework.boot.build.bom.Library.Group;
 import org.springframework.boot.build.bom.Library.LibraryVersion;
+import org.springframework.boot.build.bom.Library.Link;
 import org.springframework.boot.build.bom.Library.Module;
 import org.springframework.boot.build.bom.Library.ProhibitedVersion;
 import org.springframework.boot.build.bom.Library.VersionAlignment;
@@ -255,7 +256,7 @@ public class BomExtension {
 
 		private String linkRootName;
 
-		private final Map<String, Function<LibraryVersion, String>> links = new HashMap<>();
+		private final Map<String, Link> links = new HashMap<>();
 
 		@Inject
 		public LibraryHandler(Project project, String version) {
@@ -457,7 +458,7 @@ public class BomExtension {
 
 	public static class LinksHandler {
 
-		private final Map<String, Function<LibraryVersion, String>> links = new HashMap<>();
+		private final Map<String, Link> links = new HashMap<>();
 
 		public void site(String linkTemplate) {
 			site(asFactory(linkTemplate));
@@ -487,10 +488,18 @@ public class BomExtension {
 			javadoc(asFactory(linkTemplate));
 		}
 
+		public void javadoc(String linkTemplate, String... packages) {
+			javadoc(asFactory(linkTemplate), packages);
+		}
+
 		public void javadoc(Function<LibraryVersion, String> linkFactory) {
 			add("javadoc", linkFactory);
 		}
 
+		public void javadoc(Function<LibraryVersion, String> linkFactory, String... packages) {
+			add("javadoc", linkFactory, packages);
+		}
+
 		public void releaseNotes(String linkTemplate) {
 			releaseNotes(asFactory(linkTemplate));
 		}
@@ -504,7 +513,11 @@ public class BomExtension {
 		}
 
 		public void add(String name, Function<LibraryVersion, String> linkFactory) {
-			this.links.put(name, linkFactory);
+			add(name, linkFactory, null);
+		}
+
+		public void add(String name, Function<LibraryVersion, String> linkFactory, String[] packages) {
+			this.links.put(name, new Link(linkFactory, (packages != null) ? List.of(packages) : null));
 		}
 
 		private Function<LibraryVersion, String> asFactory(String linkTemplate) {

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

@@ -62,7 +62,7 @@ public abstract class CheckLinks extends DefaultTask {
 			library.getLinks().forEach((name, link) -> {
 				URI uri;
 				try {
-					uri = new URI(link);
+					uri = new URI(link.url(library));
 					ResponseEntity<String> response = restTemplate.exchange(uri, HttpMethod.HEAD, null, String.class);
 					System.out.printf("[%3d] %s - %s (%s)%n", response.getStatusCode().value(), library.getName(), name,
 							uri);

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

@@ -27,6 +27,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.artifact.versioning.VersionRange;
@@ -65,7 +68,7 @@ public class Library {
 
 	private final String linkRootName;
 
-	private final Map<String, Function<LibraryVersion, String>> links;
+	private final Map<String, Link> links;
 
 	/**
 	 * Create a new {@code Library} with the given {@code name}, {@code version}, and
@@ -86,7 +89,7 @@ public class Library {
 	 */
 	public Library(String name, String calendarName, LibraryVersion version, List<Group> groups,
 			List<ProhibitedVersion> prohibitedVersions, boolean considerSnapshots, VersionAlignment versionAlignment,
-			String alignsWithBom, String linkRootName, Map<String, Function<LibraryVersion, String>> links) {
+			String alignsWithBom, String linkRootName, Map<String, Link> links) {
 		this.name = name;
 		this.calendarName = (calendarName != null) ? calendarName : name;
 		this.version = version;
@@ -98,7 +101,7 @@ public class Library {
 		this.versionAlignment = versionAlignment;
 		this.alignsWithBom = alignsWithBom;
 		this.linkRootName = (linkRootName != null) ? linkRootName : generateLinkRootName(name);
-		this.links = Collections.unmodifiableMap(links);
+		this.links = Collections.unmodifiableMap(new TreeMap<>(links));
 	}
 
 	private static String generateLinkRootName(String name) {
@@ -145,14 +148,17 @@ public class Library {
 		return this.alignsWithBom;
 	}
 
-	public Map<String, String> getLinks() {
-		return getLinks(this.version);
+	public Map<String, Link> getLinks() {
+		return this.links;
 	}
 
-	public Map<String, String> getLinks(LibraryVersion version) {
-		Map<String, String> links = new TreeMap<>();
-		this.links.forEach((name, linkFactory) -> links.put(name, linkFactory.apply(version)));
-		return Collections.unmodifiableMap(links);
+	public String getLinkUrl(String name) {
+		Link link = getLink(name);
+		return (link != null) ? link.url(this) : null;
+	}
+
+	public Link getLink(String name) {
+		return this.links.get(name);
 	}
 
 	/**
@@ -518,4 +524,36 @@ public class Library {
 
 	}
 
+	public static record Link(Function<LibraryVersion, String> factory, List<String> packages) {
+
+		private static final Pattern PACKAGE_EXPAND = Pattern.compile("^(.*)\\[(.*)\\]$");
+
+		public Link {
+			packages = (packages != null) ? List.copyOf(expandPackages(packages)) : Collections.emptyList();
+		}
+
+		private static List<String> expandPackages(List<String> packages) {
+			return packages.stream().flatMap(Link::expandPackage).toList();
+		}
+
+		private static Stream<String> expandPackage(String packageName) {
+			Matcher matcher = PACKAGE_EXPAND.matcher(packageName);
+			if (!matcher.matches()) {
+				return Stream.of(packageName);
+			}
+			String root = matcher.group(1);
+			String[] suffixes = matcher.group(2).split("\\|");
+			return Stream.of(suffixes).map((suffix) -> root + suffix);
+		}
+
+		public String url(Library library) {
+			return url(library.getVersion());
+		}
+
+		public String url(LibraryVersion libraryVersion) {
+			return factory().apply(libraryVersion);
+		}
+
+	}
+
 }

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MoveToSnapshots.java

@@ -80,11 +80,12 @@ public abstract class MoveToSnapshots extends UpgradeDependencies {
 
 	@Override
 	protected String issueBody(Upgrade upgrade, Issue existingUpgrade) {
-		String releaseNotes = upgrade.getLibrary().getLinks().get("releaseNotes");
+		Library library = upgrade.getLibrary();
+		String releaseNotesLink = library.getLinkUrl("releaseNotes");
 		List<String> lines = new ArrayList<>();
 		String description = description(upgrade);
-		if (releaseNotes != null) {
-			lines.add("Upgrade to [%s](%s).".formatted(description, releaseNotes));
+		if (releaseNotesLink != null) {
+			lines.add("Upgrade to [%s](%s).".formatted(description, releaseNotesLink));
 		}
 		lines.add("Upgrade to %s.".formatted(description));
 		if (existingUpgrade != null) {

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeBom.java

@@ -28,6 +28,7 @@ import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 
 import org.springframework.boot.build.bom.BomExtension;
 import org.springframework.boot.build.bom.Library.LibraryVersion;
+import org.springframework.boot.build.bom.Library.Link;
 import org.springframework.boot.build.bom.bomr.github.Issue;
 import org.springframework.boot.build.properties.BuildProperties;
 
@@ -75,13 +76,12 @@ public abstract class UpgradeBom extends UpgradeDependencies {
 
 	@Override
 	protected String issueBody(Upgrade upgrade, Issue existingUpgrade) {
-		String releaseNotes = upgrade.getLibrary()
-			.getLinks(new LibraryVersion(upgrade.getVersion()))
-			.get("releaseNotes");
+		LibraryVersion upgradeVersion = new LibraryVersion(upgrade.getVersion());
+		String releaseNotesLink = getReleaseNotesLink(upgrade, upgradeVersion);
 		List<String> lines = new ArrayList<>();
-		String description = upgrade.getLibrary().getName() + " " + upgrade.getVersion();
-		if (releaseNotes != null) {
-			lines.add("Upgrade to [%s](%s).".formatted(description, releaseNotes));
+		String description = upgrade.getLibrary().getName() + " " + upgradeVersion;
+		if (releaseNotesLink != null) {
+			lines.add("Upgrade to [%s](%s).".formatted(description, releaseNotesLink));
 		}
 		else {
 			lines.add("Upgrade to %s.".formatted(description));
@@ -92,4 +92,9 @@ public abstract class UpgradeBom extends UpgradeDependencies {
 		return String.join("\\r\\n\\r\\n", lines);
 	}
 
+	private String getReleaseNotesLink(Upgrade upgrade, LibraryVersion upgradeVersion) {
+		Link releaseNotesLink = upgrade.getLibrary().getLink("releaseNotes");
+		return releaseNotesLink.url(upgradeVersion);
+	}
+
 }

buildSrc/src/test/java/org/springframework/boot/build/antora/AntoraAsciidocAttributesTests.java

@@ -21,13 +21,13 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
 
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.build.bom.Library;
 import org.springframework.boot.build.bom.Library.Group;
 import org.springframework.boot.build.bom.Library.LibraryVersion;
+import org.springframework.boot.build.bom.Library.Link;
 import org.springframework.boot.build.bom.Library.ProhibitedVersion;
 import org.springframework.boot.build.bom.Library.VersionAlignment;
 import org.springframework.boot.build.bom.bomr.version.DependencyVersion;
@@ -187,14 +187,20 @@ class AntoraAsciidocAttributesTests {
 
 	@Test
 	void urlLinksFromLibrary() {
-		Map<String, Function<LibraryVersion, String>> links = new LinkedHashMap<>();
-		links.put("site", (version) -> "https://example.com/site/" + version);
-		links.put("docs", (version) -> "https://example.com/docs/" + version);
+		Map<String, Link> links = new LinkedHashMap<>();
+		links.put("site", new Link((version) -> "https://example.com/site/" + version, null));
+		links.put("docs", new Link((version) -> "https://example.com/docs/" + version, null));
+		links.put("javadoc", new Link((version) -> "https://example.com/api/" + version,
+				List.of("org.springframework.[core|util]")));
 		Library library = mockLibrary(links);
 		AntoraAsciidocAttributes attributes = new AntoraAsciidocAttributes("1.2.3.1-SNAPSHOT", false,
 				BuildType.OPEN_SOURCE, List.of(library), mockDependencyVersions(), null);
 		assertThat(attributes.get()).containsEntry("url-spring-framework-site", "https://example.com/site/1.2.3")
-			.containsEntry("url-spring-framework-docs", "https://example.com/docs/1.2.3");
+			.containsEntry("url-spring-framework-docs", "https://example.com/docs/1.2.3")
+			.containsEntry("url-spring-framework-javadoc", "https://example.com/api/1.2.3");
+		assertThat(attributes.get())
+			.containsEntry("javadoc-location-org-springframework-core", "{url-spring-framework-javadoc}")
+			.containsEntry("javadoc-location-org-springframework-util", "{url-spring-framework-javadoc}");
 	}
 
 	@Test
@@ -209,7 +215,7 @@ class AntoraAsciidocAttributesTests {
 		assertThat(keys.indexOf("include-java")).isLessThan(keys.indexOf("code-spring-boot-latest"));
 	}
 
-	private Library mockLibrary(Map<String, Function<LibraryVersion, String>> links) {
+	private Library mockLibrary(Map<String, Link> links) {
 		String name = "Spring Framework";
 		String calendarName = null;
 		LibraryVersion version = new LibraryVersion(DependencyVersion.parse("1.2.3"));

buildSrc/src/test/java/org/springframework/boot/build/bom/LibraryTests.java

@@ -19,12 +19,12 @@ package org.springframework.boot.build.bom;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
 
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.build.bom.Library.Group;
 import org.springframework.boot.build.bom.Library.LibraryVersion;
+import org.springframework.boot.build.bom.Library.Link;
 import org.springframework.boot.build.bom.Library.ProhibitedVersion;
 import org.springframework.boot.build.bom.Library.VersionAlignment;
 import org.springframework.boot.build.bom.bomr.version.DependencyVersion;
@@ -49,7 +49,7 @@ class LibraryTests {
 		VersionAlignment versionAlignment = null;
 		String alignsWithBom = null;
 		String linkRootName = null;
-		Map<String, Function<LibraryVersion, String>> links = Collections.emptyMap();
+		Map<String, Link> links = Collections.emptyMap();
 		Library library = new Library(name, calendarName, version, groups, prohibitedVersion, considerSnapshots,
 				versionAlignment, alignsWithBom, linkRootName, links);
 		assertThat(library.getLinkRootName()).isEqualTo("spring-framework");
@@ -66,7 +66,7 @@ class LibraryTests {
 		VersionAlignment versionAlignment = null;
 		String alignsWithBom = null;
 		String linkRootName = "spring-data";
-		Map<String, Function<LibraryVersion, String>> links = Collections.emptyMap();
+		Map<String, Link> links = Collections.emptyMap();
 		Library library = new Library(name, calendarName, version, groups, prohibitedVersion, considerSnapshots,
 				versionAlignment, alignsWithBom, linkRootName, links);
 		assertThat(library.getLinkRootName()).isEqualTo("spring-data");

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -30,8 +30,8 @@ bom {
 		links {
 			site("https://activemq.apache.org")
 			docs("https://activemq.apache.org/components/classic/documentation")
-			releaseNotes { version -> "https://activemq.apache.org/components/classic/download/classic-%02d-%02d-%02d"
-				.formatted(version.componentInts()) }
+			releaseNotes(version -> "https://activemq.apache.org/components/classic/download/classic-%02d-%02d-%02d"
+				.formatted(version.componentInts()))
 		}
 	}
 	library("Angus Mail", "2.0.3") {
@@ -74,8 +74,8 @@ bom {
 		}
 		links {
 			site("https://eclipse.dev/aspectj")
-			releaseNotes { version -> "https://github.com/eclipse-aspectj/aspectj/blob/master/docs/release/README-%s.%s.%s.adoc"
-				.formatted(version.major(), version.minor(), version.patch()) }
+			releaseNotes(version -> "https://github.com/eclipse-aspectj/aspectj/blob/master/docs/release/README-%s.%s.%s.adoc"
+				.formatted(version.major(), version.minor(), version.patch()))
 		}
 	}
 	library("AssertJ", "${assertjVersion}") {
@@ -99,8 +99,8 @@ bom {
 			]
 		}
 		links {
-			releaseNotes { version -> "https://github.com/awaitility/awaitility/wiki/ReleaseNotes%s.%s"
-				.formatted(version.major(), version.minor()) }
+			releaseNotes(version -> "https://github.com/awaitility/awaitility/wiki/ReleaseNotes%s.%s"
+				.formatted(version.major(), version.minor()))
 		}
 	}
 	library("Zipkin Reporter", "3.4.2") {
@@ -384,7 +384,7 @@ bom {
 		}
 		links {
 			site("https://documentation.red-gate.com/flyway")
-			javadoc("https://javadoc.io/doc/org.flywaydb/flyway-core/{version}")
+			javadoc("https://javadoc.io/doc/org.flywaydb/flyway-core/{version}", "org.flywaydb")
 			releaseNotes("https://documentation.red-gate.com/flyway/release-notes-and-older-versions/release-notes-for-flyway-engine")
 		}
 	}
@@ -396,8 +396,8 @@ bom {
 		}
 		links {
 			site("https://freemarker.apache.org")
-			releaseNotes { version -> "https://freemarker.apache.org/docs/versions_%s.html"
-				.formatted(version.toString("_")) }
+			releaseNotes(version -> "https://freemarker.apache.org/docs/versions_%s.html"
+				.formatted(version.toString("_")))
 		}
 	}
 	library("Git Commit ID Maven Plugin", "9.0.1") {
@@ -445,7 +445,7 @@ bom {
 		}
 		links {
 			site("https://www.graphql-java.com/")
-			javadoc("https://javadoc.io/doc/com.graphql-java/graphql-java/{version}")
+			javadoc("https://javadoc.io/doc/com.graphql-java/graphql-java/{version}", "graphql")
 			releaseNotes("https://github.com/graphql-java/graphql-java/releases/tag/v{version}")
 		}
 	}
@@ -467,7 +467,7 @@ bom {
 		}
 		links {
 			site("https://github.com/google/gson")
-			javadoc("https://javadoc.io/doc/com.google.code.gson/gson/{version}")
+			javadoc("https://javadoc.io/doc/com.google.code.gson/gson/{version}", "com.google.gson")
 			releaseNotes("https://github.com/google/gson/releases/tag/gson-parent-{version}")
 		}
 	}
@@ -503,7 +503,7 @@ bom {
 		}
 		links {
 			site("https://hazelcast.com")
-			javadoc("https://javadoc.io/doc/com.hazelcast/hazelcast/{version}")
+			javadoc("https://javadoc.io/doc/com.hazelcast/hazelcast/{version}", "com.hazelcast")
 			releaseNotes("https://github.com/hazelcast/hazelcast/releases/tag/v{version}")
 		}
 	}
@@ -529,14 +529,14 @@ bom {
 		}
 		links {
 			site("https://hibernate.org/orm")
-			javadoc { version -> "https://docs.jboss.org/hibernate/orm/%s.%s/javadocs"
-				.formatted(version.major(), version.minor()) }
-			docs { version -> "https://hibernate.org/orm/documentation/%s.%s"
-				.formatted(version.major(), version.minor()) }
-			releaseNotes { version -> "https://github.com/hibernate/hibernate-orm/releases/tag/%s"
-				.formatted(version.toString().replace(".Final", "")) }
-			add("userguide") { version -> "https://docs.jboss.org/hibernate/orm/%s.%s/userguide/html_single/Hibernate_User_Guide.html"
-				.formatted(version.major(), version.minor()) }
+			javadoc(version -> "https://docs.jboss.org/hibernate/orm/%s.%s/javadocs"
+				.formatted(version.major(), version.minor()))
+			docs(version -> "https://hibernate.org/orm/documentation/%s.%s"
+				.formatted(version.major(), version.minor()))
+			releaseNotes(version -> "https://github.com/hibernate/hibernate-orm/releases/tag/%s"
+				.formatted(version.toString().replace(".Final", "")))
+			add("userguide", version -> "https://docs.jboss.org/hibernate/orm/%s.%s/userguide/html_single/Hibernate_User_Guide.html"
+				.formatted(version.major(), version.minor()))
 		}
 	}
 	library("Hibernate Validator", "8.0.1.Final") {
@@ -649,8 +649,8 @@ bom {
 		}
 		links {
 			site("https://github.com/jakartaee/jaf-api")
-			javadoc { version -> "https://jakarta.ee/specifications/activation/%s.%s/apidocs"
-				.formatted(version.major(), version.minor()) }
+			javadoc(version -> "https://jakarta.ee/specifications/activation/%s.%s/apidocs"
+				.formatted(version.major(), version.minor()), "jakarta.activation")
 			releaseNotes("https://github.com/jakartaee/jaf-api/releases/tag/{version}")
 		}
 	}
@@ -661,8 +661,8 @@ bom {
 			]
 		}
 		links {
-			javadoc { version -> "https://jakarta.ee/specifications/annotations/%s.%s/apidocs"
-				.formatted(version.major(), version.minor()) }
+			javadoc(version -> "https://jakarta.ee/specifications/annotations/%s.%s/apidocs"
+				.formatted(version.major(), version.minor()), "jakarta.annotation")
 		}
 	}
 	library("Jakarta Inject", "2.0.1") {
@@ -672,8 +672,8 @@ bom {
 			]
 		}
 		links {
-			javadoc { version -> "https://jakarta.ee/specifications/dependency-injection/%s.%s/apidocs"
-				.formatted(version.major(), version.minor()) }
+			javadoc(version -> "https://jakarta.ee/specifications/dependency-injection/%s.%s/apidocs"
+				.formatted(version.major(), version.minor()), "jakarta.inject")
 		}
 	}
 	library("Jakarta JMS", "3.1.0") {
@@ -683,10 +683,10 @@ bom {
 			]
 		}
 		links {
-			site { version -> "https://jakarta.ee/specifications/messaging/%s.%s"
-				.formatted(version.major(), version.minor()) }
-			javadoc { version -> "https://jakarta.ee/specifications/messaging/%s.%s/apidocs"
-				.formatted(version.major(), version.minor()) }
+			site(version -> "https://jakarta.ee/specifications/messaging/%s.%s"
+				.formatted(version.major(), version.minor()))
+			javadoc(version -> "https://jakarta.ee/specifications/messaging/%s.%s/apidocs"
+				.formatted(version.major(), version.minor()), "jakarta.jms")
 		}
 	}
 	library("Jakarta Json", "2.1.3") {
@@ -696,8 +696,8 @@ bom {
 			]
 		}
 		links {
-			javadoc { version -> "https://jakarta.ee/specifications/jsonp/%s.%s/apidocs"
-				.formatted(version.major(), version.minor()) }
+			javadoc(version -> "https://jakarta.ee/specifications/jsonp/%s.%s/apidocs"
+				.formatted(version.major(), version.minor()), "jakarta.json")
 			releaseNotes("https://github.com/jakartaee/jsonp-api/releases/tag/{version}-RELEASE")
 		}
 	}
@@ -708,8 +708,8 @@ bom {
 			]
 		}
 		links {
-			javadoc { version -> "https://jakarta.ee/specifications/jsonb/%s.%s/apidocs"
-				.formatted(version.major(), version.minor()) }
+			javadoc(version -> "https://jakarta.ee/specifications/jsonb/%s.%s/apidocs"
+				.formatted(version.major(), version.minor()), "jakarta.json.bind")
 		}
 	}
 	library("Jakarta Mail", "2.1.3") {
@@ -719,10 +719,10 @@ bom {
 			]
 		}
 		links {
-			site { version -> "https://jakarta.ee/specifications/mail/%s.%s"
-				.formatted(version.major(), version.minor()) }
-			javadoc { version -> "https://jakarta.ee/specifications/mail/%s.%s/apidocs"
-				.formatted(version.major(), version.minor()) }
+			site(version -> "https://jakarta.ee/specifications/mail/%s.%s"
+				.formatted(version.major(), version.minor()))
+			javadoc(version -> "https://jakarta.ee/specifications/mail/%s.%s/apidocs"
+				.formatted(version.major(), version.minor()), "jakarta.mail")
 			releaseNotes("https://github.com/jakartaee/mail-api/releases/tag/{version}")
 		}
 	}
@@ -744,12 +744,12 @@ bom {
 			]
 		}
 		links {
-			site { version -> "https://jakarta.ee/specifications/persistence/%s.%s"
-				.formatted(version.major(), version.minor()) }
-			javadoc { version -> "https://jakarta.ee/specifications/persistence/%s.%s/apidocs"
-				.formatted(version.major(), version.minor()) }
-			releaseNotes { version -> "https://github.com/jakartaee/persistence/releases/tag/%s.%s-%s-RELEASE"
-				.formatted(version.major(), version.minor(), version) }
+			site(version -> "https://jakarta.ee/specifications/persistence/%s.%s"
+				.formatted(version.major(), version.minor()))
+			javadoc(version -> "https://jakarta.ee/specifications/persistence/%s.%s/apidocs"
+				.formatted(version.major(), version.minor()), "jakarta.persistence")
+			releaseNotes(version -> "https://github.com/jakartaee/persistence/releases/tag/%s.%s-%s-RELEASE"
+				.formatted(version.major(), version.minor(), version))
 		}
 	}
 	library("Jakarta Servlet", "6.0.0") {
@@ -763,10 +763,10 @@ bom {
 			]
 		}
 		links {
-			site { version -> "https://jakarta.ee/specifications/servlet/%s.%s"
-				.formatted(version.major(), version.minor()) }
-			javadoc { version -> "https://jakarta.ee/specifications/servlet/%s.%s/apidocs"
-				.formatted(version.major(), version.minor()) }
+			site(version -> "https://jakarta.ee/specifications/servlet/%s.%s"
+				.formatted(version.major(), version.minor()))
+			javadoc(version -> "https://jakarta.ee/specifications/servlet/%s.%s/apidocs"
+				.formatted(version.major(), version.minor()), "jakarta.servlet")
 		}
 	}
 	library("Jakarta Servlet JSP JSTL", "3.0.2") {
@@ -786,8 +786,8 @@ bom {
 			]
 		}
 		links {
-			javadoc { version -> "https://jakarta.ee/specifications/transactions/%s.%s/apidocs"
-				.formatted(version.major(), version.minor()) }
+			javadoc(version -> "https://jakarta.ee/specifications/transactions/%s.%s/apidocs"
+				.formatted(version.major(), version.minor()), "jakarta.transaction")
 		}
 	}
 	library("Jakarta Validation", "3.0.2") {
@@ -801,8 +801,8 @@ bom {
 			]
 		}
 		links {
-			javadoc { version -> "https://jakarta.ee/specifications/bean-validation/%s.%s/apidocs"
-				.formatted(version.major(), version.minor()) }
+			javadoc(version -> "https://jakarta.ee/specifications/bean-validation/%s.%s/apidocs"
+				.formatted(version.major(), version.minor()), "jakarta.validation")
 			releaseNotes("https://github.com/jakartaee/validation/releases/tag/{version}")
 		}
 	}
@@ -899,8 +899,8 @@ bom {
 			]
 		}
 		links {
-			releaseNotes { version -> "https://github.com/FirebirdSQL/jaybird/releases/tag/v%s"
-				.formatted(version.toString().replace(".java11", "")) }
+			releaseNotes(version -> "https://github.com/FirebirdSQL/jaybird/releases/tag/v%s"
+				.formatted(version.toString().replace(".java11", "")))
 		}
 	}
 	library("JBoss Logging", "3.6.1.Final") {
@@ -1052,7 +1052,7 @@ bom {
 		}
 		links {
 			site("https://junit.org/junit5")
-			javadoc("https://junit.org/junit5/docs/{version}/api")
+			javadoc("https://junit.org/junit5/docs/{version}/api", "org.junit.jupiter.api", "org.junit.platform")
 			docs("https://junit.org/junit5/docs/{version}/user-guide")
 			releaseNotes("https://junit.org/junit5/docs/{version}/release-notes")
 		}
@@ -1185,7 +1185,7 @@ bom {
 		}
 		links {
 			site("https://logging.apache.org/log4j")
-			docs { version -> "https://logging.apache.org/log4j/%s.x/manual".formatted(version.major()) }
+			docs(version -> "https://logging.apache.org/log4j/%s.x/manual".formatted(version.major()))
 			releaseNotes("https://github.com/apache/logging-log4j2/releases/tag/rel%2F{version}")
 		}
 	}
@@ -1218,8 +1218,8 @@ bom {
 		}
 		links {
 			site("https://mariadb.com/kb/en/mariadb-connector-j/")
-			releaseNotes { version -> "https://mariadb.com/kb/en/mariadb-connector-j-%s-release-notes/"
-				.formatted(version.toString("-")) }
+			releaseNotes(version -> "https://mariadb.com/kb/en/mariadb-connector-j-%s-release-notes/"
+				.formatted(version.toString("-")))
 		}
 	}
 	library("Maven AntRun Plugin", "3.1.0") {
@@ -1410,9 +1410,9 @@ bom {
 		}
 		links {
 			site("https://micrometer.io")
-			javadoc("https://javadoc.io/doc/io.micrometer/micrometer-core/{version}")
-			docs { version -> "https://docs.micrometer.io/micrometer/reference/%s.%s"
-				.formatted(version.major(), version.minor()) }
+			javadoc("https://javadoc.io/doc/io.micrometer/micrometer-core/{version}", "io.micrometer.core")
+			docs(version -> "https://docs.micrometer.io/micrometer/reference/%s.%s"
+				.formatted(version.major(), version.minor()))
 			releaseNotes("https://github.com/micrometer-metrics/micrometer/releases/tag/v{version}")
 		}
 	}
@@ -1425,9 +1425,9 @@ bom {
 		}
 		links {
 			site("https://micrometer.io")
-			javadoc("https://javadoc.io/doc/io.micrometer/micrometer-tracing/{version}")
-			docs { version -> "https://docs.micrometer.io/tracing/reference/%s.%s"
-				.formatted(version.major(), version.minor()) }
+			javadoc("https://javadoc.io/doc/io.micrometer/micrometer-tracing/{version}", "io.micrometer.tracing")
+			docs(version -> "https://docs.micrometer.io/tracing/reference/%s.%s"
+				.formatted(version.major(), version.minor()))
 			releaseNotes("https://github.com/micrometer-metrics/tracing/releases/tag/v{version}")
 		}
 	}
@@ -1474,8 +1474,8 @@ bom {
 		}
 		links {
 			site("https://github.com/microsoft/mssql-jdbc")
-			releaseNotes { version -> "https://github.com/microsoft/mssql-jdbc/releases/tag/v%s"
-				.formatted(version.toString().replace(".jre11", "")) }
+			releaseNotes(version -> "https://github.com/microsoft/mssql-jdbc/releases/tag/v%s"
+				.formatted(version.toString().replace(".jre11", "")))
 		}
 	}
 	library("MySQL", "9.1.0") {
@@ -1487,9 +1487,8 @@ bom {
 			]
 		}
 		links {
-			releaseNotes { version -> "https://dev.mysql.com/doc/relnotes/connector-j/en/news-%s.html"
-				.formatted(version.toString().replace(".", "-"))
-			}
+			releaseNotes(version -> "https://dev.mysql.com/doc/relnotes/connector-j/en/news-%s.html"
+				.formatted(version.toString().replace(".", "-")))
 		}
 	}
 	library("Native Build Tools Plugin", "${nativeBuildToolsVersion}") {
@@ -1645,8 +1644,8 @@ bom {
 		}
 		links {
 			site("https://pulsar.apache.org")
-			docs { version -> "https://pulsar.apache.org/docs/%s.%s.x"
-				.formatted(version.major(), version.minor()) }
+			docs(version -> "https://pulsar.apache.org/docs/%s.%s.x"
+				.formatted(version.major(), version.minor()))
 			releaseNotes("https://pulsar.apache.org/release-notes/versioned/pulsar-{version}")
 		}
 	}
@@ -1677,7 +1676,7 @@ bom {
 		}
 		links {
 			site("https://github.com/quartz-scheduler/quartz")
-			javadoc("https://www.javadoc.io/doc/org.quartz-scheduler/quartz/{version}")
+			javadoc("https://www.javadoc.io/doc/org.quartz-scheduler/quartz/{version}", "org.quartz")
 			releaseNotes("https://github.com/quartz-scheduler/quartz/releases/tag/v{version}")
 		}
 	}
@@ -1689,8 +1688,8 @@ bom {
 		}
 		links {
 			site("https://github.com/querydsl/querydsl")
-			releaseNotes { version -> "https://github.com/querydsl/querydsl/releases/tag/QUERYDSL_%s"
-				.formatted(version.toString("_")) }
+			releaseNotes(version -> "https://github.com/querydsl/querydsl/releases/tag/QUERYDSL_%s"
+				.formatted(version.toString("_")))
 		}
 	}
 	library("R2DBC H2", "1.0.0.RELEASE") {
@@ -1777,7 +1776,7 @@ bom {
 		}
 		links {
 			site("https://r2dbc.io")
-			javadoc("https://r2dbc.io/spec/{version}/api")
+			javadoc("https://r2dbc.io/spec/{version}/api", "io.r2dbc")
 			releaseNotes("https://github.com/r2dbc/r2dbc-spi/releases/tag/v{version}")
 		}
 	}
@@ -1789,7 +1788,7 @@ bom {
 		}
 		links {
 			site("https://github.com/rabbitmq/rabbitmq-java-client")
-			javadoc("https://rabbitmq.github.io/rabbitmq-java-client/api/current/")
+			javadoc("https://rabbitmq.github.io/rabbitmq-java-client/api/current/", "com.rabbitmq")
 			releaseNotes("https://github.com/rabbitmq/rabbitmq-java-client/releases/tag/v{version}")
 		}
 	}
@@ -1940,11 +1939,11 @@ bom {
 		links {
 			site("https://spring.io/projects/spring-boot")
 			github("https://github.com/spring-projects/spring-boot")
-			javadoc("https://docs.spring.io/spring-boot/{version}/api/java")
+			javadoc("https://docs.spring.io/spring-boot/{version}/api/java", "org.springframework.boot")
 			docs("https://docs.spring.io/spring-boot/{version}")
 			releaseNotes("https://github.com/spring-projects/spring-boot/releases/tag/v{version}")
-			add("layers-xsd") { version -> "https://www.springframework.org/schema/boot/layers/layers-%s.%s.xsd"
-				.formatted(version.major(), version.minor()) }
+			add("layers-xsd", version -> "https://www.springframework.org/schema/boot/layers/layers-%s.%s.xsd"
+				.formatted(version.major(), version.minor()))
 		}
 	}
 	library("SAAJ Impl", "3.0.4") {
@@ -2021,10 +2020,10 @@ bom {
 		links {
 			site("https://spring.io/projects/spring-amqp")
 			github("https://github.com/spring-projects/spring-amqp")
-			javadoc { version -> "https://docs.spring.io/spring-amqp/docs/%s/api"
-				.formatted(version.forMajorMinorGeneration()) }
-			docs { version -> "https://docs.spring.io/spring-amqp/reference/%s"
-				.formatted(version.forAntora()) }
+			javadoc(version -> "https://docs.spring.io/spring-amqp/docs/%s/api"
+				.formatted(version.forMajorMinorGeneration()), "org.springframework.amqp")
+			docs(version -> "https://docs.spring.io/spring-amqp/reference/%s"
+				.formatted(version.forAntora()))
 			releaseNotes("https://github.com/spring-projects/spring-amqp/releases/tag/v{version}")
 		}
 	}
@@ -2038,10 +2037,10 @@ bom {
 		links {
 			site("https://spring.io/projects/spring-authorization-server")
 			github("https://github.com/spring-projects/spring-authorization-server")
-			javadoc {version -> "https://docs.spring.io/spring-authorization-server/docs/%s/api"
-				.formatted(version.forMajorMinorGeneration()) }
-			docs { version -> "https://docs.spring.io/spring-authorization-server/reference/%s"
-				.formatted(version.forAntora()) }
+			javadoc(version -> "https://docs.spring.io/spring-authorization-server/docs/%s/api"
+				.formatted(version.forMajorMinorGeneration()), "org.springframework.security.oauth2.server")
+			docs(version -> "https://docs.spring.io/spring-authorization-server/reference/%s"
+				.formatted(version.forAntora()))
 			releaseNotes("https://github.com/spring-projects/spring-authorization-server/releases/tag/{version}")
 		}
 	}
@@ -2055,10 +2054,10 @@ bom {
 		links {
 			site("https://spring.io/projects/spring-batch")
 			github("https://github.com/spring-projects/spring-batch")
-			javadoc { version -> "https://docs.spring.io/spring-batch/docs/%s/api"
-				.formatted(version.forMajorMinorGeneration()) }
-			docs { version -> "https://docs.spring.io/spring-batch/reference/%s"
-				.formatted(version.forAntora()) }
+			javadoc(version -> "https://docs.spring.io/spring-batch/docs/%s/api"
+				.formatted(version.forMajorMinorGeneration()), "org.springframework.batch")
+			docs(version -> "https://docs.spring.io/spring-batch/reference/%s"
+				.formatted(version.forAntora()))
 			releaseNotes("https://github.com/spring-projects/spring-batch/releases/tag/v{version}")
 		}
 	}
@@ -2086,10 +2085,13 @@ bom {
 		links {
 			site("https://spring.io/projects/spring-framework")
 			github("https://github.com/spring-projects/spring-framework")
-			javadoc { version ->"https://docs.spring.io/spring-framework/docs/%s/javadoc-api"
-				.formatted(version.forMajorMinorGeneration()) }
-			docs { version -> "https://docs.spring.io/spring-framework/reference/%s"
-				.formatted(version.forAntora()) }
+			javadoc(version -> "https://docs.spring.io/spring-framework/docs/%s/javadoc-api"
+				.formatted(version.forMajorMinorGeneration()), "org.springframework.[aop|aot|asm|beans|cache|cglib| " +
+						"context|core|dao|ejb|expression|format|http|instrument|jca|jdbc|jms|jmx|jndi|lang|mail|" +
+						"messaging|mock|objenesis|orm|oxm|r2dbc|scheduling|scripting|stereotype|test|transaction|" +
+						"ui|util|validation|web]")
+			docs(version -> "https://docs.spring.io/spring-framework/reference/%s"
+				.formatted(version.forAntora()))
 			releaseNotes("https://github.com/spring-projects/spring-framework/releases/tag/v{version}")
 		}
 	}
@@ -2104,10 +2106,10 @@ bom {
 		links {
 			site("https://spring.io/projects/spring-graphql")
 			github("https://github.com/spring-projects/spring-graphql")
-			javadoc { version -> "https://docs.spring.io/spring-graphql/docs/%s/api"
-				.formatted(version.forMajorMinorGeneration()) }
-			docs { version -> "https://docs.spring.io/spring-graphql/reference/%s"
-				.formatted(version.forAntora()) }
+			javadoc(version -> "https://docs.spring.io/spring-graphql/docs/%s/api"
+				.formatted(version.forMajorMinorGeneration()), "org.springframework.graphql")
+			docs(version -> "https://docs.spring.io/spring-graphql/reference/%s"
+				.formatted(version.forAntora()))
 			releaseNotes("https://github.com/spring-projects/spring-graphql/releases/tag/v{version}")
 		}
 	}
@@ -2121,10 +2123,10 @@ bom {
 		links {
 			site("https://spring.io/projects/spring-hateoas")
 			github("https://github.com/spring-projects/spring-hateoas")
-			javadoc { version -> "https://docs.spring.io/spring-hateoas/docs/%s/api"
-				.formatted(version.forMajorMinorGeneration()) }
-			docs { version -> "https://docs.spring.io/spring-hateoas/docs/%s/reference/html"
-				.formatted(version.forMajorMinorGeneration()) }
+			javadoc(version -> "https://docs.spring.io/spring-hateoas/docs/%s/api"
+				.formatted(version.forMajorMinorGeneration()), "org.springframework.hateoas")
+			docs(version -> "https://docs.spring.io/spring-hateoas/docs/%s/reference/html"
+				.formatted(version.forMajorMinorGeneration()))
 			releaseNotes("https://github.com/spring-projects/spring-hateoas/releases/tag/{version}")
 		}
 	}
@@ -2138,10 +2140,10 @@ bom {
 		links {
 			site("https://spring.io/projects/spring-integration")
 			github("https://github.com/spring-projects/spring-integration")
-			javadoc { version -> "https://docs.spring.io/spring-integration/docs/%s/api"
-				.formatted(version.forMajorMinorGeneration()) }
-			docs { version -> "https://docs.spring.io/spring-integration/reference/%s"
-				.formatted(version.forAntora()) }
+			javadoc(version -> "https://docs.spring.io/spring-integration/docs/%s/api"
+				.formatted(version.forMajorMinorGeneration()), "org.springframework.integration")
+			docs(version -> "https://docs.spring.io/spring-integration/reference/%s"
+				.formatted(version.forAntora()))
 			releaseNotes("https://github.com/spring-projects/spring-integration/releases/tag/v{version}")
 		}
 	}
@@ -2156,10 +2158,10 @@ bom {
 		links {
 			site("https://spring.io/projects/spring-kafka")
 			github("https://github.com/spring-projects/spring-kafka")
-			javadoc { version -> "https://docs.spring.io/spring-kafka/docs/%s/api"
-				.formatted(version.forMajorMinorGeneration()) }
-			docs { version -> "https://docs.spring.io/spring-kafka/reference/%s"
-				.formatted(version.forAntora()) }
+			javadoc(version -> "https://docs.spring.io/spring-kafka/docs/%s/api"
+				.formatted(version.forMajorMinorGeneration()), "org.springframework.kafka")
+			docs(version -> "https://docs.spring.io/spring-kafka/reference/%s"
+				.formatted(version.forAntora()))
 			releaseNotes("https://github.com/spring-projects/spring-kafka/releases/tag/v{version}")
 		}
 	}
@@ -2176,10 +2178,10 @@ bom {
 		links {
 			site("https://spring.io/projects/spring-ldap")
 			github("https://github.com/spring-projects/spring-ldap")
-			javadoc { version -> "https://docs.spring.io/spring-ldap/docs/%s/api"
-				.formatted(version.forMajorMinorGeneration()) }
-			docs { version -> "https://docs.spring.io/spring-ldap/reference/%s"
-				.formatted(version.forAntora()) }
+			javadoc(version -> "https://docs.spring.io/spring-ldap/docs/%s/api"
+				.formatted(version.forMajorMinorGeneration()), "org.springframework.ldap")
+			docs(version -> "https://docs.spring.io/spring-ldap/reference/%s"
+				.formatted(version.forAntora()))
 			releaseNotes("https://github.com/spring-projects/spring-ldap/releases/tag/{version}")
 		}
 	}
@@ -2193,10 +2195,10 @@ bom {
 		links {
 			site("https://spring.io/projects/spring-pulsar")
 			github("https://github.com/spring-projects/spring-pulsar")
-			javadoc { version -> "https://docs.spring.io/spring-pulsar/docs/%s/api/"
-				.formatted(version.forMajorMinorGeneration()) }
-			docs { version -> "https://docs.spring.io/spring-pulsar/docs/%s/reference"
-				.formatted(version.forMajorMinorGeneration()) }
+			javadoc(version -> "https://docs.spring.io/spring-pulsar/docs/%s/api/"
+				.formatted(version.forMajorMinorGeneration()), "org.springframework.pulsar")
+			docs(version -> "https://docs.spring.io/spring-pulsar/docs/%s/reference"
+				.formatted(version.forMajorMinorGeneration()))
 			releaseNotes("https://github.com/spring-projects/spring-pulsar/releases/tag/v{version}")
 		}
 	}
@@ -2210,10 +2212,10 @@ bom {
 		links {
 			site("https://spring.io/projects/spring-restdocs")
 			github("https://github.com/spring-projects/spring-restdocs")
-			javadoc { version -> "https://docs.spring.io/spring-restdocs/docs/%s/api/"
-				.formatted(version.forMajorMinorGeneration()) }
-			docs { version -> "https://docs.spring.io/spring-restdocs/docs/%s/reference/htmlsingle/"
-					.formatted(version.forMajorMinorGeneration()) }
+			javadoc(version -> "https://docs.spring.io/spring-restdocs/docs/%s/api/"
+				.formatted(version.forMajorMinorGeneration()), "org.springframework.restdocs")
+			docs(version -> "https://docs.spring.io/spring-restdocs/docs/%s/reference/htmlsingle/"
+					.formatted(version.forMajorMinorGeneration()))
 			releaseNotes("https://github.com/spring-projects/spring-restdocs/releases/tag/v{version}")
 		}
 	}
@@ -2239,10 +2241,10 @@ bom {
 		links {
 			site("https://spring.io/projects/spring-security")
 			github("https://github.com/spring-projects/spring-security")
-			javadoc { version -> "https://docs.spring.io/spring-security/site/docs/%s/api"
-				.formatted(version.forMajorMinorGeneration()) }
-			docs { version -> "https://docs.spring.io/spring-security/reference/%s"
-				.formatted(version.forAntora()) }
+			javadoc(version -> "https://docs.spring.io/spring-security/site/docs/%s/api"
+				.formatted(version.forMajorMinorGeneration()), "org.springframework.security")
+			docs(version -> "https://docs.spring.io/spring-security/reference/%s"
+				.formatted(version.forAntora()), "org.springframework.security")
 			releaseNotes("https://github.com/spring-projects/spring-security/releases/tag/{version}")
 		}
 	}
@@ -2260,10 +2262,10 @@ bom {
 		links {
 			site("https://spring.io/projects/spring-session")
 			github("https://github.com/spring-projects/spring-session")
-			javadoc { version -> "https://docs.spring.io/spring-session/docs/%s/api"
-				.formatted(version.forMajorMinorGeneration()) }
-			docs { version -> "https://docs.spring.io/spring-session/reference/%s"
-				.formatted(version.forAntora()) }
+			javadoc(version -> "https://docs.spring.io/spring-session/docs/%s/api"
+				.formatted(version.forMajorMinorGeneration()), "org.springframework.session")
+			docs(version -> "https://docs.spring.io/spring-session/reference/%s"
+				.formatted(version.forAntora()))
 			releaseNotes("https://github.com/spring-projects/spring-session/releases/tag/{version}")
 		}
 	}
@@ -2277,10 +2279,10 @@ bom {
 		links("spring-webservices") {
 			site("https://spring.io/projects/spring-ws")
 			github("https://github.com/spring-projects/spring-ws")
-			javadoc { version -> "https://docs.spring.io/spring-ws/docs/%s/api"
-				.formatted(version.forMajorMinorGeneration()) }
-			docs { version -> "https://docs.spring.io/spring-ws/docs/%s/reference/html"
-				.formatted(version.forMajorMinorGeneration()) }
+			javadoc(version -> "https://docs.spring.io/spring-ws/docs/%s/api"
+				.formatted(version.forMajorMinorGeneration()), "org.springframework.ws")
+			docs(version -> "https://docs.spring.io/spring-ws/docs/%s/reference/html"
+				.formatted(version.forMajorMinorGeneration()))
 			releaseNotes("https://github.com/spring-projects/spring-ws/releases/tag/v{version}")
 		}
 	}
@@ -2303,7 +2305,7 @@ bom {
 		}
 		links {
 			site("https://java.testcontainers.org")
-			javadoc("https://javadoc.io/doc/org.testcontainers/testcontainers/{version}")
+			javadoc("https://javadoc.io/doc/org.testcontainers/testcontainers/{version}", "org.testcontainers")
 			releaseNotes("https://github.com/testcontainers/testcontainers-java/releases/tag/{version}")
 		}
 	}
@@ -2371,9 +2373,9 @@ bom {
 		}
 		links {
 			site("https://tomcat.apache.org")
-			docs { version -> "https://tomcat.apache.org/tomcat-%s.%s-doc".formatted(version.major(), version.minor()) }
-			releaseNotes { version -> "https://tomcat.apache.org/tomcat-%s.%s-doc/changelog.html"
-				.formatted(version.major(), version.minor()) }
+			docs(version -> "https://tomcat.apache.org/tomcat-%s.%s-doc".formatted(version.major(), version.minor()))
+			releaseNotes(version -> "https://tomcat.apache.org/tomcat-%s.%s-doc/changelog.html"
+				.formatted(version.major(), version.minor()))
 		}
 	}
 	library("UnboundID LDAPSDK", "6.0.11") {