Skip to content

Commit 54b96c8

Browse files
philwebbphilwebb
committed
Merge branch '3.3.x'
Closes gh-43526
2 parents cc87798 + 239fa03 commit 54b96c8

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ private void addArtifactAttributes(Map<String, String> attributes) {
204204
}
205205

206206
private void addUrlJava(Map<String, String> attributes) {
207-
attributes.put("url-javase-javadoc", "https://docs.oracle.com/en/java/javase/17/docs/api/");
207+
attributes.put("url-javase-javadoc", "https://docs.oracle.com/en/java/javase/17/docs/api");
208208
attributes.put("javadoc-location-java-beans", "{url-javase-javadoc}/java.desktop");
209209
attributes.put("javadoc-location-java-lang", "{url-javase-javadoc}/java.base");
210210
attributes.put("javadoc-location-java-net", "{url-javase-javadoc}/java.base");

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ bom {
8686
]
8787
}
8888
links {
89-
site("https://assertj.github.io/doc/")
89+
site("https://assertj.github.io/doc")
9090
releaseNotes("https://github.com/assertj/assertj/releases/tag/assertj-build-{version}")
9191
}
9292
}
@@ -145,7 +145,7 @@ bom {
145145
]
146146
}
147147
links {
148-
site("https://bytebuddy.net/")
148+
site("https://bytebuddy.net")
149149
docs("https://bytebuddy.net/#/tutorial")
150150
releaseNotes("https://github.com/raphw/byte-buddy/releases/tag/byte-buddy-{version}")
151151
}
@@ -298,7 +298,7 @@ bom {
298298
}
299299
links {
300300
site("https://github.com/spring-gradle-plugins/dependency-management-plugin")
301-
docs("https://docs.spring.io/dependency-management-plugin/docs/{version}/reference/html/")
301+
docs("https://docs.spring.io/dependency-management-plugin/docs/{version}/reference/html")
302302
releaseNotes("https://github.com/spring-gradle-plugins/dependency-management-plugin/releases/tag/v{version}")
303303
}
304304
}
@@ -333,7 +333,7 @@ bom {
333333
]
334334
}
335335
links {
336-
site("https://www.ehcache.org/")
336+
site("https://www.ehcache.org")
337337
releaseNotes("https://github.com/ehcache/ehcache3/releases/tag/v{version}")
338338
}
339339
}
@@ -450,7 +450,7 @@ bom {
450450
]
451451
}
452452
links {
453-
site("https://www.graphql-java.com/")
453+
site("https://www.graphql-java.com")
454454
javadoc("https://javadoc.io/doc/com.graphql-java/graphql-java/{version}", "graphql.schema", "graphql.execution")
455455
releaseNotes("https://github.com/graphql-java/graphql-java/releases/tag/v{version}")
456456
}
@@ -510,7 +510,7 @@ bom {
510510
}
511511
links {
512512
site("https://hazelcast.com")
513-
javadoc("https://docs.hazelcast.org/docs/{version}/javadoc/", "com.hazelcast")
513+
javadoc("https://docs.hazelcast.org/docs/{version}/javadoc", "com.hazelcast")
514514
releaseNotes("https://github.com/hazelcast/hazelcast/releases/tag/v{version}")
515515
}
516516
}
@@ -631,7 +631,7 @@ bom {
631631
]
632632
}
633633
links {
634-
site("https://infinispan.org/")
634+
site("https://infinispan.org")
635635
javadoc(version -> "https://docs.jboss.org/infinispan/%s.%s/apidocs".formatted(version.major(), version.minor()), "org.infinispan")
636636
releaseNotes("https://github.com/infinispan/infinispan/releases/tag/{version}")
637637
}
@@ -1155,7 +1155,7 @@ bom {
11551155
]
11561156
}
11571157
links {
1158-
site("https://kotlinlang.org/")
1158+
site("https://kotlinlang.org")
11591159
docs("https://kotlinlang.org/docs/reference")
11601160
releaseNotes("https://github.com/JetBrains/kotlin/releases/tag/v{version}")
11611161
}
@@ -1253,7 +1253,7 @@ bom {
12531253
}
12541254
links {
12551255
site("https://projectlombok.org")
1256-
javadoc("https://projectlombok.org/api/")
1256+
javadoc("https://projectlombok.org/api")
12571257
}
12581258
}
12591259
library("MariaDB", "3.4.1") {
@@ -1263,8 +1263,8 @@ bom {
12631263
]
12641264
}
12651265
links {
1266-
site("https://mariadb.com/kb/en/mariadb-connector-j/")
1267-
releaseNotes(version -> "https://mariadb.com/kb/en/mariadb-connector-j-%s-release-notes/"
1266+
site("https://mariadb.com/kb/en/mariadb-connector-j")
1267+
releaseNotes(version -> "https://mariadb.com/kb/en/mariadb-connector-j-%s-release-notes"
12681268
.formatted(version.toString("-")))
12691269
}
12701270
}
@@ -1488,7 +1488,7 @@ bom {
14881488
]
14891489
}
14901490
links {
1491-
site("https://site.mockito.org/")
1491+
site("https://site.mockito.org")
14921492
releaseNotes("https://github.com/mockito/mockito/releases/tag/v{version}")
14931493
}
14941494
}
@@ -1854,7 +1854,7 @@ bom {
18541854
}
18551855
links {
18561856
site("https://github.com/rabbitmq/rabbitmq-java-client")
1857-
javadoc("https://rabbitmq.github.io/rabbitmq-java-client/api/current/", "com.rabbitmq")
1857+
javadoc("https://rabbitmq.github.io/rabbitmq-java-client/api/current", "com.rabbitmq")
18581858
releaseNotes("https://github.com/rabbitmq/rabbitmq-java-client/releases/tag/v{version}")
18591859
}
18601860
}
@@ -1885,7 +1885,7 @@ bom {
18851885
]
18861886
}
18871887
links {
1888-
site("https://projectreactor.io/")
1888+
site("https://projectreactor.io")
18891889
releaseNotes("https://github.com/reactor/reactor/releases/tag/{version}")
18901890
}
18911891
}
@@ -2266,7 +2266,7 @@ bom {
22662266
links {
22672267
site("https://spring.io/projects/spring-pulsar")
22682268
github("https://github.com/spring-projects/spring-pulsar")
2269-
javadoc(version -> "https://docs.spring.io/spring-pulsar/docs/%s/api/"
2269+
javadoc(version -> "https://docs.spring.io/spring-pulsar/docs/%s/api"
22702270
.formatted(version.forMajorMinorGeneration()), "org.springframework.pulsar")
22712271
docs(version -> "https://docs.spring.io/spring-pulsar/docs/%s/reference"
22722272
.formatted(version.forMajorMinorGeneration()))
@@ -2283,9 +2283,9 @@ bom {
22832283
links {
22842284
site("https://spring.io/projects/spring-restdocs")
22852285
github("https://github.com/spring-projects/spring-restdocs")
2286-
javadoc(version -> "https://docs.spring.io/spring-restdocs/docs/%s/api/"
2286+
javadoc(version -> "https://docs.spring.io/spring-restdocs/docs/%s/api"
22872287
.formatted(version.forMajorMinorGeneration()), "org.springframework.restdocs")
2288-
docs(version -> "https://docs.spring.io/spring-restdocs/docs/%s/reference/htmlsingle/"
2288+
docs(version -> "https://docs.spring.io/spring-restdocs/docs/%s/reference/htmlsingle"
22892289
.formatted(version.forMajorMinorGeneration()))
22902290
releaseNotes("https://github.com/spring-projects/spring-restdocs/releases/tag/v{version}")
22912291
}
@@ -2400,7 +2400,7 @@ bom {
24002400
]
24012401
}
24022402
links {
2403-
site("https://www.thymeleaf.org/")
2403+
site("https://www.thymeleaf.org")
24042404
javadoc("thymeleaf", version -> "https://www.thymeleaf.org/apidocs/thymeleaf/%s".formatted(version), "org.thymeleaf")
24052405
javadoc("thymeleaf-spring6", version -> "https://www.thymeleaf.org/apidocs/thymeleaf-spring6/%s".formatted(version), "org.thymeleaf.spring6")
24062406
releaseNotes("https://github.com/thymeleaf/thymeleaf/releases/tag/thymeleaf-{version}")

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ javadoc {
113113
splitIndex = true
114114
use = true
115115
windowTitle = "Spring Boot Gradle Plugin ${project.version} API"
116-
links "https://docs.gradle.org/$gradle.gradleVersion/javadoc/"
117-
links "https://docs.oracle.com/en/java/javase/17/docs/api/"
116+
links "https://docs.gradle.org/$gradle.gradleVersion/javadoc"
117+
links "https://docs.oracle.com/en/java/javase/17/docs/api"
118118
}
119119
}
120120

0 commit comments

Comments
 (0)