Merge branch '2.2.x'

Closes gh-19592
This commit is contained in:
Andy Wilkinson 2020-01-09 09:00:16 +00:00
commit c584334f5e

View File

@ -1189,13 +1189,13 @@
<quiet>true</quiet>
<stylesheetfile>${basedir}/src/main/javadoc/spring-javadoc.css</stylesheetfile>
<links>
<link>https://docs.oracle.com/javase/8/docs/api</link>
<link>https://docs.oracle.com/javaee/7/api</link>
<link>https://docs.spring.io/spring-framework/docs/${spring-framework.version}/javadoc-api</link>
<link>https://docs.spring.io/spring-security/site/docs/${spring-security.version}/api</link>
<link>https://tomcat.apache.org/tomcat-9.0-doc/api</link>
<link>https://www.eclipse.org/jetty/javadoc/${jetty.version}</link>
<link>https://www.thymeleaf.org/apidocs/thymeleaf/${thymeleaf.version}</link>
<link>https://docs.oracle.com/javase/8/docs/api/</link>
<link>https://docs.oracle.com/javaee/7/api/</link>
<link>https://docs.spring.io/spring-framework/docs/${spring-framework.version}/javadoc-api/</link>
<link>https://docs.spring.io/spring-security/site/docs/${spring-security.version}/api/</link>
<link>https://tomcat.apache.org/tomcat-9.0-doc/api/</link>
<link>https://www.eclipse.org/jetty/javadoc/${jetty.version}/</link>
<link>https://www.thymeleaf.org/apidocs/thymeleaf/${thymeleaf.version}/</link>
</links>
</configuration>
</execution>