From 239fa0356f931c70731a78b72ff3afbbd01ee7f3 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 16 Dec 2024 10:43:35 -0800 Subject: [PATCH] Remove trailing slashes from all link URLs Closes gh-43518 --- .../antora/AntoraAsciidocAttributes.java | 2 +- .../spring-boot-dependencies/build.gradle | 36 +++++++++---------- .../spring-boot-gradle-plugin/build.gradle | 4 +-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/antora/AntoraAsciidocAttributes.java b/buildSrc/src/main/java/org/springframework/boot/build/antora/AntoraAsciidocAttributes.java index f82a828a99..bd03c76612 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/antora/AntoraAsciidocAttributes.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/antora/AntoraAsciidocAttributes.java @@ -202,7 +202,7 @@ public class AntoraAsciidocAttributes { } private void addUrlJava(Map attributes) { - attributes.put("url-javase-javadoc", "https://docs.oracle.com/en/java/javase/17/docs/api/"); + attributes.put("url-javase-javadoc", "https://docs.oracle.com/en/java/javase/17/docs/api"); 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"); diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 49fa033637..a1db326b2f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -86,7 +86,7 @@ bom { ] } links { - site("https://assertj.github.io/doc/") + site("https://assertj.github.io/doc") releaseNotes("https://github.com/assertj/assertj/releases/tag/assertj-build-{version}") } } @@ -145,7 +145,7 @@ bom { ] } links { - site("https://bytebuddy.net/") + site("https://bytebuddy.net") docs("https://bytebuddy.net/#/tutorial") releaseNotes("https://github.com/raphw/byte-buddy/releases/tag/byte-buddy-{version}") } @@ -298,7 +298,7 @@ bom { } links { site("https://github.com/spring-gradle-plugins/dependency-management-plugin") - docs("https://docs.spring.io/dependency-management-plugin/docs/{version}/reference/html/") + docs("https://docs.spring.io/dependency-management-plugin/docs/{version}/reference/html") releaseNotes("https://github.com/spring-gradle-plugins/dependency-management-plugin/releases/tag/v{version}") } } @@ -333,7 +333,7 @@ bom { ] } links { - site("https://www.ehcache.org/") + site("https://www.ehcache.org") releaseNotes("https://github.com/ehcache/ehcache3/releases/tag/v{version}") } } @@ -449,7 +449,7 @@ bom { ] } links { - site("https://www.graphql-java.com/") + site("https://www.graphql-java.com") javadoc("https://javadoc.io/doc/com.graphql-java/graphql-java/{version}", "graphql.schema", "graphql.execution") releaseNotes("https://github.com/graphql-java/graphql-java/releases/tag/v{version}") } @@ -509,7 +509,7 @@ bom { } links { site("https://hazelcast.com") - javadoc("https://docs.hazelcast.org/docs/{version}/javadoc/", "com.hazelcast") + javadoc("https://docs.hazelcast.org/docs/{version}/javadoc", "com.hazelcast") releaseNotes("https://github.com/hazelcast/hazelcast/releases/tag/v{version}") } } @@ -630,7 +630,7 @@ bom { ] } links { - site("https://infinispan.org/") + site("https://infinispan.org") javadoc(version -> "https://docs.jboss.org/infinispan/%s.%s/apidocs".formatted(version.major(), version.minor()), "org.infinispan") releaseNotes("https://github.com/infinispan/infinispan/releases/tag/{version}") } @@ -1138,7 +1138,7 @@ bom { ] } links { - site("https://kotlinlang.org/") + site("https://kotlinlang.org") docs("https://kotlinlang.org/docs/reference") releaseNotes("https://github.com/JetBrains/kotlin/releases/tag/v{version}") } @@ -1228,7 +1228,7 @@ bom { } links { site("https://projectlombok.org") - javadoc("https://projectlombok.org/api/") + javadoc("https://projectlombok.org/api") } } library("MariaDB", "3.3.3") { @@ -1238,8 +1238,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/" + 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("-"))) } } @@ -1463,7 +1463,7 @@ bom { ] } links { - site("https://site.mockito.org/") + site("https://site.mockito.org") releaseNotes("https://github.com/mockito/mockito/releases/tag/v{version}") } } @@ -1871,7 +1871,7 @@ bom { } links { site("https://github.com/rabbitmq/rabbitmq-java-client") - javadoc("https://rabbitmq.github.io/rabbitmq-java-client/api/current/", "com.rabbitmq") + javadoc("https://rabbitmq.github.io/rabbitmq-java-client/api/current", "com.rabbitmq") releaseNotes("https://github.com/rabbitmq/rabbitmq-java-client/releases/tag/v{version}") } } @@ -1902,7 +1902,7 @@ bom { ] } links { - site("https://projectreactor.io/") + site("https://projectreactor.io") releaseNotes("https://github.com/reactor/reactor/releases/tag/{version}") } } @@ -2283,7 +2283,7 @@ 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/" + 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())) @@ -2300,9 +2300,9 @@ 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/" + 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/" + 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}") } @@ -2406,7 +2406,7 @@ bom { ] } links { - site("https://www.thymeleaf.org/") + site("https://www.thymeleaf.org") javadoc("thymeleaf", version -> "https://www.thymeleaf.org/apidocs/thymeleaf/%s".formatted(version), "org.thymeleaf") javadoc("thymeleaf-spring6", version -> "https://www.thymeleaf.org/apidocs/thymeleaf-spring6/%s".formatted(version), "org.thymeleaf.spring6") releaseNotes("https://github.com/thymeleaf/thymeleaf/releases/tag/thymeleaf-{version}") diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle index 338335ea49..82bd14d335 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle @@ -160,8 +160,8 @@ javadoc { splitIndex = true use = true windowTitle = "Spring Boot Gradle Plugin ${project.version} API" - links "https://docs.gradle.org/$gradle.gradleVersion/javadoc/" - links "https://docs.oracle.com/en/java/javase/17/docs/api/" + links "https://docs.gradle.org/$gradle.gradleVersion/javadoc" + links "https://docs.oracle.com/en/java/javase/17/docs/api" } }