Merge branch 'main' into 4.0.x

Author: philwebb

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

@@ -242,19 +242,13 @@ private void addArtifactAttributes(Map<String, String> attributes) {
 
 	private void addUrlJava(Map<String, String> attributes) {
 		attributes.put("url-javase-javadoc", "https://docs.oracle.com/en/java/javase/17/docs/api");
+		attributes.put("javadoc-location-java", "{url-javase-javadoc}/java.base");
 		attributes.put("javadoc-location-java-beans", "{url-javase-javadoc}/java.desktop");
-		attributes.put("javadoc-location-java-lang", "{url-javase-javadoc}/java.base");
-		attributes.put("javadoc-location-java-net", "{url-javase-javadoc}/java.base");
-		attributes.put("javadoc-location-java-io", "{url-javase-javadoc}/java.base");
-		attributes.put("javadoc-location-java-nio", "{url-javase-javadoc}/java.base");
-		attributes.put("javadoc-location-java-security", "{url-javase-javadoc}/java.base");
 		attributes.put("javadoc-location-java-sql", "{url-javase-javadoc}/java.sql");
-		attributes.put("javadoc-location-java-time", "{url-javase-javadoc}/java.base");
-		attributes.put("javadoc-location-java-util", "{url-javase-javadoc}/java.base");
+		attributes.put("javadoc-location-javax", "{url-javase-javadoc}/java.base");
 		attributes.put("javadoc-location-javax-management", "{url-javase-javadoc}/java.management");
 		attributes.put("javadoc-location-javax-net", "{url-javase-javadoc}/java.base");
 		attributes.put("javadoc-location-javax-sql", "{url-javase-javadoc}/java.sql");
-		attributes.put("javadoc-location-javax-security", "{url-javase-javadoc}/java.base");
 		attributes.put("javadoc-location-javax-xml", "{url-javase-javadoc}/java.xml");
 	}
 

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

@@ -470,7 +470,7 @@ bom {
 		}
 		links {
 			site("https://www.graphql-java.com")
-			javadoc("https://javadoc.io/doc/com.graphql-java/graphql-java/{version}", "graphql.schema", "graphql.execution")
+			javadoc("https://javadoc.io/doc/com.graphql-java/graphql-java/{version}", "graphql")
 			releaseNotes("https://github.com/graphql-java/graphql-java/releases/tag/v{version}")
 		}
 	}
@@ -1233,7 +1233,7 @@ bom {
 		}
 		links {
 			site("https://www.liquibase.com")
-			javadoc("https://javadoc.io/doc/org.liquibase/liquibase-core/{version}", "liquibase.integration", "liquibase.report")
+			javadoc("https://javadoc.io/doc/org.liquibase/liquibase-core/{version}", "liquibase")
 			releaseNotes("https://github.com/liquibase/liquibase/releases/tag/v{version}")
 		}
 	}