Skip to content

Commit 535a85d

Browse files
committed
Simplify javadoc links that use single element package
Closes gh-43230
1 parent 2eb6ee6 commit 535a85d

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

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

+2-8
Original file line numberDiff line numberDiff line change
@@ -240,19 +240,13 @@ private void addArtifactAttributes(Map<String, String> attributes) {
240240

241241
private void addUrlJava(Map<String, String> attributes) {
242242
attributes.put("url-javase-javadoc", "https://docs.oracle.com/en/java/javase/17/docs/api");
243+
attributes.put("javadoc-location-java", "{url-javase-javadoc}/java.base");
243244
attributes.put("javadoc-location-java-beans", "{url-javase-javadoc}/java.desktop");
244-
attributes.put("javadoc-location-java-lang", "{url-javase-javadoc}/java.base");
245-
attributes.put("javadoc-location-java-net", "{url-javase-javadoc}/java.base");
246-
attributes.put("javadoc-location-java-io", "{url-javase-javadoc}/java.base");
247-
attributes.put("javadoc-location-java-nio", "{url-javase-javadoc}/java.base");
248-
attributes.put("javadoc-location-java-security", "{url-javase-javadoc}/java.base");
249245
attributes.put("javadoc-location-java-sql", "{url-javase-javadoc}/java.sql");
250-
attributes.put("javadoc-location-java-time", "{url-javase-javadoc}/java.base");
251-
attributes.put("javadoc-location-java-util", "{url-javase-javadoc}/java.base");
246+
attributes.put("javadoc-location-javax", "{url-javase-javadoc}/java.base");
252247
attributes.put("javadoc-location-javax-management", "{url-javase-javadoc}/java.management");
253248
attributes.put("javadoc-location-javax-net", "{url-javase-javadoc}/java.base");
254249
attributes.put("javadoc-location-javax-sql", "{url-javase-javadoc}/java.sql");
255-
attributes.put("javadoc-location-javax-security", "{url-javase-javadoc}/java.base");
256250
attributes.put("javadoc-location-javax-xml", "{url-javase-javadoc}/java.xml");
257251
}
258252

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ bom {
454454
}
455455
links {
456456
site("https://www.graphql-java.com")
457-
javadoc("https://javadoc.io/doc/com.graphql-java/graphql-java/{version}", "graphql.schema", "graphql.execution")
457+
javadoc("https://javadoc.io/doc/com.graphql-java/graphql-java/{version}", "graphql")
458458
releaseNotes("https://github.com/graphql-java/graphql-java/releases/tag/v{version}")
459459
}
460460
}
@@ -1174,7 +1174,7 @@ bom {
11741174
}
11751175
links {
11761176
site("https://www.liquibase.com")
1177-
javadoc("https://javadoc.io/doc/org.liquibase/liquibase-core/{version}", "liquibase.integration", "liquibase.report")
1177+
javadoc("https://javadoc.io/doc/org.liquibase/liquibase-core/{version}", "liquibase")
11781178
releaseNotes("https://github.com/liquibase/liquibase/releases/tag/v{version}")
11791179
}
11801180
}

0 commit comments

Comments
 (0)