Skip to content

Commit 9e2a7a2

Browse files
committed
Merge pull request #19632 from dreis2211
* pr/19632: Make Tomcat javadoc link version dependent Closes gh-19632
2 parents e1a557e + dcdadb9 commit 9e2a7a2

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,14 @@ task javadoc(type: Javadoc) {
5858
}
5959
doFirst {
6060
def versionConstraints = dependencyVersions.versionConstraints
61+
def tomcatVersion = "${versionConstraints['org.apache.tomcat:tomcat-annotations-api']}"
62+
def tomcatDocsVersion = tomcatVersion.substring(0, tomcatVersion.lastIndexOf('.'));
6163
options.links = [
6264
'https://docs.oracle.com/javase/8/docs/api/',
6365
'https://docs.oracle.com/javaee/7/api/',
6466
"https://docs.spring.io/spring-framework/docs/${versionConstraints['org.springframework:spring-core']}/javadoc-api/",
6567
"https://docs.spring.io/spring-security/site/docs/${versionConstraints['org.springframework.security:spring-security-core']}/api/",
66-
'https://tomcat.apache.org/tomcat-9.0-doc/api/',
68+
"https://tomcat.apache.org/tomcat-${tomcatDocsVersion}-doc/api/",
6769
"https://www.eclipse.org/jetty/javadoc/${versionConstraints['org.eclipse.jetty:jetty-server']}/",
6870
"https://www.thymeleaf.org/apidocs/thymeleaf/${versionConstraints['org.thymeleaf:thymeleaf']}/"
6971
] as String[]

0 commit comments

Comments
 (0)