Merge branch '1.3.x' into 1.4.x

spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/PropertiesMergingResourceTransformer.java

@@ -28,7 +28,7 @@ import org.apache.maven.plugins.shade.relocation.Relocator;
 import org.apache.maven.plugins.shade.resource.ResourceTransformer;
 
 /**
- * Extension for the <a href="http://maven.apache.org/plugins/maven-shade-plugin/">Maven
+ * Extension for the <a href="https://maven.apache.org/plugins/maven-shade-plugin/">Maven
  * shade plugin</a> to allow properties files (e.g. {@literal META-INF/spring.factories})
  * to be merged without losing any information.
  *

spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java

@@ -102,7 +102,7 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
 	 * artifact. If this is not given (default), it will replace the main artifact and
 	 * only the repackaged artifact will be deployed. Attaching the artifact allows to
 	 * deploy it alongside to the original one, see <a href=
-	 * "http://maven.apache.org/plugins/maven-deploy-plugin/examples/deploying-with-classifiers.html"
+	 * "https://maven.apache.org/plugins/maven-deploy-plugin/examples/deploying-with-classifiers.html"
 	 * > the maven documentation for more details</a>.
 	 * @since 1.0
 	 */

spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/it-random-port.apt.vm

@@ -12,7 +12,7 @@
   port to the integration test itself.
 
   The example below showcases how you could achieve the same feature using the
-  {{{http://mojo.codehaus.org/build-helper-maven-plugin/}build-helper-plugin}}:
+  {{{https://www.mojohaus.org/build-helper-maven-plugin/}build-helper-plugin}}:
 
 ---
 <project>

spring-boot-tools/spring-boot-maven-plugin/src/site/apt/index.apt

@@ -33,7 +33,7 @@ Spring Boot Maven Plugin
   more specific use cases are described in the examples given below.
 
   In case you still have questions regarding the plugin's usage, please have a look at the existing
-  {{{http://stackoverflow.com/questions/tagged/spring-boot}stack overflow issue}}. If you still don't get an
+  {{{https://stackoverflow.com/questions/tagged/spring-boot}stack overflow issue}}. If you still don't get an
   answer, feel free to create a new thread with the <<<#spring-boot>>> tag.
 
   If you feel like the plugin is missing a feature or has a defect, you can fill a feature request or bug report

spring-boot-tools/spring-boot-maven-plugin/src/site/apt/usage.apt.vm

@@ -251,7 +251,7 @@ spring.devtools.remote.restart.enabled=false
 </build>
 ---
 
-  Such setup can now use the {{{http://maven.apache.org/surefire/maven-failsafe-plugin/}failsafe-plugin}} to
+  Such setup can now use the {{{https://maven.apache.org/surefire/maven-failsafe-plugin/}failsafe-plugin}} to
   run your integration tests as you would expect.
 
   You could also configure a more advanced setup to skip the integration tests when a specific property has