Merge branch '1.5.x' into 2.0.x

Author: wilkinsona

CODE_OF_CONDUCT.adoc

@@ -40,5 +40,5 @@ appropriate to the circumstances. Maintainers are obligated to maintain confiden
 with regard to the reporter of an incident.
 
 This Code of Conduct is adapted from the
-http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
-http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]
+https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
+https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]

CONTRIBUTING.adoc

@@ -66,7 +66,7 @@ added after the original pull request but before a merge.
 * A few unit tests would help a lot as well -- someone has to do it.
 * If no-one else is using your branch, please rebase it against the current master (or
   other target branch in the main project).
-* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
+* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
   if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
   message (where `XXXX` is the issue number).
 
@@ -75,15 +75,15 @@ added after the original pull request but before a merge.
 == Working with the Code
 If you don't have an IDE preference we would recommend that you use
 https://spring.io/tools/sts[Spring Tools Suite] or
-http://eclipse.org[Eclipse] when working with the code. We use the
-http://eclipse.org/m2e/[M2Eclipse] eclipse plugin for maven support. Other IDEs and tools
+https://eclipse.org[Eclipse] when working with the code. We use the
+https://eclipse.org/m2e/[M2Eclipse] eclipse plugin for maven support. Other IDEs and tools
 should also work without issue.
 
 
 
 === Building from Source
-Spring Boot source can be build from the command line using
-http://maven.apache.org/run-maven/index.html[Apache Maven] on JDK 1.8 or above.
+Spring Boot source can be built from the command line using
+https://maven.apache.org/run-maven/index.html[Apache Maven] on JDK 1.8 or above.
 We include '`Maven Wrapper`' scripts (`./mvnw` or `mvnw.bat`) that you can run rather
 than needing to install Maven locally.
 
@@ -148,7 +148,7 @@ Spring Boot includes a `.setup` files which can be used with the Eclipse Install
 provision a new environment. To use the installer:
 
 * Download and run the latest Eclipse Installer from
-  http://www.eclipse.org/downloads/[eclipse.org/downloads/] (under "Get Eclipse").
+  https://www.eclipse.org/downloads/[eclipse.org/downloads/] (under "Get Eclipse").
 * Switch to "Advanced Mode" using the drop down menu on the right.
 * Select "`Eclipse IDE for Java Developers`" under "`Eclipse.org`" as the product to
   install and click "`next`".
@@ -170,7 +170,7 @@ easier to navigate.
 
 ==== Manual Installation with M2Eclipse
 If you prefer to install Eclipse yourself you should use the
-http://eclipse.org/m2e/[M2Eclipse] eclipse plugin. If you don't already have m2eclipse
+https://eclipse.org/m2e/[M2Eclipse] eclipse plugin. If you don't already have m2eclipse
 installed it is available from the "Eclipse marketplace".
 
 Spring Boot includes project specific source formatting settings, in order to have these

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundrySecurityServiceTests.java

@@ -52,12 +52,12 @@ public class CloudFoundrySecurityServiceTests {
 	@Rule
 	public ExpectedException thrown = ExpectedException.none();
 
-	private static final String CLOUD_CONTROLLER = "http://my-cloud-controller.com";
+	private static final String CLOUD_CONTROLLER = "https://my-cloud-controller.com";
 
 	private static final String CLOUD_CONTROLLER_PERMISSIONS = CLOUD_CONTROLLER
 			+ "/v2/apps/my-app-id/permissions";
 
-	private static final String UAA_URL = "http://my-uaa.com";
+	private static final String UAA_URL = "https://my-uaa.com";
 
 	private CloudFoundrySecurityService securityService;
 
@@ -151,7 +151,7 @@ public void getAccessLevelWhenCloudControllerIsNotReachableThrowsException() {
 	@Test
 	public void fetchTokenKeysWhenSuccessfulShouldReturnListOfKeysFromUAA() {
 		this.server.expect(requestTo(CLOUD_CONTROLLER + "/info"))
-				.andRespond(withSuccess("{\"token_endpoint\":\"http://my-uaa.com\"}",
+				.andRespond(withSuccess("{\"token_endpoint\":\"https://my-uaa.com\"}",
 						MediaType.APPLICATION_JSON));
 		String tokenKeyValue = "-----BEGIN PUBLIC KEY-----\n"
 				+ "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0m59l2u9iDnMbrXHfqkO\n"

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/TokenValidatorTests.java

@@ -181,7 +181,7 @@ public void validateTokenWhenExpiredShouldThrowException() throws Exception {
 	@Test
 	public void validateTokenWhenIssuerIsNotValidShouldThrowException() throws Exception {
 		given(this.securityService.fetchTokenKeys()).willReturn(VALID_KEYS);
-		given(this.securityService.getUaaUrl()).willReturn("http://other-uaa.com");
+		given(this.securityService.getUaaUrl()).willReturn("https://other-uaa.com");
 		String header = "{ \"alg\": \"RS256\",  \"kid\": \"valid-key\", \"typ\": \"JWT\", \"scope\": [\"actuator.read\"]}";
 		String claims = "{ \"exp\": 2147483647, \"iss\": \"http://localhost:8080/uaa/oauth/token\"}";
 		this.thrown

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/AtomikosJtaConfiguration.java

@@ -46,7 +46,7 @@
 import org.springframework.util.StringUtils;
 
 /**
- * JTA Configuration for <A href="http://www.atomikos.com/">Atomikos</a>.
+ * JTA Configuration for <A href="https://www.atomikos.com/">Atomikos</a>.
  *
  * @author Josh Long
  * @author Phillip Webb

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 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.
@@ -44,7 +44,7 @@
 import org.springframework.util.StringUtils;
 
 /**
- * JTA Configuration for <A href="http://docs.codehaus.org/display/BTM/Home">Bitronix</A>.
+ * JTA Configuration for <A href="https://github.com/bitronix/btm">Bitronix</A>.
  *
  * @author Josh Long
  * @author Phillip Webb

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 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.
@@ -49,7 +49,7 @@
 import org.springframework.util.StringUtils;
 
 /**
- * JTA Configuration for <a href="http://narayana.io/">Narayana</a>.
+ * JTA Configuration for <a href="https://github.com/jbosstm/narayana">Narayana</a>.
  *
  * @author Gytis Trikleris
  * @author Kazuki Shimizu

spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/layout.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
+<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect">
   <head>
     <title layout:fragment="title">Layout</title>
   </head>

spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/view.html

@@ -1,4 +1,4 @@
-<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout" layout:decorator="layout">
+<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout" layout:decorator="layout">
   <head>
     <title layout:fragment="title">Content</title>
   </head>

spring-boot-project/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