Merge branch '1.5.x' into 2.0.x

The 3.0.1 version of the Maven Javadoc Plugin contains a bug [1] that
means that a link URL must redirect otherwise it is ignored.

[1] https://issues.apache.org/jira/browse/MJAVADOC-532

Author: wilkinsona

spring-boot-project/spring-boot-docs/pom.xml

@@ -932,13 +932,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.version}/javadoc-api/</link>
-										<link>https://docs.spring.io/spring-security/site/docs/${spring-security.version}/api/</link>
-										<link>https://tomcat.apache.org/tomcat-8.5-doc/api/</link>
-										<link>https://www.eclipse.org/jetty/javadoc/${jetty.version}/</link>
-										<link>http://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.version}/javadoc-api</link>
+										<link>https://docs.spring.io/spring-security/site/docs/${spring-security.version}/api</link>
+										<link>https://tomcat.apache.org/tomcat-8.5-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>