Merge branch '1.3.x' into 1.4.x

spring-boot-cli/src/it/resources/jar-command/bad.groovy

@@ -1,4 +1,4 @@
-@GrabResolver(name='clojars.org', root='http://clojars.org/repo')
+@GrabResolver(name='clojars.org', root='https://clojars.org/repo')
 @Grab('redis.embedded:embedded-redis:0.2')
 
 @Component

spring-boot-cli/src/main/homebrew/springboot.rb

@@ -1,7 +1,7 @@
 require 'formula'
 
 class Springboot < Formula
-  homepage 'http://projects.spring.io/spring-boot/'
+  homepage 'https://projects.spring.io/spring-boot/'
   url 'https://repo.spring.io/${repo}/org/springframework/boot/spring-boot-cli/${project.version}/spring-boot-cli-${project.version}-bin.tar.gz'
   version '${project.version}'
   sha256 '${checksum}'

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java

@@ -42,13 +42,13 @@ import org.springframework.util.StringUtils;
 public final class RepositoryConfigurationFactory {
 
 	private static final RepositoryConfiguration MAVEN_CENTRAL = new RepositoryConfiguration(
-			"central", URI.create("http://repo1.maven.org/maven2/"), false);
+			"central", URI.create("https://repo1.maven.org/maven2/"), false);
 
 	private static final RepositoryConfiguration SPRING_MILESTONE = new RepositoryConfiguration(
-			"spring-milestone", URI.create("http://repo.spring.io/milestone"), false);
+			"spring-milestone", URI.create("https://repo.spring.io/milestone"), false);
 
 	private static final RepositoryConfiguration SPRING_SNAPSHOT = new RepositoryConfiguration(
-			"spring-snapshot", URI.create("http://repo.spring.io/snapshot"), true);
+			"spring-snapshot", URI.create("https://repo.spring.io/snapshot"), true);
 
 	private RepositoryConfigurationFactory() {
 	}

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java

@@ -44,7 +44,7 @@ import org.eclipse.aether.util.filter.DependencyFilterUtils;
 
 /**
  * A {@link GrapeEngine} implementation that uses
- * <a href="http://eclipse.org/aether">Aether</a>, the dependency resolution system used
+ * <a href="https://eclipse.org/aether">Aether</a>, the dependency resolution system used
  * by Maven.
  *
  * @author Andy Wilkinson

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java

@@ -52,7 +52,7 @@ public class AetherGrapeEngineTests {
 			RepositoryConfiguration... additionalRepositories) {
 		List<RepositoryConfiguration> repositoryConfigurations = new ArrayList<RepositoryConfiguration>();
 		repositoryConfigurations.add(new RepositoryConfiguration("central",
-				URI.create("http://repo1.maven.org/maven2"), false));
+				URI.create("https://repo1.maven.org/maven2"), false));
 		repositoryConfigurations.addAll(Arrays.asList(additionalRepositories));
 		return AetherGrapeEngineFactory.create(this.groovyClassLoader,
 				repositoryConfigurations, new DependencyResolutionContext());
@@ -160,7 +160,7 @@ public class AetherGrapeEngineTests {
 		Map<String, Object> args = new HashMap<String, Object>();
 		AetherGrapeEngine grapeEngine = this.createGrapeEngine();
 		grapeEngine
-				.addResolver(createResolver("restlet.org", "http://maven.restlet.org"));
+				.addResolver(createResolver("restlet.org", "https://maven.restlet.org"));
 		grapeEngine.grab(args, createDependency("org.restlet", "org.restlet", "1.1.6"));
 		assertThat(this.groovyClassLoader.getURLs().length).isEqualTo(1);
 	}

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 public final class DetailedProgressReporterTests {
 
-	private static final String REPOSITORY = "http://my.repository.com/";
+	private static final String REPOSITORY = "https://repo.example.com/";
 
 	private static final String ARTIFACT = "org/alpha/bravo/charlie/1.2.3/charlie-1.2.3.jar";
 

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -116,7 +116,7 @@ public class SettingsXmlRepositorySystemSessionAutoConfigurationTests {
 		}, "user.home:" + userHome);
 
 		RemoteRepository repository = new RemoteRepository.Builder("my-server", "default",
-				"http://maven.example.com").build();
+				"https://maven.example.com").build();
 		assertMirrorSelectorConfiguration(session, repository);
 		assertProxySelectorConfiguration(session, repository);
 		assertAuthenticationSelectorConfiguration(session, repository);

spring-boot-cli/src/test/resources/foo.pom

@@ -3,7 +3,7 @@
 		xmlns="http://maven.apache.org/POM/4.0.0"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="
-				http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+				http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 

spring-boot-cli/src/test/resources/templates/home.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="https://www.thymeleaf.org">
 <head>
 <title th:text="${title}">Title</title>
 <link rel="stylesheet" th:href="@{/resources/css/bootstrap.min.css}"
@@ -9,7 +9,7 @@
 	<div class="container">
 		<div class="navbar">
 			<div class="navbar-inner">
-				<a class="brand" href="http://www.thymeleaf.org"> Thymeleaf -
+				<a class="brand" href="https://www.thymeleaf.org"> Thymeleaf -
 					Plain </a>
 				<ul class="nav">
 					<li><a th:href="@{/}" href="home.html"> Home </a></li>