From e401d02ced35bf27d3709cb064955d393bc1f936 Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Tue, 26 Mar 2019 04:14:28 -0500 Subject: [PATCH 01/12] Use HTTPS for external links wherever possible See gh-16316 --- CONTRIBUTING.adoc | 20 ++-- README.adoc | 22 ++-- spring-boot-actuator/README.adoc | 2 +- .../autoconfigure/CrshAutoConfiguration.java | 2 +- .../JolokiaAutoConfiguration.java | 2 +- .../boot/actuate/metrics/rich/RichGauge.java | 2 +- .../MetricFilterAutoConfigurationTests.java | 2 +- .../jta/AtomikosJtaConfiguration.java | 2 +- .../jta/BitronixJtaConfiguration.java | 2 +- .../ResourceServerPropertiesTests.java | 4 +- ...ServerTokenServicesConfigurationTests.java | 18 +-- ...serInfoTokenServicesRefreshTokenTests.java | 2 +- .../resource/UserInfoTokenServicesTests.java | 2 +- .../sso/BasicOAuth2SsoConfigurationTests.java | 4 +- .../CustomOAuth2SsoConfigurationTests.java | 4 +- ...nticationEntryPointConfigurationTests.java | 4 +- .../src/test/resources/templates/layout.html | 2 +- .../src/test/resources/templates/view.html | 2 +- .../src/it/resources/jar-command/bad.groovy | 2 +- .../src/main/homebrew/springboot.rb | 2 +- .../RepositoryConfigurationFactory.java | 6 +- .../cli/compiler/grape/AetherGrapeEngine.java | 2 +- .../grape/AetherGrapeEngineTests.java | 4 +- ...rySystemSessionAutoConfigurationTests.java | 2 +- spring-boot-cli/src/test/resources/foo.pom | 2 +- .../src/test/resources/templates/home.html | 4 +- .../tunnel/server/HttpTunnelServer.java | 2 +- .../ClassPathFileSystemWatcherTests.java | 2 +- .../devtools/restart/ChangeableUrlsTests.java | 2 +- .../appendix-executable-jar-format.adoc | 2 +- .../src/main/asciidoc/build-tool-plugins.adoc | 20 ++-- .../src/main/asciidoc/deployment.adoc | 28 ++--- .../main/asciidoc/documentation-overview.adoc | 8 +- .../src/main/asciidoc/getting-started.adoc | 62 +++++----- spring-boot-docs/src/main/asciidoc/howto.adoc | 28 ++--- spring-boot-docs/src/main/asciidoc/index.adoc | 36 +++--- .../asciidoc/production-ready-features.adoc | 18 +-- .../src/main/asciidoc/spring-boot-cli.adoc | 4 +- .../main/asciidoc/spring-boot-features.adoc | 108 +++++++++--------- .../src/main/asciidoc/using-spring-boot.adoc | 26 ++--- .../src/main/docbook/xsl/common.xsl | 2 +- .../src/main/docbook/xsl/epub.xsl | 2 +- .../src/main/docbook/xsl/html.xsl | 2 +- spring-boot-docs/src/main/docbook/xsl/pdf.xsl | 2 +- .../src/main/resources/templates/error.ftl | 2 +- .../src/main/resources/templates/home.ftl | 2 +- .../static/javascript/jquery-1.9.0.js | 52 ++++----- .../src/main/resources/templates/hello.html | 2 +- .../src/main/resources/templates/layout.html | 2 +- .../main/java/sample/jooq/domain/Keys.java | 2 +- .../main/java/sample/jooq/domain/Public.java | 2 +- .../main/java/sample/jooq/domain/Tables.java | 2 +- .../sample/jooq/domain/tables/Author.java | 2 +- .../java/sample/jooq/domain/tables/Book.java | 2 +- .../sample/jooq/domain/tables/BookStore.java | 2 +- .../jooq/domain/tables/BookToBookStore.java | 2 +- .../sample/jooq/domain/tables/Language.java | 2 +- .../domain/tables/records/AuthorRecord.java | 2 +- .../domain/tables/records/BookRecord.java | 2 +- .../tables/records/BookStoreRecord.java | 2 +- .../tables/records/BookToBookStoreRecord.java | 2 +- .../domain/tables/records/LanguageRecord.java | 2 +- .../spring-boot-sample-jta-jndi/README.adoc | 6 +- .../src/main/webapp/WEB-INF/views/home.jsp | 2 +- .../main/resources/static/js/jquery-1.7.2.js | 26 ++--- .../resources/static/js/jquery.validate.js | 68 +++++------ .../src/main/resources/templates/layout.tpl | 2 +- .../src/main/resources/templates/access.html | 4 +- .../src/main/resources/templates/error.html | 4 +- .../src/main/resources/templates/home.html | 4 +- .../src/main/resources/templates/login.html | 4 +- .../src/main/resources/templates/error.html | 4 +- .../src/main/resources/templates/home.html | 4 +- .../src/main/resources/templates/login.html | 4 +- .../src/main/resources/static/index.html | 2 +- .../src/main/resources/templates/error.html | 4 +- .../src/main/resources/templates/home.html | 4 +- .../src/main/resources/templates/login.html | 4 +- .../src/main/resources/templates/error.html | 4 +- .../src/main/resources/templates/home.html | 4 +- .../src/main/resources/templates/login.html | 4 +- .../main/resources/static/js/jquery-1.7.2.js | 26 ++--- .../resources/static/js/jquery.validate.js | 68 +++++------ .../src/main/resources/templates/layout.html | 2 +- .../resources/templates/messages/form.html | 2 +- .../resources/templates/messages/list.html | 2 +- .../resources/templates/messages/view.html | 2 +- .../src/main/resources/static/snake.html | 2 +- .../src/main/resources/static/snake.html | 2 +- .../src/main/resources/static/snake.html | 2 +- .../spring-boot-sample-ws/README.adoc | 4 +- spring-boot-starters/README.adoc | 18 +-- .../loader/jar/CentralDirectoryEndRecord.java | 2 +- .../PropertiesMergingResourceTransformer.java | 2 +- .../boot/maven/RepackageMojo.java | 2 +- .../site/apt/examples/it-random-port.apt.vm | 2 +- .../src/site/apt/index.apt | 2 +- .../src/site/apt/usage.apt.vm | 2 +- .../boot/cloud/CloudPlatform.java | 2 +- ...ikosDependsOnBeanFactoryPostProcessor.java | 2 +- .../boot/jta/atomikos/AtomikosProperties.java | 4 +- .../logging/log4j/Log4JLoggingSystem.java | 2 +- .../logging/log4j2/Log4J2LoggingSystem.java | 2 +- .../logging/logback/LogbackLoggingSystem.java | 2 +- .../jpa/hibernate/SpringNamingStrategy.java | 2 +- .../EmbeddedVelocityToolboxViewTests.java | 2 +- 106 files changed, 440 insertions(+), 440 deletions(-) diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index a0d88a2f12..19ee7b916a 100755 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -7,8 +7,8 @@ something, or simply want to hack on the code this document should help you get == Using GitHub issues We use GitHub issues to track bugs and enhancements. If you have a general usage question -please ask on http://stackoverflow.com[Stack Overflow]. The Spring Boot team and the -broader community monitor the http://stackoverflow.com/tags/spring-boot[`spring-boot`] +please ask on https://stackoverflow.com[Stack Overflow]. The Spring Boot team and the +broader community monitor the https://stackoverflow.com/tags/spring-boot[`spring-boot`] tag. If you are reporting a bug, please help to speed up problem diagnosis by providing as much @@ -36,7 +36,7 @@ added after the original pull request but before a merge. the '`Importing into eclipse`' instructions below you should get project specific formatting automatically. You can also import formatter settings using the `eclipse-code-formatter.xml` file from the `eclipse` folder. If using IntelliJ IDEA, you - can use the http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] + can use the https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is @@ -49,7 +49,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). @@ -57,16 +57,16 @@ 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 -http://www.springsource.com/developer/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://www.springsource.com/developer/sts[Spring Tools Suite] or +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 To build the source you will need to install -http://maven.apache.org/run-maven/index.html[Apache Maven] v3.2.3 or above and JDK 1.8. +https://maven.apache.org/run-maven/index.html[Apache Maven] v3.2.3 or above and JDK 1.8. @@ -146,7 +146,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/]. + https://www.eclipse.org/downloads/[eclipse.org/downloads/]. * 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`". @@ -168,7 +168,7 @@ easier to navigate. ==== Manual installation with m2eclipse If you prefer to install Eclipse yourself we recommend that you 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 diff --git a/README.adoc b/README.adoc index b8aa02095d..a46034ff7b 100755 --- a/README.adoc +++ b/README.adoc @@ -1,5 +1,5 @@ = Spring Boot image:https://build.spring.io/plugins/servlet/buildStatusImage/BOOT-PUB["Build Status", link="https://build.spring.io/browse/BOOT-PUB"] image:https://badges.gitter.im/Join Chat.svg["Chat",link="https://gitter.im/spring-projects/spring-boot?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"] -:docs: http://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference +:docs: https://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference Spring Boot makes it easy to create Spring-powered, production-grade applications and services with absolute minimum fuss. It takes an opinionated view of the Spring platform @@ -62,10 +62,10 @@ Having trouble with Spring Boot? We'd like to help! {docs}/htmlsingle/#howto[How-to's] -- they provide solutions to the most common questions. * Learn the Spring basics -- Spring Boot builds on many other Spring projects, check - the http://spring.io[spring.io] web-site for a wealth of reference documentation. If - you are just starting out with Spring, try one of the http://spring.io/guides[guides]. -* Ask a questions - we monitor http://stackoverflow.com[stackoverflow.com] for questions - tagged with http://stackoverflow.com/tags/spring-boot[`spring-boot`]. + the https://spring.io[spring.io] web-site for a wealth of reference documentation. If + you are just starting out with Spring, try one of the https://spring.io/guides[guides]. +* Ask a questions - we monitor https://stackoverflow.com[stackoverflow.com] for questions + tagged with https://stackoverflow.com/tags/spring-boot[`spring-boot`]. * Report bugs with Spring Boot at https://github.com/spring-projects/spring-boot/issues[github.com/spring-projects/spring-boot/issues]. @@ -91,7 +91,7 @@ requests. If you want to raise an issue, please follow the recommendations below == Building from Source You don't need to build from source to use Spring Boot (binaries in -http://repo.spring.io[repo.spring.io]), but if you want to try out the latest and +https://repo.spring.io[repo.spring.io]), but if you want to try out the latest and greatest, Spring Boot can be easily built with the https://github.com/takari/maven-wrapper[maven wrapper]. You also need JDK 1.8 (although Boot applications can run on Java 1.6). @@ -102,7 +102,7 @@ Boot applications can run on Java 1.6). ---- If you want to build with the regular `mvn` command, you will need -http://maven.apache.org/run-maven/index.html[Maven v3.0.5 or above]. +https://maven.apache.org/run-maven/index.html[Maven v3.0.5 or above]. NOTE: You may need to increase the amount of memory available to Maven by setting a `MAVEN_OPTS` environment variable with the value `-Xmx512m`. Remember @@ -215,16 +215,16 @@ be built with maven and run by invoking `java -jar target/.jar`. == Guides -The http://spring.io/[spring.io] site contains several guides that show how to use Spring +The https://spring.io/[spring.io] site contains several guides that show how to use Spring Boot step-by-step: -* http://spring.io/guides/gs/spring-boot/[Building an Application with Spring Boot] is a +* https://spring.io/guides/gs/spring-boot/[Building an Application with Spring Boot] is a very basic guide that shows you how to create a simple application, run it and add some management services. -* http://spring.io/guides/gs/actuator-service/[Building a RESTful Web Service with Spring +* https://spring.io/guides/gs/actuator-service/[Building a RESTful Web Service with Spring Boot Actuator] is a guide to creating a REST web service and also shows how the server can be configured. -* http://spring.io/guides/gs/convert-jar-to-war/[Converting a Spring Boot JAR Application +* https://spring.io/guides/gs/convert-jar-to-war/[Converting a Spring Boot JAR Application to a WAR] shows you how to run applications in a web server as a WAR file. diff --git a/spring-boot-actuator/README.adoc b/spring-boot-actuator/README.adoc index 34179798aa..9099f72e2f 100644 --- a/spring-boot-actuator/README.adoc +++ b/spring-boot-actuator/README.adoc @@ -5,7 +5,7 @@ manage your application when it's pushed to production. You can choose to manage monitor your application using HTTP endpoints, with JMX or even by remote shell (SSH or Telnet). Auditing, health and metrics gathering can be automatically applied to your application. The -http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#production-ready[user guide] +https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#production-ready[user guide] covers the features in more detail. == Enabling the Actuator diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java index cc05de7311..e3a45d452b 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java @@ -105,7 +105,7 @@ import org.springframework.util.StringUtils; * context. *

* Additional shell commands can be implemented using the guide and documentation at - * crashub.org. By default Boot will search for + * crashub.org. By default Boot will search for * commands using the following classpath scanning pattern {@code classpath*:/commands/**} * . To add different locations or override the default use * {@code shell.command_path_patterns} in your application configuration. diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfiguration.java index b586bf34f2..e1472c9b24 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfiguration.java @@ -53,7 +53,7 @@ import org.springframework.web.servlet.mvc.ServletWrappingController; *

* Additional configuration parameters for Jolokia can be provided by specifying * {@code jolokia.config.*} properties. See the - * http://jolokia.org web site for more information on + * https://jolokia.org web site for more information on * supported configuration parameters. * * @author Christian Dupuis diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/RichGauge.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/RichGauge.java index b1a021cc2d..e0aa643123 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/RichGauge.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/RichGauge.java @@ -24,7 +24,7 @@ import org.springframework.util.Assert; * The value of the average will depend on whether a weight ('alpha') is set for the * gauge. If it is unset, the average will contain a simple arithmetic mean. If a weight * is set, an exponential moving average will be calculated as defined in this - * NIST + * NIST * document. * * @author Luke Taylor diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java index d0d9feec96..a12e94f961 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java @@ -390,7 +390,7 @@ public class MetricFilterAutoConfigurationTests { throws ServletException, IOException { // send redirect before filter chain is executed, like Spring Security sending // us back to a login page - response.sendRedirect("http://example.com"); + response.sendRedirect("https://example.com"); } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/AtomikosJtaConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/AtomikosJtaConfiguration.java index d3a7f54283..a012becabf 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/AtomikosJtaConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/AtomikosJtaConfiguration.java @@ -45,7 +45,7 @@ import org.springframework.transaction.jta.JtaTransactionManager; import org.springframework.util.StringUtils; /** - * JTA Configuration for Atomikos. + * JTA Configuration for Atomikos. * * @author Josh Long * @author Phillip Webb diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java index 9c3b3ce179..e478bec450 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.transaction.jta.JtaTransactionManager; import org.springframework.util.StringUtils; /** - * JTA Configuration for Bitronix. + * JTA Configuration for Bitronix. * * @author Josh Long * @author Phillip Webb diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerPropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerPropertiesTests.java index df73e6c015..8a9b8c0237 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerPropertiesTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerPropertiesTests.java @@ -36,7 +36,7 @@ public class ResourceServerPropertiesTests { @Test @SuppressWarnings("unchecked") public void json() throws Exception { - this.properties.getJwt().setKeyUri("http://example.com/token_key"); + this.properties.getJwt().setKeyUri("https://example.com/token_key"); ObjectMapper mapper = new ObjectMapper(); String json = mapper.writeValueAsString(this.properties); Map value = mapper.readValue(json, Map.class); @@ -46,7 +46,7 @@ public class ResourceServerPropertiesTests { @Test public void tokenKeyDerived() throws Exception { - this.properties.setUserInfoUri("http://example.com/userinfo"); + this.properties.setUserInfoUri("https://example.com/userinfo"); assertNotNull("Wrong properties: " + this.properties, this.properties.getJwt().getKeyUri()); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java index 3478cc3204..abc831fc86 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java @@ -96,7 +96,7 @@ public class ResourceServerTokenServicesConfigurationTests { @Test public void useRemoteTokenServices() { EnvironmentTestUtils.addEnvironment(this.environment, - "security.oauth2.resource.tokenInfoUri:http://example.com", + "security.oauth2.resource.tokenInfoUri:https://example.com", "security.oauth2.resource.clientId=acme"); this.context = new SpringApplicationBuilder(ResourceConfiguration.class) .environment(this.environment).web(false).run(); @@ -107,7 +107,7 @@ public class ResourceServerTokenServicesConfigurationTests { @Test public void switchToUserInfo() { EnvironmentTestUtils.addEnvironment(this.environment, - "security.oauth2.resource.userInfoUri:http://example.com"); + "security.oauth2.resource.userInfoUri:https://example.com"); this.context = new SpringApplicationBuilder(ResourceConfiguration.class) .environment(this.environment).web(false).run(); UserInfoTokenServices services = this.context @@ -118,7 +118,7 @@ public class ResourceServerTokenServicesConfigurationTests { @Test public void userInfoWithAuthorities() { EnvironmentTestUtils.addEnvironment(this.environment, - "security.oauth2.resource.userInfoUri:http://example.com"); + "security.oauth2.resource.userInfoUri:https://example.com"); this.context = new SpringApplicationBuilder(AuthoritiesConfiguration.class) .environment(this.environment).web(false).run(); UserInfoTokenServices services = this.context @@ -132,7 +132,7 @@ public class ResourceServerTokenServicesConfigurationTests { public void userInfoWithClient() { EnvironmentTestUtils.addEnvironment(this.environment, "security.oauth2.client.client-id=acme", - "security.oauth2.resource.userInfoUri:http://example.com", + "security.oauth2.resource.userInfoUri:https://example.com", "server.port=-1", "debug=true"); this.context = new SpringApplicationBuilder(ResourceNoClientConfiguration.class) .environment(this.environment).web(true).run(); @@ -144,8 +144,8 @@ public class ResourceServerTokenServicesConfigurationTests { @Test public void preferUserInfo() { EnvironmentTestUtils.addEnvironment(this.environment, - "security.oauth2.resource.userInfoUri:http://example.com", - "security.oauth2.resource.tokenInfoUri:http://example.com", + "security.oauth2.resource.userInfoUri:https://example.com", + "security.oauth2.resource.tokenInfoUri:https://example.com", "security.oauth2.resource.preferTokenInfo:false"); this.context = new SpringApplicationBuilder(ResourceConfiguration.class) .environment(this.environment).web(false).run(); @@ -157,8 +157,8 @@ public class ResourceServerTokenServicesConfigurationTests { @Test public void userInfoWithCustomizer() { EnvironmentTestUtils.addEnvironment(this.environment, - "security.oauth2.resource.userInfoUri:http://example.com", - "security.oauth2.resource.tokenInfoUri:http://example.com", + "security.oauth2.resource.userInfoUri:https://example.com", + "security.oauth2.resource.tokenInfoUri:https://example.com", "security.oauth2.resource.preferTokenInfo:false"); this.context = new SpringApplicationBuilder(ResourceConfiguration.class, Customizer.class).environment(this.environment).web(false).run(); @@ -190,7 +190,7 @@ public class ResourceServerTokenServicesConfigurationTests { @Test public void springSocialUserInfo() { EnvironmentTestUtils.addEnvironment(this.environment, - "security.oauth2.resource.userInfoUri:http://example.com", + "security.oauth2.resource.userInfoUri:https://example.com", "spring.social.facebook.app-id=foo", "spring.social.facebook.app-secret=bar"); this.context = new SpringApplicationBuilder(SocialResourceConfiguration.class) diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServicesRefreshTokenTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServicesRefreshTokenTests.java index 88d2a42c4d..5a04323550 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServicesRefreshTokenTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServicesRefreshTokenTests.java @@ -63,7 +63,7 @@ import static org.junit.Assert.assertEquals; @SpringApplicationConfiguration(classes = Application.class) @RunWith(SpringJUnit4ClassRunner.class) @WebIntegrationTest({ "server.port=0", - "security.oauth2.resource.userInfoUri:http://example.com", + "security.oauth2.resource.userInfoUri:https://example.com", "security.oauth2.client.clientId=foo" }) @DirtiesContext public class UserInfoTokenServicesRefreshTokenTests { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServicesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServicesTests.java index b77108083a..2f9e3c443c 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServicesTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServicesTests.java @@ -51,7 +51,7 @@ public class UserInfoTokenServicesTests { public ExpectedException expected = ExpectedException.none(); private UserInfoTokenServices services = new UserInfoTokenServices( - "http://example.com", "foo"); + "https://example.com", "foo"); private BaseOAuth2ProtectedResourceDetails resource = new BaseOAuth2ProtectedResourceDetails(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/BasicOAuth2SsoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/BasicOAuth2SsoConfigurationTests.java index 726b24d2fa..cc5b27a5c5 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/BasicOAuth2SsoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/BasicOAuth2SsoConfigurationTests.java @@ -51,8 +51,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @WebAppConfiguration @TestPropertySource(properties = { "debug=true", "security.oauth2.client.clientId=client", "security.oauth2.client.clientSecret=secret", - "security.oauth2.client.userAuthorizationUri=http://example.com/oauth/authorize", - "security.oauth2.client.accessTokenUri=http://example.com/oauth/token", + "security.oauth2.client.userAuthorizationUri=https://example.com/oauth/authorize", + "security.oauth2.client.accessTokenUri=https://example.com/oauth/token", "security.oauth2.resource.jwt.keyValue=SSSSHHH" }) public class BasicOAuth2SsoConfigurationTests { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomOAuth2SsoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomOAuth2SsoConfigurationTests.java index f6ebb31d89..1d5160e0d7 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomOAuth2SsoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomOAuth2SsoConfigurationTests.java @@ -57,8 +57,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @WebAppConfiguration @TestPropertySource(properties = { "security.oauth2.client.clientId=client", "security.oauth2.client.clientSecret=secret", - "security.oauth2.client.authorizationUri=http://example.com/oauth/authorize", - "security.oauth2.client.tokenUri=http://example.com/oauth/token", + "security.oauth2.client.authorizationUri=https://example.com/oauth/authorize", + "security.oauth2.client.tokenUri=https://example.com/oauth/token", "security.oauth2.resource.jwt.keyValue=SSSSHHH" }) public class CustomOAuth2SsoConfigurationTests { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomOAuth2SsoWithAuthenticationEntryPointConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomOAuth2SsoWithAuthenticationEntryPointConfigurationTests.java index b7e8094bbd..188975a3de 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomOAuth2SsoWithAuthenticationEntryPointConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomOAuth2SsoWithAuthenticationEntryPointConfigurationTests.java @@ -59,8 +59,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @WebAppConfiguration @TestPropertySource(properties = { "security.oauth2.client.clientId=client", "security.oauth2.client.clientSecret=secret", - "security.oauth2.client.authorizationUri=http://example.com/oauth/authorize", - "security.oauth2.client.tokenUri=http://example.com/oauth/token", + "security.oauth2.client.authorizationUri=https://example.com/oauth/authorize", + "security.oauth2.client.tokenUri=https://example.com/oauth/token", "security.oauth2.resource.jwt.keyValue=SSSSHHH" }) public class CustomOAuth2SsoWithAuthenticationEntryPointConfigurationTests { diff --git a/spring-boot-autoconfigure/src/test/resources/templates/layout.html b/spring-boot-autoconfigure/src/test/resources/templates/layout.html index b4be8f22a6..900c0de6bd 100644 --- a/spring-boot-autoconfigure/src/test/resources/templates/layout.html +++ b/spring-boot-autoconfigure/src/test/resources/templates/layout.html @@ -1,5 +1,5 @@ - + Layout diff --git a/spring-boot-autoconfigure/src/test/resources/templates/view.html b/spring-boot-autoconfigure/src/test/resources/templates/view.html index a56836e6b4..6f4deeb420 100644 --- a/spring-boot-autoconfigure/src/test/resources/templates/view.html +++ b/spring-boot-autoconfigure/src/test/resources/templates/view.html @@ -1,4 +1,4 @@ - + Content diff --git a/spring-boot-cli/src/it/resources/jar-command/bad.groovy b/spring-boot-cli/src/it/resources/jar-command/bad.groovy index 6d4be26b8f..3118a10e0f 100644 --- a/spring-boot-cli/src/it/resources/jar-command/bad.groovy +++ b/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 diff --git a/spring-boot-cli/src/main/homebrew/springboot.rb b/spring-boot-cli/src/main/homebrew/springboot.rb index 0e6bf53910..c00225717e 100644 --- a/spring-boot-cli/src/main/homebrew/springboot.rb +++ b/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}' diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java index 6cab51f8cb..ebd5fa46a7 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java +++ b/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() { } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java index f0d675126c..e11c1d39a1 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java +++ b/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 - * Aether, the dependency resolution system used + * Aether, the dependency resolution system used * by Maven. * * @author Andy Wilkinson diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java index 1bad78ce35..064146544b 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java @@ -54,7 +54,7 @@ public class AetherGrapeEngineTests { RepositoryConfiguration... additionalRepositories) { List repositoryConfigurations = new ArrayList(); 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()); @@ -162,7 +162,7 @@ public class AetherGrapeEngineTests { Map args = new HashMap(); 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")); assertEquals(1, this.groovyClassLoader.getURLs().length); } diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java index 3d11f8bda4..7977516f2c 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java @@ -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); diff --git a/spring-boot-cli/src/test/resources/foo.pom b/spring-boot-cli/src/test/resources/foo.pom index f88c9caa3f..955257c539 100644 --- a/spring-boot-cli/src/test/resources/foo.pom +++ b/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"> 4.0.0 diff --git a/spring-boot-cli/src/test/resources/templates/home.html b/spring-boot-cli/src/test/resources/templates/home.html index 3d314f4214..dfdd6c756b 100644 --- a/spring-boot-cli/src/test/resources/templates/home.html +++ b/spring-boot-cli/src/test/resources/templates/home.html @@ -1,5 +1,5 @@ - + Title

- Thymeleaf - + Thymeleaf - Plain
  • Home
    • diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java index a2563a7e14..85f2ae8102 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java @@ -39,7 +39,7 @@ import org.springframework.util.Assert; /** * A server that can be used to tunnel TCP traffic over HTTP. Similar in design to the - * Bidirectional-streams Over + * Bidirectional-streams Over * Synchronous HTTP (BOSH) XMPP extension protocol, the server uses long polling with * HTTP requests held open until a response is available. A typical traffic pattern would * be as follows: diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java index da921b0a49..1ca4693823 100644 --- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java @@ -72,7 +72,7 @@ public class ClassPathFileSystemWatcherTests { Map properties = new HashMap(); File folder = this.temp.newFolder(); List urls = new ArrayList(); - urls.add(new URL("http://spring.io")); + urls.add(new URL("https://spring.io")); urls.add(folder.toURI().toURL()); properties.put("urls", urls); MapPropertySource propertySource = new MapPropertySource("test", properties); diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ChangeableUrlsTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ChangeableUrlsTests.java index 27cf107363..b5e1b5d830 100644 --- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ChangeableUrlsTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ChangeableUrlsTests.java @@ -61,7 +61,7 @@ public class ChangeableUrlsTests { @Test public void httpUrl() throws Exception { - URL url = new URL("http://spring.io"); + URL url = new URL("https://spring.io"); assertThat(ChangeableUrls.fromUrls(url).size(), equalTo(0)); } diff --git a/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc b/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc index 2f7a76a489..deb97126a1 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc @@ -277,7 +277,7 @@ consider a different logging implementation. If the above restrictions mean that you cannot use Spring Boot Loader the following alternatives could be considered: -* http://maven.apache.org/plugins/maven-shade-plugin/[Maven Shade Plugin] +* https://maven.apache.org/plugins/maven-shade-plugin/[Maven Shade Plugin] * http://www.jdotsoft.com/JarClassLoader.php[JarClassLoader] * http://one-jar.sourceforge.net[OneJar] diff --git a/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc b/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc index a84c8c71e6..d591ff6ef2 100644 --- a/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc +++ b/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc @@ -33,7 +33,7 @@ section of your `pom.xml` ---- + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 @@ -85,11 +85,11 @@ If you are using a milestone or snapshot release you will also need to add appro spring-snapshots - http://repo.spring.io/snapshot + https://repo.spring.io/snapshot spring-milestones - http://repo.spring.io/milestone + https://repo.spring.io/milestone ---- @@ -107,7 +107,7 @@ usual `packaging` element: ---- + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> jar @@ -135,7 +135,7 @@ need to mark the embedded container dependencies as "`provided`", e.g: ---- + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> war @@ -192,8 +192,8 @@ If you are using a milestone or snapshot release you will also need to add appro ---- buildscript { repositories { - maven.url "http://repo.spring.io/snapshot" - maven.url "http://repo.spring.io/milestone" + maven.url "https://repo.spring.io/snapshot" + maven.url "https://repo.spring.io/milestone" } // ... } @@ -282,7 +282,7 @@ named "`providedRuntime`", e.g: repositories { jcenter() - maven { url "http://repo.spring.io/libs-snapshot" } + maven { url "https://repo.spring.io/libs-snapshot" } } configurations { @@ -625,7 +625,7 @@ from `spring-boot-starter-parent`. Please refer to the ==== Configuring Gradle to produce a pom that imports dependency management The following is an example of configuring Gradle to generate a pom that imports the dependency management provided by `spring-boot-dependencies`. Please refer to the -http://www.gradle.org/docs/current/userguide/userguide.html[Gradle User Guide] for +https://www.gradle.org/docs/current/userguide/userguide.html[Gradle User Guide] for further information. [source,groovy,indent=0,subs="verbatim,attributes"] @@ -837,7 +837,7 @@ If your archive already includes libraries you can use `Libraries.NONE`. [[build-tool-plugins-find-a-main-class]] === Finding a main class If you don't use `Repackager.setMainClass()` to specify a main class, the repackager will -use http://asm.ow2.org/[ASM] to read class files and attempt to find a suitable class +use https://asm.ow2.org/[ASM] to read class files and attempt to find a suitable class with a `public static void main(String[] args)` method. An exception is thrown if more than one candidate is found. diff --git a/spring-boot-docs/src/main/asciidoc/deployment.adoc b/spring-boot-docs/src/main/asciidoc/deployment.adoc index 15ab2db266..c20b1fde30 100644 --- a/spring-boot-docs/src/main/asciidoc/deployment.adoc +++ b/spring-boot-docs/src/main/asciidoc/deployment.adoc @@ -46,10 +46,10 @@ stand-alone executable jar applications, as well as traditional `.war` packaged applications. Once you've built your application (using, for example, `mvn clean package`) and -http://docs.cloudfoundry.org/devguide/installcf/install-go-cli.html[installed the `cf` +https://docs.cloudfoundry.org/devguide/installcf/install-go-cli.html[installed the `cf` command line tool], simply deploy your application using the `cf push` command as follows, substituting the path to your compiled `.jar`. Be sure to have -http://docs.cloudfoundry.org/devguide/installcf/whats-new-v6.html#login[logged in with your +https://docs.cloudfoundry.org/devguide/installcf/whats-new-v6.html#login[logged in with your `cf` command line client] before pushing an application. [indent=0,subs="verbatim,quotes,attributes"] @@ -57,9 +57,9 @@ http://docs.cloudfoundry.org/devguide/installcf/whats-new-v6.html#login[logged i $ cf push acloudyspringtime -p target/demo-0.0.1-SNAPSHOT.jar ---- -See the http://docs.cloudfoundry.org/devguide/installcf/whats-new-v6.html#push[`cf push` +See the https://docs.cloudfoundry.org/devguide/installcf/whats-new-v6.html#push[`cf push` documentation] for more options. If there is a Cloud Foundry -http://docs.cloudfoundry.org/devguide/deploy-apps/manifest.html[`manifest.yml`] +https://docs.cloudfoundry.org/devguide/deploy-apps/manifest.html[`manifest.yml`] file present in the same directory, it will be consulted. NOTE: Here we are substituting `acloudyspringtime` for whatever value you give `cf` @@ -107,7 +107,7 @@ It's easy to then verify the status of the deployed application: Once Cloud Foundry acknowledges that your application has been deployed, you should be able to hit the application at the URI given, in this case -`http://acloudyspringtime.cfapps.io/`. +`https://acloudyspringtime.cfapps.io/`. @@ -145,7 +145,7 @@ access application information (such as the public URL of the application) and s information (such as database credentials). See `CloudFoundryVcapEnvironmentPostProcessor` Javadoc for complete details. -TIP: The http://cloud.spring.io/spring-cloud-connectors/[Spring Cloud Connectors] project +TIP: The https://cloud.spring.io/spring-cloud-connectors/[Spring Cloud Connectors] project is a better fit for tasks such as configuring a DataSource. Spring Boot includes auto-configuration support and a `spring-boot-starter-cloud-connectors` starter POM. @@ -202,10 +202,10 @@ This should be everything you need. The most common workflow for Heroku deployme -----> Executing: mvn -B -DskipTests=true clean install [INFO] Scanning for projects... - Downloading: http://repo.spring.io/... - Downloaded: http://repo.spring.io/... (818 B at 1.8 KB/sec) + Downloading: https://repo.spring.io/... + Downloaded: https://repo.spring.io/... (818 B at 1.8 KB/sec) .... - Downloaded: http://s3pository.heroku.com/jvm/... (152 KB at 595.3 KB/sec) + Downloaded: https://s3pository.heroku.com/jvm/... (152 KB at 595.3 KB/sec) [INFO] Installing /tmp/build_0c35a5d2-a067-4abc-a232-14b1fb7a8229/target/... [INFO] Installing /tmp/build_0c35a5d2-a067-4abc-a232-14b1fb7a8229/pom.xml ... [INFO] ------------------------------------------------------------------------ @@ -221,7 +221,7 @@ This should be everything you need. The most common workflow for Heroku deployme -----> Compressing... *done*, 70.4MB -----> Launching... *done*, v6 - http://agile-sierra-1405.herokuapp.com/ *deployed to Heroku* + https://agile-sierra-1405.herokuapp.com/ *deployed to Heroku* To git@heroku.com:agile-sierra-1405.git * [new branch] master -> master @@ -344,7 +344,7 @@ and then configure and start the necessary resources on AWS: Payload started in 00:29.266s -> http://52.28.235.61/ Remapping Elastic IP 52.28.233.167 to i-92ef9f53 ... Waiting 15s for AWS to complete Elastic IP Zero Downtime transition ... - Deployment completed successfully. axelfontaine/myapp:1.0 is up and running at http://myapp-axelfontaine.boxfuse.io/ + Deployment completed successfully. axelfontaine/myapp:1.0 is up and running at https://myapp-axelfontaine.boxfuse.io/ ---- Your application should now be up and running on AWS. @@ -532,7 +532,7 @@ application. Note that unlike when running as an `init.d` service, user that runs the application, PID file and console log file behave differently under `systemd` and must be configured using appropriate fields in '`service`' script. Consult the -http://www.freedesktop.org/software/systemd/man/systemd.service.html[service unit +https://www.freedesktop.org/software/systemd/man/systemd.service.html[service unit configuration man page] for more details. To flag the application to start automatically on system boot use the following command: @@ -602,7 +602,7 @@ the default behavior in a script or on the command line: NOTE: The `PID_FOLDER`, `LOG_FOLDER` and `LOG_FILENAME` variables are only valid for an `init.d` service. With `systemd` the equivalent customizations are made using '`service`' script. Check the -http://www.freedesktop.org/software/systemd/man/systemd.service.html[service unit +https://www.freedesktop.org/software/systemd/man/systemd.service.html[service unit configuration man page] for more details. In addition, the following properties can be changed when the script is written by using @@ -671,7 +671,7 @@ your Spring Boot application. [[deployment-whats-next]] == What to read next -Check out the http://www.cloudfoundry.com/[Cloud Foundry], +Check out the https://www.cloudfoundry.org[Cloud Foundry], https://www.heroku.com/[Heroku], https://www.openshift.com[OpenShift] and https://boxfuse.com[Boxfuse] web sites for more information about the kinds of features that a PaaS can offer. These are just four of the most popular Java PaaS providers, since diff --git a/spring-boot-docs/src/main/asciidoc/documentation-overview.adoc b/spring-boot-docs/src/main/asciidoc/documentation-overview.adoc index 53ebc8f876..7fb6539212 100644 --- a/spring-boot-docs/src/main/asciidoc/documentation-overview.adoc +++ b/spring-boot-docs/src/main/asciidoc/documentation-overview.adoc @@ -31,10 +31,10 @@ Having trouble with Spring Boot, We'd like to help! * Try the <> -- they provide solutions to the most common questions. * Learn the Spring basics -- Spring Boot builds on many other Spring projects, check - the http://spring.io[spring.io] web-site for a wealth of reference documentation. If - you are just starting out with Spring, try one of the http://spring.io/guides[guides]. -* Ask a question - we monitor http://stackoverflow.com[stackoverflow.com] for questions - tagged with http://stackoverflow.com/tags/spring-boot[`spring-boot`]. + the https://spring.io[spring.io] web-site for a wealth of reference documentation. If + you are just starting out with Spring, try one of the https://spring.io/guides[guides]. +* Ask a question - we monitor https://stackoverflow.com[stackoverflow.com] for questions + tagged with https://stackoverflow.com/tags/spring-boot[`spring-boot`]. * Report bugs with Spring Boot at https://github.com/spring-projects/spring-boot/issues. NOTE: All of Spring Boot is open source, including the documentation! If you find problems diff --git a/spring-boot-docs/src/main/asciidoc/getting-started.adoc b/spring-boot-docs/src/main/asciidoc/getting-started.adoc index d5fe7af271..a484b5498b 100644 --- a/spring-boot-docs/src/main/asciidoc/getting-started.adoc +++ b/spring-boot-docs/src/main/asciidoc/getting-started.adoc @@ -36,7 +36,7 @@ diverge from the defaults. [[getting-started-system-requirements]] == System Requirements -By default, Spring Boot {spring-boot-version} requires http://www.java.com[Java 7] and +By default, Spring Boot {spring-boot-version} requires https://www.java.com[Java 7] and Spring Framework {spring-version} or above. You can use Spring Boot with Java 6 with some additional configuration. See <> for more details. Explicit build support is provided for Maven (3.2+) and Gradle (1.12 or 2.x). Gradle 3 is not @@ -79,7 +79,7 @@ You can also deploy Spring Boot applications to any Servlet 3.0+ compatible cont [[getting-started-installing-spring-boot]] == Installing Spring Boot Spring Boot can be used with "`classic`" Java development tools or installed as a command -line tool. Regardless, you will need http://www.java.com[Java SDK v1.6] or higher. You +line tool. Regardless, you will need https://www.java.com[Java SDK v1.6] or higher. You should check your current Java installation before you begin: [indent=0] @@ -112,7 +112,7 @@ build tool that supports dependency management (such as Maven or Gradle). [[getting-started-maven-installation]] ==== Maven installation Spring Boot is compatible with Apache Maven 3.2 or above. If you don't already have Maven -installed you can follow the instructions at http://maven.apache.org. +installed you can follow the instructions at https://maven.apache.org. TIP: On many operating systems Maven can be installed via a package manager. If you're an OSX Homebrew user try `brew install maven`. Ubuntu users can run @@ -131,7 +131,7 @@ Here is a typical `pom.xml` file: ---- + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example @@ -169,22 +169,22 @@ ifeval::["{spring-boot-repo}" != "release"] spring-snapshots - http://repo.spring.io/snapshot + https://repo.spring.io/snapshot true spring-milestones - http://repo.spring.io/milestone + https://repo.spring.io/milestone spring-snapshots - http://repo.spring.io/snapshot + https://repo.spring.io/snapshot spring-milestones - http://repo.spring.io/milestone + https://repo.spring.io/milestone endif::[] @@ -203,7 +203,7 @@ scope. ==== Gradle installation Spring Boot is compatible with Gradle 1.12 or 2.x. 2.14.1 is recommended. Gradle 3 is not supported. If you don't already have Gradle installed you can follow the instructions at -http://www.gradle.org/. +https://www.gradle.org/. Spring Boot dependencies can be declared using the `org.springframework.boot` `group`. Typically your project will declare dependencies to one or more @@ -226,8 +226,8 @@ Here is a typical `build.gradle` file: repositories { jcenter() ifndef::release[] - maven { url "http://repo.spring.io/snapshot" } - maven { url "http://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/milestone" } endif::release[] } dependencies { @@ -246,8 +246,8 @@ endif::release[] repositories { jcenter() ifndef::release[] - maven { url "http://repo.spring.io/snapshot" } - maven { url "http://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/milestone" } endif::release[] } @@ -262,7 +262,7 @@ endif::release[] [[getting-started-installing-the-cli]] === Installing the Spring Boot CLI The Spring Boot CLI is a command line tool that can be used if you want to quickly -prototype with Spring. It allows you to run http://groovy.codehaus.org/[Groovy] scripts, +prototype with Spring. It allows you to run https://groovy.codehaus.org/[Groovy] scripts, which means that you have a familiar Java-like syntax, without so much boilerplate code. You don't need to use the CLI to work with Spring Boot but it's definitely the quickest @@ -274,10 +274,10 @@ way to get a Spring application off the ground. ==== Manual installation You can download the Spring CLI distribution from the Spring software repository: -* http://repo.spring.io/{spring-boot-repo}/org/springframework/boot/spring-boot-cli/{spring-boot-version}/spring-boot-cli-{spring-boot-version}-bin.zip[spring-boot-cli-{spring-boot-version}-bin.zip] -* http://repo.spring.io/{spring-boot-repo}/org/springframework/boot/spring-boot-cli/{spring-boot-version}/spring-boot-cli-{spring-boot-version}-bin.tar.gz[spring-boot-cli-{spring-boot-version}-bin.tar.gz] +* https://repo.spring.io/{spring-boot-repo}/org/springframework/boot/spring-boot-cli/{spring-boot-version}/spring-boot-cli-{spring-boot-version}-bin.zip[spring-boot-cli-{spring-boot-version}-bin.zip] +* https://repo.spring.io/{spring-boot-repo}/org/springframework/boot/spring-boot-cli/{spring-boot-version}/spring-boot-cli-{spring-boot-version}-bin.tar.gz[spring-boot-cli-{spring-boot-version}-bin.tar.gz] -Cutting edge http://repo.spring.io/snapshot/org/springframework/boot/spring-boot-cli/[snapshot distributions] +Cutting edge https://repo.spring.io/snapshot/org/springframework/boot/spring-boot-cli/[snapshot distributions] are also available. Once downloaded, follow the {github-raw}/spring-boot-cli/src/main/content/INSTALL.txt[INSTALL.txt] @@ -292,7 +292,7 @@ classpath is set correctly). ==== Installation with SDKMAN! SDKMAN! (The Software Development Kit Manager) can be used for managing multiple versions of various binary SDKs, including Groovy and the Spring Boot CLI. -Get SDKMAN! from http://sdkman.io and install Spring Boot with +Get SDKMAN! from https://sdkman.io and install Spring Boot with [indent=0,subs="verbatim,quotes,attributes"] ---- @@ -339,7 +339,7 @@ You can see it by doing this: [[getting-started-homebrew-cli-installation]] ==== OSX Homebrew installation -If you are on a Mac and using http://brew.sh/[Homebrew], all you need to do to install +If you are on a Mac and using https://brew.sh/[Homebrew], all you need to do to install the Spring Boot CLI is: [indent=0] @@ -357,7 +357,7 @@ Just execute `brew update` and try again. [[getting-started-macports-cli-installation]] ==== MacPorts installation -If you are on a Mac and using http://www.macports.org/[MacPorts], all you need to do to +If you are on a Mac and using https://www.macports.org/[MacPorts], all you need to do to install the Spring Boot CLI is: [indent=0] @@ -370,8 +370,8 @@ install the Spring Boot CLI is: [[getting-started-cli-command-line-completion]] ==== Command-line completion Spring Boot CLI ships with scripts that provide command completion for -http://en.wikipedia.org/wiki/Bash_%28Unix_shell%29[BASH] and -http://en.wikipedia.org/wiki/Zsh[zsh] shells. You can `source` the script (also named +https://en.wikipedia.org/wiki/Bash_%2528Unix_shell%2529[BASH] and +https://en.wikipedia.org/wiki/Zsh[zsh] shells. You can `source` the script (also named `spring`) in any shell, or put it in your personal or system-wide bash completion initialization. On a Debian system the system-wide scripts are in `/shell-completion/bash` and all scripts in that directory are executed when a new shell starts. To run the script @@ -448,7 +448,7 @@ support it. [TIP] ==== -The http://spring.io[spring.io] web site contains many "`Getting Started`" guides +The https://spring.io[spring.io] web site contains many "`Getting Started`" guides that use Spring Boot. If you're looking to solve a specific problem; check there first. You can shortcut the steps below by going to https://start.spring.io and choosing the @@ -491,7 +491,7 @@ will be used to build your project. Open your favorite text editor and add the f ---- + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example @@ -511,22 +511,22 @@ ifeval::["{spring-boot-repo}" != "release"] spring-snapshots - http://repo.spring.io/snapshot + https://repo.spring.io/snapshot true spring-milestones - http://repo.spring.io/milestone + https://repo.spring.io/milestone spring-snapshots - http://repo.spring.io/snapshot + https://repo.spring.io/snapshot spring-milestones - http://repo.spring.io/milestone + https://repo.spring.io/milestone endif::[] @@ -803,12 +803,12 @@ As before, to gracefully exit the application hit `ctrl-c`. == What to read next Hopefully this section has provided you with some of the Spring Boot basics, and got you on your way to writing your own applications. If you're a task-oriented type of -developer you might want to jump over to http://spring.io and check out some of the -http://spring.io/guides/[getting started] guides that solve specific +developer you might want to jump over to https://spring.io and check out some of the +https://spring.io/guides/[getting started] guides that solve specific "`How do I do that with Spring`" problems; we also have Spring Boot-specific _<>_ reference documentation. -The http://github.com/{github-repo}[Spring Boot repository] has also a +The https://github.com/{github-repo}[Spring Boot repository] has also a {github-code}/spring-boot-samples[bunch of samples] you can run. The samples are independent of the rest of the code (that is you don't need to build the rest to run or use the samples). diff --git a/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-docs/src/main/asciidoc/howto.adoc index 9fd288f268..c871d321b9 100644 --- a/spring-boot-docs/src/main/asciidoc/howto.adoc +++ b/spring-boot-docs/src/main/asciidoc/howto.adoc @@ -8,7 +8,7 @@ that often arise when using Spring Boot. This is by no means an exhaustive list, does cover quite a lot. If you are having a specific problem that we don't cover here, you might want to check out -http://stackoverflow.com/tags/spring-boot[stackoverflow.com] to see if someone has +https://stackoverflow.com/tags/spring-boot[stackoverflow.com] to see if someone has already provided an answer; this is also a great place to ask new questions (please use the `spring-boot` tag). @@ -209,7 +209,7 @@ token of the `maven-resources-plugins` has been changed from `+${*}+` to `@` (i. `@maven.token@` instead of `${maven.token}`) to prevent conflicts with Spring-style placeholders. If you have enabled maven filtering for the `application.properties` directly, you may want to also change the default filter token to use -http://maven.apache.org/plugins/maven-resources-plugin/resources-mojo.html#delimiters[other delimiters]. +https://maven.apache.org/plugins/maven-resources-plugin/resources-mojo.html#delimiters[other delimiters]. NOTE: In this specific case the port binding will work in a PaaS environment like Heroku and Cloud Foundry, since in those two platforms the `PORT` environment variable is set @@ -1238,7 +1238,7 @@ have been applied from the auto-configuration: == Logging Spring Boot has no mandatory logging dependency, except for the `commons-logging` API, of -which there are many implementations to choose from. To use http://logback.qos.ch[Logback] +which there are many implementations to choose from. To use https://logback.qos.ch[Logback] you need to include it, and some bindings for `commons-logging` on the classpath. The simplest way to do that is through the starter poms which all depend on `spring-boot-starter-logging`. For a web application you only need @@ -1342,8 +1342,8 @@ You also need to add `logging.file` to your `application.properties`: [[howto-configure-log4j-for-logging]] === Configure Log4j for logging -Spring Boot also supports either http://logging.apache.org/log4j/1.2[Log4j] or -http://logging.apache.org/log4j/2.x[Log4j 2] for logging configuration, but only if one +Spring Boot also supports either https://logging.apache.org/log4j/1.2[Log4j] or +https://logging.apache.org/log4j/2.x[Log4j 2] for logging configuration, but only if one of them is on the classpath. If you are using the starter poms for assembling dependencies that means you have to exclude Logback and then include your chosen version of Log4j instead. If you aren't using the starter poms then you need to provide @@ -1731,8 +1731,8 @@ initialization explicitly using `spring.batch.initializer.enabled=false`. [[howto-use-a-higher-level-database-migration-tool]] === Use a higher level database migration tool -Spring Boot works fine with higher level migration tools http://flywaydb.org/[Flyway] -(SQL-based) and http://www.liquibase.org/[Liquibase] (XML). In general we prefer +Spring Boot works fine with higher level migration tools https://flywaydb.org/[Flyway] +(SQL-based) and https://www.liquibase.org/[Liquibase] (XML). In general we prefer Flyway because it is easier on the eyes, and it isn't very common to need platform independence: usually only one or at most couple of platforms is needed. @@ -1749,7 +1749,7 @@ addition Spring Boot provides a small set of properties in {sc-spring-boot-autoconfigure}/flyway/FlywayProperties.{sc-ext}[`FlywayProperties`] that can be used to disable the migrations, or switch off the location checking. -TIP: If you want to make use of http://flywaydb.org/documentation/callbacks.html[Flyway +TIP: If you want to make use of https://flywaydb.org/documentation/callbacks.html[Flyway callbacks], those scripts should also live in the `classpath:db/migration` folder. By default Flyway will autowire the (`@Primary`) `DataSource` in your context and @@ -1880,7 +1880,7 @@ for details of available settings) and `SECURITY` section of === Change the AuthenticationManager and add user accounts If you provide a `@Bean` of type `AuthenticationManager` the default one will not be created, so you have the full feature set of Spring Security available (e.g. -http://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#jc-authentication[various authentication options]). +https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#jc-authentication[various authentication options]). Spring Security also provides a convenient `AuthenticationManagerBuilder` which can be used to build an `AuthenticationManager` with common options. The recommended way to @@ -2024,7 +2024,7 @@ for other Velocity customization options. [[howto-reload-fast-restart]] === Fast application restarts The `spring-boot-devtools` module includes support for automatic application restarts. -Whilst not as fast a technologies such as http://zeroturnaround.com/software/jrebel/[JRebel] +Whilst not as fast a technologies such as https://zeroturnaround.com/software/jrebel/[JRebel] or https://github.com/spring-projects/spring-loaded[Spring Loaded] it's usually significantly faster than a "`cold start`". You should probably give it a try before investigating some of the more complex reload options discussed below. @@ -2577,7 +2577,7 @@ For a non-web application it should be easy (throw away the code that creates yo `ApplicationContext` and replace it with calls to `SpringApplication` or `SpringApplicationBuilder`). Spring MVC web applications are generally amenable to first creating a deployable war application, and then migrating it later to an executable war -and/or jar. Useful reading is in the http://spring.io/guides/gs/convert-jar-to-war/[Getting +and/or jar. Useful reading is in the https://spring.io/guides/gs/convert-jar-to-war/[Getting Started Guide on Converting a jar to a war]. Create a deployable war by extending `SpringBootServletInitializer` (e.g. in a class @@ -2692,9 +2692,9 @@ rather than the version that pre-installed with the server. You can do this by a xmlns:wls="http://xmlns.oracle.com/weblogic/weblogic-web-app" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee - http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd + https://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd http://xmlns.oracle.com/weblogic/weblogic-web-app - http://xmlns.oracle.com/weblogic/weblogic-web-app/1.4/weblogic-web-app.xsd"> + https://xmlns.oracle.com/weblogic/weblogic-web-app/1.4/weblogic-web-app.xsd"> org.slf4j @@ -2722,7 +2722,7 @@ but the rest of it is normal for a Spring application in Servlet 2.5. Example: + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee https://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> contextConfigLocation diff --git a/spring-boot-docs/src/main/asciidoc/index.adoc b/spring-boot-docs/src/main/asciidoc/index.adoc index b244b33774..9cba979189 100644 --- a/spring-boot-docs/src/main/asciidoc/index.adoc +++ b/spring-boot-docs/src/main/asciidoc/index.adoc @@ -10,13 +10,13 @@ Phillip Webb; Dave Syer; Josh Long; Stéphane Nicoll; Rob Winch; Andy Wilkinson; :spring-boot-repo: snapshot :github-tag: master :spring-boot-docs-version: current -:spring-boot-docs: http://docs.spring.io/spring-boot/docs/{spring-boot-docs-version}/reference -:spring-boot-docs-current: http://docs.spring.io/spring-boot/docs/current/reference +:spring-boot-docs: https://docs.spring.io/spring-boot/docs/{spring-boot-docs-version}/reference +:spring-boot-docs-current: https://docs.spring.io/spring-boot/docs/current/reference :github-repo: spring-projects/spring-boot -:github-raw: http://raw.github.com/{github-repo}/{github-tag} -:github-code: http://github.com/{github-repo}/tree/{github-tag} -:github-wiki: http://github.com/{github-repo}/wiki -:github-master-code: http://github.com/{github-repo}/tree/master +:github-raw: https://raw.github.com/{github-repo}/{github-tag} +:github-code: https://github.com/{github-repo}/tree/{github-tag} +:github-wiki: https://github.com/{github-repo}/wiki +:github-master-code: https://github.com/{github-repo}/tree/master :sc-ext: java :sc-spring-boot: {github-code}/spring-boot/src/main/java/org/springframework/boot :sc-spring-boot-autoconfigure: {github-code}/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure @@ -24,24 +24,24 @@ Phillip Webb; Dave Syer; Josh Long; Stéphane Nicoll; Rob Winch; Andy Wilkinson; :sc-spring-boot-cli: {github-code}/spring-boot-cli/src/main/java/org/springframework/boot/cli :sc-spring-boot-devtools: {github-code}/spring-boot-devtools/src/main/java/org/springframework/boot/devtools :dc-ext: html -:dc-root: http://docs.spring.io/spring-boot/docs/{spring-boot-docs-version}/api +:dc-root: https://docs.spring.io/spring-boot/docs/{spring-boot-docs-version}/api :dc-spring-boot: {dc-root}/org/springframework/boot :dc-spring-boot-autoconfigure: {dc-root}/org/springframework/boot/autoconfigure :dc-spring-boot-actuator: {dc-root}/org/springframework/boot/actuate :dependency-management-plugin: https://github.com/spring-gradle-plugins/dependency-management-plugin :dependency-management-plugin-documentation: {dependency-management-plugin}/blob/master/README.md -:spring-boot-maven-plugin-site: http://docs.spring.io/spring-boot/docs/{spring-boot-docs-version}/maven-plugin -:spring-reference: http://docs.spring.io/spring/docs/{spring-docs-version}/spring-framework-reference/htmlsingle -:spring-security-reference: http://docs.spring.io/spring-security/site/docs/{spring-security-docs-version}/reference/htmlsingle -:spring-javadoc: http://docs.spring.io/spring/docs/{spring-docs-version}/javadoc-api/org/springframework -:spring-amqp-javadoc: http://docs.spring.io/spring-amqp/docs/current/api/org/springframework/amqp -:spring-data-javadoc: http://docs.spring.io/spring-data/jpa/docs/current/api/org/springframework/data/jpa -:spring-data-commons-javadoc: http://docs.spring.io/spring-data/commons/docs/current/api/org/springframework/data -:spring-data-mongo-javadoc: http://docs.spring.io/spring-data/mongodb/docs/current/api/org/springframework/data/mongodb -:spring-data-rest-javadoc: http://docs.spring.io/spring-data/rest/docs/current/api/org/springframework/data/rest -:gradle-userguide: http://www.gradle.org/docs/current/userguide +:spring-boot-maven-plugin-site: https://docs.spring.io/spring-boot/docs/{spring-boot-docs-version}/maven-plugin +:spring-reference: https://docs.spring.io/spring/docs/{spring-docs-version}/spring-framework-reference/htmlsingle +:spring-security-reference: https://docs.spring.io/spring-security/site/docs/{spring-security-docs-version}/reference/htmlsingle +:spring-javadoc: https://docs.spring.io/spring/docs/{spring-docs-version}/javadoc-api/org/springframework +:spring-amqp-javadoc: https://docs.spring.io/spring-amqp/docs/current/api/org/springframework/amqp +:spring-data-javadoc: https://docs.spring.io/spring-data/jpa/docs/current/api/org/springframework/data/jpa +:spring-data-commons-javadoc: https://docs.spring.io/spring-data/commons/docs/current/api/org/springframework/data +:spring-data-mongo-javadoc: https://docs.spring.io/spring-data/mongodb/docs/current/api/org/springframework/data/mongodb +:spring-data-rest-javadoc: https://docs.spring.io/spring-data/rest/docs/current/api/org/springframework/data/rest +:gradle-userguide: https://www.gradle.org/docs/current/userguide :propdeps-plugin: https://github.com/spring-projects/gradle-plugins/tree/master/propdeps-plugin -:ant-manual: http://ant.apache.org/manual +:ant-manual: https://ant.apache.org/manual :gradle-user-guide: https://docs.gradle.org/2.14.1/userguide :gradle-dsl: https://docs.gradle.org/2.14.1/dsl // ====================================================================================== diff --git a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc index 74859b4897..293e4e139b 100644 --- a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc @@ -187,9 +187,9 @@ For example, to mark _all_ endpoints as sensitive except `info`: [[production-ready-endpoint-hypermedia]] === Hypermedia for actuator MVC endpoints -If http://projects.spring.io/spring-hateoas[Spring HATEOAS] is on the classpath (e.g. +If https://projects.spring.io/spring-hateoas[Spring HATEOAS] is on the classpath (e.g. through the `spring-boot-starter-hateoas` or if you are using -http://projects.spring.io/spring-data-rest[Spring Data REST]) then the HTTP endpoints +https://projects.spring.io/spring-data-rest[Spring Data REST]) then the HTTP endpoints from the Actuator are enhanced with hypermedia links, and a "`discovery page`" is added with links to all the endpoints. The "`discovery page`" is available on `/actuator` by default. It is implemented as an endpoint, allowing properties to be used to configure @@ -209,8 +209,8 @@ an HTML "`discovery page`", in the form of the HAL Browser, is also provided. [[production-ready-endpoint-cors]] === CORS support -http://en.wikipedia.org/wiki/Cross-origin_resource_sharing[Cross-origin resource sharing] -(CORS) is a http://www.w3.org/TR/cors/[W3C specification] that allows you to specify in a +https://en.wikipedia.org/wiki/Cross-origin_resource_sharing[Cross-origin resource sharing] +(CORS) is a https://www.w3.org/TR/cors/[W3C specification] that allows you to specify in a flexible way what kind of cross domain requests are authorized. Actuator's MVC endpoints can be configured to support such scenarios. @@ -220,7 +220,7 @@ CORS support is disabled by default and is only enabled once the [source,properties,indent=0] ---- - endpoints.cors.allowed-origins=http://example.com + endpoints.cors.allowed-origins=https://example.com endpoints.cors.allowed-methods=GET,POST ---- @@ -802,7 +802,7 @@ authentication will be applied and you should see a message like this: ---- Linux and OSX users can use `ssh` to connect to the remote shell, Windows users can -download and install http://www.putty.org/[PuTTY]. +download and install https://www.putty.org/[PuTTY]. [indent=0,subs="attributes"] ---- @@ -900,7 +900,7 @@ In addition to new commands, it is also possible to extend other CRaSH shell fea All Spring Beans that extend `org.crsh.plugin.CRaSHPlugin` will be automatically registered with the shell. -For more information please refer to the http://www.crashub.org/[CRaSH reference +For more information please refer to the https://www.crashub.org/[CRaSH reference documentation]. @@ -1076,7 +1076,7 @@ Here is a simple example that counts the number of times that a method is invoke TIP: You can use any string as a metric name but you should follow guidelines of your chosen store/graphing technology. Some good guidelines for Graphite are available on -http://matt.aimonetti.net/posts/2013/06/26/practical-guide-to-graphite-monitoring/[Matt Aimonetti's Blog]. +https://matt.aimonetti.net/posts/2013/06/26/practical-guide-to-graphite-monitoring/[Matt Aimonetti's Blog]. @@ -1461,7 +1461,7 @@ customize the file name and path via the `Writer` constructor. == What to read next If you want to explore some of the concepts discussed in this chapter, you can take a look at the actuator {github-code}/spring-boot-samples[sample applications]. You also -might want to read about graphing tools such as http://graphite.wikidot.com/[Graphite]. +might want to read about graphing tools such as https://graphite.wikidot.com/[Graphite]. Otherwise, you can continue on, to read about <> or jump ahead diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-cli.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-cli.adoc index 8a767fe134..99d2b93f68 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-cli.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-cli.adoc @@ -247,7 +247,7 @@ You can use `@DependencyManagementBom` anywhere that you can use `@Grab`, howeve ensure consistent ordering of the dependency management, you can only use `@DependencyManagementBom` at most once in your application. A useful source of dependency management (that is a superset of Spring Boot's dependency management) is the -http://platform.spring.io/[Spring IO Platform], e.g. +https://platform.spring.io/[Spring IO Platform], e.g. `@DependencyManagementBom('io.spring.platform:platform-bom:1.1.2.RELEASE')`. @@ -457,7 +457,7 @@ To uninstall all additional dependencies you can use the `--all` option. For exa [[cli-groovy-beans-dsl]] == Developing application with the Groovy beans DSL Spring Framework 4.0 has native support for a `beans{}` "`DSL`" (borrowed from -http://grails.org/[Grails]), and you can embed bean definitions in your Groovy +https://grails.org/[Grails]), and you can embed bean definitions in your Groovy application scripts using the same format. This is sometimes a good way to include external features like middleware declarations. For example: diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 49ff8f7c66..096ab287f8 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -536,10 +536,10 @@ for details. [[boot-features-external-config-yaml]] === Using YAML instead of Properties -http://yaml.org[YAML] is a superset of JSON, and as such is a very convenient format +https://yaml.org[YAML] is a superset of JSON, and as such is a very convenient format for specifying hierarchical configuration data. The `SpringApplication` class will automatically support YAML as an alternative to properties whenever you have the -http://www.snakeyaml.org/[SnakeYAML] library on your classpath. +https://bitbucket.org/asomov/snakeyaml[SnakeYAML] library on your classpath. NOTE: If you use '`starter POMs`' SnakeYAML will be automatically provided via `spring-boot-starter`. @@ -558,10 +558,10 @@ For example, the following YAML document: ---- environments: dev: - url: http://dev.bar.com + url: https://dev.bar.com name: Developer Setup prod: - url: http://foo.bar.com + url: https://foo.bar.com name: My Cool App ---- @@ -569,9 +569,9 @@ Would be transformed into these properties: [source,properties,indent=0] ---- - environments.dev.url=http://dev.bar.com + environments.dev.url=https://dev.bar.com environments.dev.name=Developer Setup - environments.prod.url=http://foo.bar.com + environments.prod.url=https://foo.bar.com environments.prod.name=My Cool App ---- @@ -1005,12 +1005,12 @@ See _<>_ for details. [[boot-features-logging]] == Logging -Spring Boot uses http://commons.apache.org/logging[Commons Logging] for all internal +Spring Boot uses https://commons.apache.org/logging[Commons Logging] for all internal logging, but leaves the underlying log implementation open. Default configurations are provided for -http://docs.oracle.com/javase/7/docs/api/java/util/logging/package-summary.html[Java Util Logging], -http://logging.apache.org/log4j/[Log4J], http://logging.apache.org/log4j/2.x/[Log4J2] and -http://logback.qos.ch/[Logback]. In each case loggers are pre-configured to use console +https://docs.oracle.com/javase/7/docs/api/java/util/logging/package-summary.html[Java Util Logging], +https://logging.apache.org/log4j/[Log4J], https://logging.apache.org/log4j/2.x/[Log4J2] and +https://logback.qos.ch/[Logback]. In each case loggers are pre-configured to use console output with optional file output also available. By default, If you use the '`Starter POMs`', Logback will be used for logging. Appropriate @@ -1396,7 +1396,7 @@ Here is a typical example `@RestController` to serve JSON data: Spring MVC is part of the core Spring Framework and detailed information is available in the {spring-reference}#mvc[reference documentation]. There are also several guides -available at http://spring.io/guides that cover Spring MVC. +available at https://spring.io/guides that cover Spring MVC. @@ -1489,7 +1489,7 @@ default welcome page detection will switch to your custom locations, so if there application. In addition to the '`standard`' static resource locations above, a special case is made -for http://www.webjars.org/[Webjars content]. Any resources with a path in `+/webjars/**+` +for https://www.webjars.org/[Webjars content]. Any resources with a path in `+/webjars/**+` will be served from jar files if they are packaged in the Webjars format. TIP: Do not use the `src/main/webapp` directory if your application will be packaged as a @@ -1562,11 +1562,11 @@ and JSPs. Many other templating engines also ship their own Spring MVC integrati Spring Boot includes auto-configuration support for the following templating engines: - * http://freemarker.org/docs/[FreeMarker] + * https://freemarker.apache.org/docs[FreeMarker] * http://docs.groovy-lang.org/docs/next/html/documentation/template-engines.html#_the_markuptemplateengine[Groovy] - * http://www.thymeleaf.org[Thymeleaf] - * http://velocity.apache.org[Velocity] - * http://mustache.github.io/[Mustache] + * https://www.thymeleaf.org[Thymeleaf] + * https://velocity.apache.org[Velocity] + * https://mustache.github.io/[Mustache] TIP: JSPs should be avoided if possible, there are several <> when using them with embedded @@ -1710,9 +1710,9 @@ described above. [[boot-features-cors]] ==== CORS support -http://en.wikipedia.org/wiki/Cross-origin_resource_sharing[Cross-origin resource sharing] -(CORS) is a http://www.w3.org/TR/cors/[W3C specification] implemented by -http://caniuse.com/#feat=cors[most browsers] that allows you to specify in a flexible +https://en.wikipedia.org/wiki/Cross-origin_resource_sharing[Cross-origin resource sharing] +(CORS) is a https://www.w3.org/TR/cors/[W3C specification] implemented by +https://caniuse.com/#feat=cors[most browsers] that allows you to specify in a flexible way what kind of cross domain requests are authorized, instead of using some less secure and less powerful approaches like IFRAME or JSONP. @@ -2295,8 +2295,8 @@ data when your application ends. TIP: The '`How-to`' section includes a _<>_ -Spring Boot can auto-configure embedded http://www.h2database.com[H2], -http://hsqldb.org/[HSQL] and http://db.apache.org/derby/[Derby] databases. You don't need +Spring Boot can auto-configure embedded https://www.h2database.com[H2], +http://hsqldb.org/[HSQL] and https://db.apache.org/derby/[Derby] databases. You don't need to provide any connection URLs, simply include a build dependency to the embedded database that you want to use. @@ -2377,7 +2377,7 @@ using the `+spring.datasource.*+` prefix, refer to the documentation of the conn implementation you are using for more details. For instance, if you are using the -http://tomcat.apache.org/tomcat-8.0-doc/jdbc-pool.html#Common_Attributes[Tomcat connection pool] +https://tomcat.apache.org/tomcat-8.0-doc/jdbc-pool.html#Common_Attributes[Tomcat connection pool] you could customize many additional settings: @@ -2453,9 +2453,9 @@ started. It provides the following key dependencies: * Spring ORMs -- Core ORM support from the Spring Framework. TIP: We won't go into too many details of JPA or Spring Data here. You can follow the -http://spring.io/guides/gs/accessing-data-jpa/['`Accessing Data with JPA`'] guide from -http://spring.io and read the http://projects.spring.io/spring-data-jpa/[Spring Data JPA] -and http://hibernate.org/orm/documentation/[Hibernate] reference documentation. +https://spring.io/guides/gs/accessing-data-jpa/['`Accessing Data with JPA`'] guide from +https://spring.io and read the https://projects.spring.io/spring-data-jpa/[Spring Data JPA] +and https://hibernate.org/orm/documentation/[Hibernate] reference documentation. @@ -2555,7 +2555,7 @@ Here is a typical Spring Data repository: ---- TIP: We have barely scratched the surface of Spring Data JPA. For complete details check -their http://projects.spring.io/spring-data-jpa/[reference documentation]. +their https://projects.spring.io/spring-data-jpa/[reference documentation]. @@ -2591,8 +2591,8 @@ Hibernate autoconfig is active because the `ddl-auto` settings are more fine-gra [[boot-features-sql-h2-console]] === Using H2's web console -The http://www.h2database.com[H2 database] provides a -http://www.h2database.com/html/quickstart.html#h2_console[browser-based console] that +The https://www.h2database.com[H2 database] provides a +https://www.h2database.com/html/quickstart.html#h2_console[browser-based console] that Spring Boot can auto-configure for you. The console will be auto-configured when the following conditions are met: @@ -2630,8 +2630,8 @@ the security configuration: [[boot-features-jooq]] == Using jOOQ -Java Object Oriented Querying (http://www.jooq.org/[jOOQ]) is a popular product from -http://www.datageekery.com/[Data Geekery] which generates Java code from your +Java Object Oriented Querying (https://www.jooq.org/[jOOQ]) is a popular product from +https://www.datageekery.com/[Data Geekery] which generates Java code from your database, and lets you build type safe SQL queries through its fluent API. Both the commercial and open source editions can be used with Spring Boot. @@ -2640,7 +2640,7 @@ commercial and open source editions can be used with Spring Boot. === Code Generation In order to use jOOQ type-safe queries, you need to generate Java classes from your database schema. You can follow the instructions in the -http://www.jooq.org/doc/3.6/manual-single-page/#jooq-in-7-steps-step3[jOOQ user manual]. +https://www.jooq.org/doc/3.6/manual-single-page/#jooq-in-7-steps-step3[jOOQ user manual]. If you are using the `jooq-codegen-maven` plugin (and you also use the `spring-boot-starter-parent` "`parent POM`") you can safely omit the plugin's `` tag. You can also use Spring Boot defined version variables (e.g. `h2.version`) to @@ -2740,24 +2740,24 @@ complete control of the jOOQ configuration. == Working with NoSQL technologies Spring Data provides additional projects that help you access a variety of NoSQL technologies including -http://projects.spring.io/spring-data-mongodb/[MongoDB], -http://projects.spring.io/spring-data-neo4j/[Neo4J], +https://projects.spring.io/spring-data-mongodb/[MongoDB], +https://projects.spring.io/spring-data-neo4j/[Neo4J], https://github.com/spring-projects/spring-data-elasticsearch/[Elasticsearch], -http://projects.spring.io/spring-data-solr/[Solr], -http://projects.spring.io/spring-data-redis/[Redis], -http://projects.spring.io/spring-data-gemfire/[Gemfire], -http://projects.spring.io/spring-data-couchbase/[Couchbase] and -http://projects.spring.io/spring-data-cassandra/[Cassandra]. +https://projects.spring.io/spring-data-solr/[Solr], +https://projects.spring.io/spring-data-redis/[Redis], +https://projects.spring.io/spring-data-gemfire/[Gemfire], +https://projects.spring.io/spring-data-couchbase/[Couchbase] and +https://projects.spring.io/spring-data-cassandra/[Cassandra]. Spring Boot provides auto-configuration for Redis, MongoDB, Elasticsearch, Solr and Cassandra; you can make use of the other projects, but you will need to configure them yourself. Refer to the appropriate reference documentation at -http://projects.spring.io/spring-data[projects.spring.io/spring-data]. +https://projects.spring.io/spring-data[projects.spring.io/spring-data]. [[boot-features-redis]] === Redis -http://redis.io/[Redis] is a cache, message broker and richly-featured key-value store. +https://redis.io/[Redis] is a cache, message broker and richly-featured key-value store. Spring Boot offers basic auto-configuration for the https://github.com/xetorthio/jedis/[Jedis] client library and abstractions on top of it provided by https://github.com/spring-projects/spring-data-redis[Spring Data Redis]. There @@ -2798,7 +2798,7 @@ pooled connection factory by default. [[boot-features-mongodb]] === MongoDB -http://www.mongodb.com/[MongoDB] is an open-source NoSQL document database that uses a +https://www.mongodb.com/[MongoDB] is an open-source NoSQL document database that uses a JSON-like schema instead of traditional table-based relational data. Spring Boot offers several conveniences for working with MongoDB, including the `spring-boot-starter-data-mongodb` '`Starter POM`'. @@ -2927,7 +2927,7 @@ is now a Mongo data class rather than a JPA `@Entity`, it will work in the same ---- TIP: For complete details of Spring Data MongoDB, including its rich object mapping -technologies, refer to their http://projects.spring.io/spring-data-mongodb/[reference +technologies, refer to their https://projects.spring.io/spring-data-mongodb/[reference documentation]. @@ -2956,7 +2956,7 @@ Mongo instance's configuration and logging routing. === Gemfire https://github.com/spring-projects/spring-data-gemfire[Spring Data Gemfire] provides convenient Spring-friendly tools for accessing the -http://pivotal.io/big-data/pivotal-gemfire#details[Pivotal Gemfire] data management +https://pivotal.io/big-data/pivotal-gemfire#details[Pivotal Gemfire] data management platform. There is a `spring-boot-starter-data-gemfire` '`Starter POM`' for collecting the dependencies in a convenient way. There is currently no auto-configuration support for Gemfire, but you can enable Spring Data Repositories with a @@ -2966,7 +2966,7 @@ https://github.com/spring-projects/spring-data-gemfire/blob/master/src/main/java [[boot-features-solr]] === Solr -http://lucene.apache.org/solr/[Apache Solr] is a search engine. Spring Boot offers basic +https://lucene.apache.org/solr/[Apache Solr] is a search engine. Spring Boot offers basic auto-configuration for the Solr 4 client library and abstractions on top of it provided by https://github.com/spring-projects/spring-data-solr[Spring Data Solr]. There is a `spring-boot-starter-data-solr` '`Starter POM`' for collecting the dependencies in a @@ -3015,13 +3015,13 @@ so you could take the JPA example from earlier and, assuming that `City` is now `@SolrDocument` class rather than a JPA `@Entity`, it will work in the same way. TIP: For complete details of Spring Data Solr, refer to their -http://projects.spring.io/spring-data-solr/[reference documentation]. +https://projects.spring.io/spring-data-solr/[reference documentation]. [[boot-features-elasticsearch]] === Elasticsearch -http://www.elasticsearch.org/[Elasticsearch] is an open source, distributed, +https://www.elastic.co/[Elasticsearch] is an open source, distributed, real-time search and analytics engine. Spring Boot offers basic auto-configuration for the Elasticsearch and abstractions on top of it provided by https://github.com/spring-projects/spring-data-elasticsearch[Spring Data Elasticsearch]. @@ -3072,13 +3072,13 @@ infrastructure; so you could take the JPA example from earlier and, assuming tha work in the same way. TIP: For complete details of Spring Data Elasticsearch, refer to their -http://docs.spring.io/spring-data/elasticsearch/docs/[reference documentation]. +https://docs.spring.io/spring-data/elasticsearch/docs/[reference documentation]. [[boot-features-cassandra]] === Cassandra -http://cassandra.apache.org/[Cassandra] is an open source, distributed database management +https://cassandra.apache.org/[Cassandra] is an open source, distributed database management system designed to handle large amounts of data across many commodity servers. Spring Boot offers auto-configuration for Cassandra and abstractions on top of it provided by https://github.com/spring-projects/spring-data-cassandra[Spring Data Cassandra]. @@ -3129,7 +3129,7 @@ limited than the JPA repositories discussed earlier, and will need to annotate f methods with `@Query`. TIP: For complete details of Spring Data Cassandra, refer to their -http://docs.spring.io/spring-data/cassandra/docs/[reference documentation]. +https://docs.spring.io/spring-data/cassandra/docs/[reference documentation]. @@ -3609,7 +3609,7 @@ RabbitMQ configuration is controlled by external configuration properties in See {sc-spring-boot-autoconfigure}/amqp/RabbitProperties.{sc-ext}[`RabbitProperties`] for more of the supported options. -TIP: Check http://spring.io/blog/2010/06/14/understanding-amqp-the-protocol-used-by-rabbitmq/[Understanding AMQP, the protocol used by RabbitMQ] +TIP: Check https://spring.io/blog/2010/06/14/understanding-amqp-the-protocol-used-by-rabbitmq/[Understanding AMQP, the protocol used by RabbitMQ] for more details. @@ -3738,7 +3738,7 @@ details. [[boot-features-jta]] == Distributed Transactions with JTA Spring Boot supports distributed JTA transactions across multiple XA resources using -either an http://www.atomikos.com/[Atomikos] or https://github.com/bitronix/btm[Bitronix] +either an https://www.atomikos.com/[Atomikos] or https://github.com/bitronix/btm[Bitronix] embedded transaction manager. JTA transactions are also supported when deploying to a suitable Java EE Application Server. @@ -3881,7 +3881,7 @@ You could also specify the `hazelcast.xml` configuration file to use via configu Otherwise, Spring Boot tries to find the Hazelcast configuration from the default locations, that is `hazelcast.xml` in the working directory or at the root of the classpath. We also check if the `hazelcast.config` system property is set. Check the -http://docs.hazelcast.org/docs/latest/manual/html-single/[Hazelcast documentation] for +https://docs.hazelcast.org/docs/latest/manual/html-single/[Hazelcast documentation] for more details. NOTE: Spring Boot also has an @@ -4165,7 +4165,7 @@ public class MyTest { @Test public void testRequest() throws Exception { - HttpHeaders headers = template.getForEntity("http://myhost.com", String.class).getHeaders(); + HttpHeaders headers = template.getForEntity("https://myhost.com", String.class).getHeaders(); assertThat(headers.getLocation().toString(), containsString("myotherhost")); } @@ -4249,7 +4249,7 @@ code by annotating `@Configuration` classes or individual `@Bean` methods. ==== Class conditions The `@ConditionalOnClass` and `@ConditionalOnMissingClass` annotations allows configuration to be included based on the presence or absence of specific classes. Due to -the fact that annotation metadata is parsed using http://asm.ow2.org/[ASM] you can +the fact that annotation metadata is parsed using https://asm.ow2.org/[ASM] you can actually use the `value` attribute to refer to the real class, even though that class might not actually appear on the running application classpath. You can also use the `name` attribute if you prefer to specify the class name using a `String` value. diff --git a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc index 5bcb239a34..cb44ae311a 100644 --- a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc +++ b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc @@ -60,10 +60,10 @@ defaults. The parent project provides the following features: omit `` tags for common dependencies, inherited from the `spring-boot-dependencies` POM. * Sensible https://maven.apache.org/plugins/maven-resources-plugin/examples/filter.html[resource filtering]. -* Sensible plugin configuration (http://www.mojohaus.org/exec-maven-plugin/[exec plugin], - http://maven.apache.org/surefire/maven-surefire-plugin/[surefire], +* Sensible plugin configuration (https://www.mojohaus.org/exec-maven-plugin/[exec plugin], + https://maven.apache.org/surefire/maven-surefire-plugin/[surefire], https://github.com/ktoso/maven-git-commit-id-plugin[Git commit ID], - http://maven.apache.org/plugins/maven-shade-plugin/[shade]). + https://maven.apache.org/plugins/maven-shade-plugin/[shade]). * Sensible resource filtering for `application.properties` and `application.yml` On the last point: since the default config files accept @@ -217,8 +217,8 @@ Maven, there is no "`super parent`" to import to share some configuration. repositories { ifeval::["{spring-boot-repo}" != "release"] - maven { url "http://repo.spring.io/snapshot" } - maven { url "http://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/milestone" } endif::[] ifeval::["{spring-boot-repo}" == "release"] jcenter() @@ -242,8 +242,8 @@ managed by Spring Boot: buildscript { repositories { ifeval::["{spring-boot-repo}" != "release"] - maven { url "http://repo.spring.io/snapshot" } - maven { url "http://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/milestone" } endif::[] ifeval::["{spring-boot-repo}" == "release"] jcenter() @@ -260,8 +260,8 @@ endif::[] repositories { ifeval::["{spring-boot-repo}" != "release"] - maven { url "http://repo.spring.io/snapshot" } - maven { url "http://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/milestone" } endif::[] ifeval::["{spring-boot-repo}" == "release"] jcenter() @@ -789,8 +789,8 @@ can select `Import...` -> `Existing Maven Projects` from the `File` menu. If you can't directly import your project into your IDE, you may be able to generate IDE metadata using a build plugin. Maven includes plugins for -http://maven.apache.org/plugins/maven-eclipse-plugin/[Eclipse] and -http://maven.apache.org/plugins/maven-idea-plugin/[IDEA]; Gradle offers plugins +https://maven.apache.org/plugins/maven-eclipse-plugin/[Eclipse] and +https://maven.apache.org/plugins/maven-idea-plugin/[IDEA]; Gradle offers plugins for {gradle-user-guide}/userguide.html[various IDEs]. TIP: If you accidentally run a web application twice you will see a "`Port already in @@ -867,7 +867,7 @@ You might also want to use this useful operating system environment variable: Since Spring Boot applications are just plain Java applications, JVM hot-swapping should work out of the box. JVM hot swapping is somewhat limited with the bytecode that it can replace, for a more complete solution -http://zeroturnaround.com/software/jrebel/[JRebel] or the +https://zeroturnaround.com/software/jrebel/[JRebel] or the https://github.com/spring-projects/spring-loaded[Spring Loaded] project can be used. The `spring-boot-devtools` module also includes support for quick application restarts. @@ -1011,7 +1011,7 @@ populated. If you find that restarts aren't quick enough for your applications, or you encounter classloading issues, you could consider reloading technologies such as -http://zeroturnaround.com/software/jrebel/[JRebel] from ZeroTurnaround. These work by +https://zeroturnaround.com/software/jrebel/[JRebel] from ZeroTurnaround. These work by rewriting classes as they are loaded to make them more amenable to reloading. https://github.com/spring-projects/spring-loaded[Spring Loaded] provides another option, however it doesn't support as many frameworks and it isn't commercially supported. diff --git a/spring-boot-docs/src/main/docbook/xsl/common.xsl b/spring-boot-docs/src/main/docbook/xsl/common.xsl index 5552ee8fb4..5198d622e6 100644 --- a/spring-boot-docs/src/main/docbook/xsl/common.xsl +++ b/spring-boot-docs/src/main/docbook/xsl/common.xsl @@ -20,7 +20,7 @@ --> diff --git a/spring-boot-docs/src/main/docbook/xsl/epub.xsl b/spring-boot-docs/src/main/docbook/xsl/epub.xsl index ce6388753b..5484bb99b7 100644 --- a/spring-boot-docs/src/main/docbook/xsl/epub.xsl +++ b/spring-boot-docs/src/main/docbook/xsl/epub.xsl @@ -20,7 +20,7 @@ under the License. --> diff --git a/spring-boot-docs/src/main/docbook/xsl/html.xsl b/spring-boot-docs/src/main/docbook/xsl/html.xsl index 550ebc442e..9f036995ec 100644 --- a/spring-boot-docs/src/main/docbook/xsl/html.xsl +++ b/spring-boot-docs/src/main/docbook/xsl/html.xsl @@ -20,7 +20,7 @@ under the License. --> diff --git a/spring-boot-docs/src/main/docbook/xsl/pdf.xsl b/spring-boot-docs/src/main/docbook/xsl/pdf.xsl index 3fe8c6879c..47dba55251 100644 --- a/spring-boot-docs/src/main/docbook/xsl/pdf.xsl +++ b/spring-boot-docs/src/main/docbook/xsl/pdf.xsl @@ -22,7 +22,7 @@ under the License.
    - Freemarker - + Freemarker - Plain
    • Home
      • diff --git a/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/home.ftl b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/home.ftl index fb64810660..6271abb5f8 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/home.ftl +++ b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/home.ftl @@ -11,7 +11,7 @@
      - Freemarker - + Freemarker - Plain
      • Home
        • diff --git a/spring-boot-samples/spring-boot-sample-atmosphere/src/main/resources/static/javascript/jquery-1.9.0.js b/spring-boot-samples/spring-boot-sample-atmosphere/src/main/resources/static/javascript/jquery-1.9.0.js index ad1374a6aa..d72d4257df 100644 --- a/spring-boot-samples/spring-boot-sample-atmosphere/src/main/resources/static/javascript/jquery-1.9.0.js +++ b/spring-boot-samples/spring-boot-sample-atmosphere/src/main/resources/static/javascript/jquery-1.9.0.js @@ -1,13 +1,13 @@ /*! * jQuery JavaScript Library v1.9.0 - * http://jquery.com/ + * https://jquery.com/ * * Includes Sizzle.js - * http://sizzlejs.com/ + * https://sizzlejs.com/ * * Copyright 2005, 2012 jQuery Foundation, Inc. and other contributors * Released under the MIT license - * http://jquery.org/license + * https://jquery.org/license * * Date: 2013-1-14 */ @@ -535,7 +535,7 @@ jQuery.extend({ if ( data ) { // Make sure the incoming data is actual JSON - // Logic borrowed from http://json.org/json2.js + // Logic borrowed from https://json.org/json2.js if ( rvalidchars.test( data.replace( rvalidescape, "@" ) .replace( rvalidtokens, "]" ) .replace( rvalidbraces, "")) ) { @@ -576,7 +576,7 @@ jQuery.extend({ // Evaluates a script in a global context // Workarounds based on findings by Jim Driscoll - // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context + // https://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context globalEval: function( data ) { if ( data && jQuery.trim( data ) ) { // We use execScript on Internet Explorer @@ -872,7 +872,7 @@ jQuery.ready.promise = function( obj ) { // Catch cases where $(document).ready() is called after the browser event has already occurred. // we once tried to use readyState "interactive" here, but it caused issues like the one - // discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15 + // discovered by ChrisS here: https://bugs.jquery.com/ticket/12282#comment:15 if ( document.readyState === "complete" ) { // Handle it asynchronously to allow scripts the opportunity to delay ready setTimeout( jQuery.ready ); @@ -1956,7 +1956,7 @@ jQuery.fn.extend({ }); }, // Based off of the plugin by Clint Helfers, with permission. - // http://blindsignals.com/index.php/2009/07/jquery-delay/ + // http://blindsignals.com delay: function( time, type ) { time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time; type = type || "fx"; @@ -2448,7 +2448,7 @@ jQuery.extend({ tabIndex: { get: function( elem ) { // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set - // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ + // https://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ var attributeNode = elem.getAttributeNode("tabindex"); return attributeNode && attributeNode.specified ? @@ -2583,7 +2583,7 @@ if ( !getSetAttribute ) { // Some attributes require a special call on IE -// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx +// https://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx if ( !jQuery.support.hrefNormalized ) { jQuery.each([ "href", "src", "width", "height" ], function( i, name ) { jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], { @@ -3325,7 +3325,7 @@ jQuery.Event = function( src, props ) { }; // jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding -// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html +// https://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html jQuery.Event.prototype = { isDefaultPrevented: returnFalse, isPropagationStopped: returnFalse, @@ -3674,7 +3674,7 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl * Sizzle CSS Selector Engine * Copyright 2012 jQuery Foundation and other contributors * Released under the MIT license - * http://sizzlejs.com/ + * https://sizzlejs.com/ */ (function( window, undefined ) { @@ -3732,17 +3732,17 @@ var i, // Regular expressions - // Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace + // Whitespace characters https://www.w3.org/TR/css3-selectors/#whitespace whitespace = "[\\x20\\t\\r\\n\\f]", - // http://www.w3.org/TR/css3-syntax/#characters + // https://www.w3.org/TR/css3-syntax/#characters characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+", // Loosely modeled on CSS identifier characters - // An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors - // Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier + // An unquoted value should be a CSS identifier https://www.w3.org/TR/css3-selectors/#attribute-selectors + // Proper syntax: https://www.w3.org/TR/CSS21/syndata.html#value-def-identifier identifier = characterEncoding.replace( "w", "w#" ), - // Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors + // Acceptable operators https://www.w3.org/TR/selectors/#attribute-selectors operators = "([*^$|!~]?=)", attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace + "*(?:" + operators + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]", @@ -3792,7 +3792,7 @@ var i, rescape = /'|\\/g, rattributeQuotes = /\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g, - // CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters + // CSS escapes https://www.w3.org/TR/CSS21/syndata.html#escaped-characters runescape = /\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g, funescape = function( _, escaped ) { var high = "0x" + escaped - 0x10000; @@ -4175,7 +4175,7 @@ setDocument = Sizzle.setDocument = function( node ) { // This is to test IE's treatment of not explictly // setting a boolean content attribute, // since its presence should be enough - // http://bugs.jquery.com/ticket/12359 + // https://bugs.jquery.com/ticket/12359 div.innerHTML = ""; // IE8 - Some boolean attributes are not treated correctly @@ -4184,7 +4184,7 @@ setDocument = Sizzle.setDocument = function( node ) { } // Webkit/Opera - :checked should return selected option elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + // https://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked // IE8 throws error here and will not see later tests if ( !div.querySelectorAll(":checked").length ) { rbuggyQSA.push(":checked"); @@ -4749,7 +4749,7 @@ Expr = Sizzle.selectors = { "PSEUDO": function( pseudo, argument ) { // pseudo-class names are case-insensitive - // http://www.w3.org/TR/selectors/#pseudo-classes + // https://www.w3.org/TR/selectors/#pseudo-classes // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters // Remember that setFilters inherits from pseudos var args, @@ -4833,7 +4833,7 @@ Expr = Sizzle.selectors = { // or beginning with the identifier C immediately followed by "-". // The matching of C against the element's language value is performed case-insensitively. // The identifier C does not have to be a valid language name." - // http://www.w3.org/TR/selectors/#lang-pseudo + // https://www.w3.org/TR/selectors/#lang-pseudo "lang": markFunction( function( lang ) { // lang value must be a valid identifider if ( !ridentifier.test(lang || "") ) { @@ -4880,7 +4880,7 @@ Expr = Sizzle.selectors = { "checked": function( elem ) { // In CSS3, :checked should return both checked and selected elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + // https://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked var nodeName = elem.nodeName.toLowerCase(); return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected); }, @@ -4897,7 +4897,7 @@ Expr = Sizzle.selectors = { // Contents "empty": function( elem ) { - // http://www.w3.org/TR/selectors/#empty-pseudo + // https://www.w3.org/TR/selectors/#empty-pseudo // :empty is only affected by element nodes and content nodes(including text(3), cdata(4)), // not comment, processing instructions, or others // Thanks to Diego Perini for the nodeName shortcut @@ -6377,7 +6377,7 @@ jQuery.extend({ if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) && (elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) { - // We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2 + // We eschew Sizzle here for performance reasons: https://jsperf.com/getall-vs-sizzle/2 destElements = getAll( clone ); srcElements = getAll( elem ); @@ -6915,7 +6915,7 @@ if ( window.getComputedStyle ) { // A tribute to the "awesome hack by Dean Edwards" // Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right // Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels - // this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values + // this is against the CSSOM draft spec: https://dev.w3.org/csswg/cssom/#resolved-values if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) { // Remember the original values @@ -8485,7 +8485,7 @@ if ( xhrSupported ) { // Firefox throws exceptions when accessing properties // of an xhr when a network error occurred - // http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE) + // https://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE) try { // Was never called and is aborted or complete diff --git a/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/hello.html b/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/hello.html index 3d310807b8..50c0bdb7c5 100644 --- a/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/hello.html +++ b/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/hello.html @@ -1,5 +1,5 @@ - diff --git a/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/layout.html b/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/layout.html index d996ef9dd5..34ffeefca6 100644 --- a/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/layout.html +++ b/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/layout.html @@ -1,5 +1,5 @@ - Layout diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Keys.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Keys.java index e37d28919f..803f59731a 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Keys.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Keys.java @@ -23,7 +23,7 @@ import sample.jooq.domain.tables.records.LanguageRecord; * A class modelling foreign key relationships between tables of the PUBLIC * schema */ -@Generated(value = { "http://www.jooq.org", +@Generated(value = { "https://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Keys { diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Public.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Public.java index 73ae45eddc..f17fae2591 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Public.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Public.java @@ -20,7 +20,7 @@ import sample.jooq.domain.tables.Language; /** * This class is generated by jOOQ. */ -@Generated(value = { "http://www.jooq.org", +@Generated(value = { "https://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Public extends SchemaImpl { diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Tables.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Tables.java index f3e77b0ce6..d58668ea18 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Tables.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Tables.java @@ -14,7 +14,7 @@ import sample.jooq.domain.tables.Language; /** * Convenience access to all tables in PUBLIC */ -@Generated(value = { "http://www.jooq.org", +@Generated(value = { "https://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Tables { diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Author.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Author.java index eaa0cb4ae1..c65b88831d 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Author.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Author.java @@ -21,7 +21,7 @@ import sample.jooq.domain.tables.records.AuthorRecord; /** * This class is generated by jOOQ. */ -@Generated(value = { "http://www.jooq.org", +@Generated(value = { "https://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Author extends TableImpl { diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Book.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Book.java index 97d31d77b1..ce08e1e3c1 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Book.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Book.java @@ -21,7 +21,7 @@ import sample.jooq.domain.tables.records.BookRecord; /** * This class is generated by jOOQ. */ -@Generated(value = { "http://www.jooq.org", +@Generated(value = { "https://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Book extends TableImpl { diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/BookStore.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/BookStore.java index a8b2cb64e3..ff7f139b45 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/BookStore.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/BookStore.java @@ -20,7 +20,7 @@ import sample.jooq.domain.tables.records.BookStoreRecord; /** * This class is generated by jOOQ. */ -@Generated(value = { "http://www.jooq.org", +@Generated(value = { "https://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class BookStore extends TableImpl { diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/BookToBookStore.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/BookToBookStore.java index d246681e7f..8df7286da9 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/BookToBookStore.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/BookToBookStore.java @@ -21,7 +21,7 @@ import sample.jooq.domain.tables.records.BookToBookStoreRecord; /** * This class is generated by jOOQ. */ -@Generated(value = { "http://www.jooq.org", +@Generated(value = { "https://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class BookToBookStore extends TableImpl { diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Language.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Language.java index 65e95cd207..317fc0a146 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Language.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/Language.java @@ -20,7 +20,7 @@ import sample.jooq.domain.tables.records.LanguageRecord; /** * This class is generated by jOOQ. */ -@Generated(value = { "http://www.jooq.org", +@Generated(value = { "https://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Language extends TableImpl { diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/AuthorRecord.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/AuthorRecord.java index eecd11929b..3a58889183 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/AuthorRecord.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/AuthorRecord.java @@ -17,7 +17,7 @@ import sample.jooq.domain.tables.Author; /** * This class is generated by jOOQ. */ -@Generated(value = { "http://www.jooq.org", +@Generated(value = { "https://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class AuthorRecord extends UpdatableRecordImpl diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookRecord.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookRecord.java index a2dab1b9f5..1fb7e48923 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookRecord.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookRecord.java @@ -15,7 +15,7 @@ import sample.jooq.domain.tables.Book; /** * This class is generated by jOOQ. */ -@Generated(value = { "http://www.jooq.org", +@Generated(value = { "https://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class BookRecord extends UpdatableRecordImpl diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookStoreRecord.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookStoreRecord.java index ecea59da09..920f9b9164 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookStoreRecord.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookStoreRecord.java @@ -14,7 +14,7 @@ import sample.jooq.domain.tables.BookStore; /** * This class is generated by jOOQ. */ -@Generated(value = { "http://www.jooq.org", +@Generated(value = { "https://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class BookStoreRecord extends TableRecordImpl diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookToBookStoreRecord.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookToBookStoreRecord.java index 8ae6ae9428..3079eb198c 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookToBookStoreRecord.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/BookToBookStoreRecord.java @@ -15,7 +15,7 @@ import sample.jooq.domain.tables.BookToBookStore; /** * This class is generated by jOOQ. */ -@Generated(value = { "http://www.jooq.org", +@Generated(value = { "https://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class BookToBookStoreRecord extends UpdatableRecordImpl diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/LanguageRecord.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/LanguageRecord.java index 90cd6449af..a0e500366f 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/LanguageRecord.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/tables/records/LanguageRecord.java @@ -15,7 +15,7 @@ import sample.jooq.domain.tables.Language; /** * This class is generated by jOOQ. */ -@Generated(value = { "http://www.jooq.org", +@Generated(value = { "https://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ") @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class LanguageRecord extends UpdatableRecordImpl diff --git a/spring-boot-samples/spring-boot-sample-jta-jndi/README.adoc b/spring-boot-samples/spring-boot-sample-jta-jndi/README.adoc index 3e4addb82e..f415a5540f 100644 --- a/spring-boot-samples/spring-boot-sample-jta-jndi/README.adoc +++ b/spring-boot-samples/spring-boot-sample-jta-jndi/README.adoc @@ -11,7 +11,7 @@ JNDI machinery. ### Postgres We will use postgres as the underlying database, v9.3.5 or above is recommend. Follow -the installation instructions from http://www.postgresql.org/[postgresql.org] or use +the installation instructions from https://www.postgresql.org/[postgresql.org] or use a package manager to install the appropriate binaries. Once installed you will need to initialize and start the server. @@ -40,7 +40,7 @@ Finally you can type `psql bootdemo` to configure a password: ### WildFly 8.1 -Download an install WildFly 8.1 from http://wildfly.org/downloads/[wildfly.org]. Once +Download an install WildFly 8.1 from https://wildfly.org/downloads/[wildfly.org]. Once installed you will need to add a management user by running `$JBOSS_HOME/bin/add-user.sh` (see the WildFly documentation for details). @@ -51,7 +51,7 @@ structure: ---- $ cd $JBOSS_HOME mkdir -p modules/org/postgresql/main - wget http://jdbc.postgresql.org/download/postgresql-9.3-1102.jdbc41.jar + wget https://jdbc.postgresql.org/download/postgresql-9.3-1102.jdbc41.jar mv postgresql-9.3-1102.jdbc41.jar modules/org/postgresql/main ---- diff --git a/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/WEB-INF/views/home.jsp b/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/WEB-INF/views/home.jsp index 1696c2ddaa..d537fe0f55 100644 --- a/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/WEB-INF/views/home.jsp +++ b/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/WEB-INF/views/home.jsp @@ -1,5 +1,5 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> - + diff --git a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/resources/static/js/jquery-1.7.2.js b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/resources/static/js/jquery-1.7.2.js index feeda93159..381b3e74cf 100644 --- a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/resources/static/js/jquery-1.7.2.js +++ b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/resources/static/js/jquery-1.7.2.js @@ -1,13 +1,13 @@ /*! * jQuery JavaScript Library v1.7.2 - * http://jquery.com/ + * https://jquery.com/ * * Copyright 2011, John Resig * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license + * https://jquery.org/license * * Includes Sizzle.js - * http://sizzlejs.com/ + * https://sizzlejs.com/ * Copyright 2011, The Dojo Foundation * Released under the MIT, BSD, and GPL Licenses. * @@ -565,7 +565,7 @@ jQuery.extend({ } // Make sure the incoming data is actual JSON - // Logic borrowed from http://json.org/json2.js + // Logic borrowed from https://json.org/json2.js if ( rvalidchars.test( data.replace( rvalidescape, "@" ) .replace( rvalidtokens, "]" ) .replace( rvalidbraces, "")) ) { @@ -604,7 +604,7 @@ jQuery.extend({ // Evaluates a script in a global context // Workarounds based on findings by Jim Driscoll - // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context + // https://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context globalEval: function( data ) { if ( data && rnotwhite.test( data ) ) { // We use execScript on Internet Explorer @@ -880,7 +880,7 @@ jQuery.extend({ }, // Use of jQuery.browser is frowned upon. - // More details: http://docs.jquery.com/Utilities/jQuery.browser + // More details: https://docs.jquery.com/Utilities/jQuery.browser uaMatch: function( ua ) { ua = ua.toLowerCase(); @@ -2159,7 +2159,7 @@ jQuery.fn.extend({ }); }, // Based off of the plugin by Clint Helfers, with permission. - // http://blindsignals.com/index.php/2009/07/jquery-delay/ + // http://blindsignals.com delay: function( time, type ) { time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time; type = type || "fx"; @@ -2688,7 +2688,7 @@ jQuery.extend({ tabIndex: { get: function( elem ) { // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set - // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ + // https://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ var attributeNode = elem.getAttributeNode("tabindex"); return attributeNode && attributeNode.specified ? @@ -3551,7 +3551,7 @@ function returnTrue() { } // jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding -// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html +// https://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html jQuery.Event.prototype = { preventDefault: function() { this.isDefaultPrevented = returnTrue; @@ -3941,7 +3941,7 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl * Sizzle CSS Selector Engine * Copyright 2011, The Dojo Foundation * Released under the MIT, BSD, and GPL Licenses. - * More information: http://sizzlejs.com/ + * More information: https://sizzlejs.com/ */ (function(){ @@ -6298,7 +6298,7 @@ function findInputs( elem ) { } } -// Derived From: http://www.iecss.com/shimprove/javascript/shimprove.1-0-1.js +// Derived From: https://www.iecss.com/shimprove/javascript/shimprove.1-0-1.js function shimCloneNode( elem ) { var div = document.createElement( "div" ); safeFragment.appendChild( div ); @@ -6735,7 +6735,7 @@ if ( document.defaultView && document.defaultView.getComputedStyle ) { // A tribute to the "awesome hack by Dean Edwards" // WebKit uses "computed value (percentage if specified)" instead of "used value" for margins - // which is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values + // which is against the CSSOM draft spec: https://dev.w3.org/csswg/cssom/#resolved-values if ( !jQuery.support.pixelMargin && computedStyle && rmargin.test( name ) && rnumnonpx.test( ret ) ) { width = style.width; style.width = ret; @@ -8250,7 +8250,7 @@ if ( jQuery.support.ajax ) { // Firefox throws exceptions when accessing properties // of an xhr when a network error occured - // http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE) + // https://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE) try { // Was never called and is aborted or complete diff --git a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/resources/static/js/jquery.validate.js b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/resources/static/js/jquery.validate.js index f2f398ae81..a28ef2376c 100644 --- a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/resources/static/js/jquery.validate.js +++ b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/resources/static/js/jquery.validate.js @@ -1,20 +1,20 @@ /** * jQuery Validation Plugin @VERSION * - * http://bassistance.de/jquery-plugins/jquery-plugin-validation/ - * http://docs.jquery.com/Plugins/Validation + * https://bassistance.de/jquery-plugins/jquery-plugin-validation/ + * https://docs.jquery.com/Plugins/Validation * * Copyright (c) 2012 Jörn Zaefferer * * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html + * https://www.opensource.org/licenses/mit-license.php + * https://www.gnu.org/licenses/gpl.html */ (function($) { $.extend($.fn, { - // http://docs.jquery.com/Plugins/Validation/validate + // https://docs.jquery.com/Plugins/Validation/validate validate: function( options ) { // if nothing is selected, return nothing; can't chain anyway @@ -92,7 +92,7 @@ $.extend($.fn, { return validator; }, - // http://docs.jquery.com/Plugins/Validation/valid + // https://docs.jquery.com/Plugins/Validation/valid valid: function() { if ( $(this[0]).is('form')) { return this.validate().form(); @@ -115,7 +115,7 @@ $.extend($.fn, { }); return result; }, - // http://docs.jquery.com/Plugins/Validation/rules + // https://docs.jquery.com/Plugins/Validation/rules rules: function(command, argument) { var element = this[0]; @@ -167,11 +167,11 @@ $.extend($.fn, { // Custom selectors $.extend($.expr[":"], { - // http://docs.jquery.com/Plugins/Validation/blank + // https://docs.jquery.com/Plugins/Validation/blank blank: function(a) {return !$.trim("" + a.value);}, - // http://docs.jquery.com/Plugins/Validation/filled + // https://docs.jquery.com/Plugins/Validation/filled filled: function(a) {return !!$.trim("" + a.value);}, - // http://docs.jquery.com/Plugins/Validation/unchecked + // https://docs.jquery.com/Plugins/Validation/unchecked unchecked: function(a) {return !a.checked;} }); @@ -264,7 +264,7 @@ $.extend($.validator, { } }, - // http://docs.jquery.com/Plugins/Validation/Validator/setDefaults + // https://docs.jquery.com/Plugins/Validation/Validator/setDefaults setDefaults: function(settings) { $.extend( $.validator.defaults, settings ); }, @@ -336,7 +336,7 @@ $.extend($.validator, { } }, - // http://docs.jquery.com/Plugins/Validation/Validator/form + // https://docs.jquery.com/Plugins/Validation/Validator/form form: function() { this.checkForm(); $.extend(this.submitted, this.errorMap); @@ -356,7 +356,7 @@ $.extend($.validator, { return this.valid(); }, - // http://docs.jquery.com/Plugins/Validation/Validator/element + // https://docs.jquery.com/Plugins/Validation/Validator/element element: function( element ) { element = this.validationTargetFor( this.clean( element ) ); this.lastElement = element; @@ -376,7 +376,7 @@ $.extend($.validator, { return result; }, - // http://docs.jquery.com/Plugins/Validation/Validator/showErrors + // https://docs.jquery.com/Plugins/Validation/Validator/showErrors showErrors: function(errors) { if(errors) { // add items to error list and map @@ -400,7 +400,7 @@ $.extend($.validator, { } }, - // http://docs.jquery.com/Plugins/Validation/Validator/resetForm + // https://docs.jquery.com/Plugins/Validation/Validator/resetForm resetForm: function() { if ( $.fn.resetForm ) { $( this.currentForm ).resetForm(); @@ -966,7 +966,7 @@ $.extend($.validator, { return data; }, - // http://docs.jquery.com/Plugins/Validation/Validator/addMethod + // https://docs.jquery.com/Plugins/Validation/Validator/addMethod addMethod: function(name, method, message) { $.validator.methods[name] = method; $.validator.messages[name] = message !== undefined ? message : $.validator.messages[name]; @@ -977,7 +977,7 @@ $.extend($.validator, { methods: { - // http://docs.jquery.com/Plugins/Validation/Methods/required + // https://docs.jquery.com/Plugins/Validation/Methods/required required: function(value, element, param) { // check if dependency is met if ( !this.depend(param, element) ) { @@ -994,7 +994,7 @@ $.extend($.validator, { return $.trim(value).length > 0; }, - // http://docs.jquery.com/Plugins/Validation/Methods/remote + // https://docs.jquery.com/Plugins/Validation/Methods/remote remote: function(value, element, param) { if ( this.optional(element) ) { return "dependency-mismatch"; @@ -1049,73 +1049,73 @@ $.extend($.validator, { return "pending"; }, - // http://docs.jquery.com/Plugins/Validation/Methods/minlength + // https://docs.jquery.com/Plugins/Validation/Methods/minlength minlength: function(value, element, param) { var length = $.isArray( value ) ? value.length : this.getLength($.trim(value), element); return this.optional(element) || length >= param; }, - // http://docs.jquery.com/Plugins/Validation/Methods/maxlength + // https://docs.jquery.com/Plugins/Validation/Methods/maxlength maxlength: function(value, element, param) { var length = $.isArray( value ) ? value.length : this.getLength($.trim(value), element); return this.optional(element) || length <= param; }, - // http://docs.jquery.com/Plugins/Validation/Methods/rangelength + // https://docs.jquery.com/Plugins/Validation/Methods/rangelength rangelength: function(value, element, param) { var length = $.isArray( value ) ? value.length : this.getLength($.trim(value), element); return this.optional(element) || ( length >= param[0] && length <= param[1] ); }, - // http://docs.jquery.com/Plugins/Validation/Methods/min + // https://docs.jquery.com/Plugins/Validation/Methods/min min: function( value, element, param ) { return this.optional(element) || value >= param; }, - // http://docs.jquery.com/Plugins/Validation/Methods/max + // https://docs.jquery.com/Plugins/Validation/Methods/max max: function( value, element, param ) { return this.optional(element) || value <= param; }, - // http://docs.jquery.com/Plugins/Validation/Methods/range + // https://docs.jquery.com/Plugins/Validation/Methods/range range: function( value, element, param ) { return this.optional(element) || ( value >= param[0] && value <= param[1] ); }, - // http://docs.jquery.com/Plugins/Validation/Methods/email + // https://docs.jquery.com/Plugins/Validation/Methods/email email: function(value, element) { // contributed by Scott Gonzalez: http://projects.scottsplayground.com/email_address_validation/ return this.optional(element) || /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i.test(value); }, - // http://docs.jquery.com/Plugins/Validation/Methods/url + // https://docs.jquery.com/Plugins/Validation/Methods/url url: function(value, element) { // contributed by Scott Gonzalez: http://projects.scottsplayground.com/iri/ return this.optional(element) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value); }, - // http://docs.jquery.com/Plugins/Validation/Methods/date + // https://docs.jquery.com/Plugins/Validation/Methods/date date: function(value, element) { return this.optional(element) || !/Invalid|NaN/.test(new Date(value)); }, - // http://docs.jquery.com/Plugins/Validation/Methods/dateISO + // https://docs.jquery.com/Plugins/Validation/Methods/dateISO dateISO: function(value, element) { return this.optional(element) || /^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/.test(value); }, - // http://docs.jquery.com/Plugins/Validation/Methods/number + // https://docs.jquery.com/Plugins/Validation/Methods/number number: function(value, element) { return this.optional(element) || /^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(value); }, - // http://docs.jquery.com/Plugins/Validation/Methods/digits + // https://docs.jquery.com/Plugins/Validation/Methods/digits digits: function(value, element) { return this.optional(element) || /^\d+$/.test(value); }, - // http://docs.jquery.com/Plugins/Validation/Methods/creditcard - // based on http://en.wikipedia.org/wiki/Luhn + // https://docs.jquery.com/Plugins/Validation/Methods/creditcard + // based on https://en.wikipedia.org/wiki/Luhn creditcard: function(value, element) { if ( this.optional(element) ) { return "dependency-mismatch"; @@ -1145,13 +1145,13 @@ $.extend($.validator, { return (nCheck % 10) === 0; }, - // http://docs.jquery.com/Plugins/Validation/Methods/accept + // https://docs.jquery.com/Plugins/Validation/Methods/accept accept: function(value, element, param) { param = typeof param === "string" ? param.replace(/,/g, '|') : "png|jpe?g|gif"; return this.optional(element) || value.match(new RegExp(".(" + param + ")$", "i")); }, - // http://docs.jquery.com/Plugins/Validation/Methods/equalTo + // https://docs.jquery.com/Plugins/Validation/Methods/equalTo equalTo: function(value, element, param) { // bind to the blur event of the target in order to revalidate whenever the target field is updated // TODO find a way to bind the event just once, avoiding the unbind-rebind overhead diff --git a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/resources/templates/layout.tpl b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/resources/templates/layout.tpl index 062b0835d5..b04ddd99ee 100644 --- a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/resources/templates/layout.tpl +++ b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/resources/templates/layout.tpl @@ -8,7 +8,7 @@ html { div(class:'navbar') { div(class:'navbar-inner') { a(class:'brand', - href:'http://beta.groovy-lang.org/docs/groovy-2.3.0/html/documentation/markup-template-engine.html') { + href:'http://groovy-lang.org/404.html') { yield 'Groovy - Layout' } ul(class:'nav') { diff --git a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/access.html b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/access.html index edd9275366..5da0c359a8 100644 --- a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/access.html +++ b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/access.html @@ -1,5 +1,5 @@ - + Error
        - Thymeleaf - + Thymeleaf - Plain
        • Home
          • diff --git a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/error.html b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/error.html index 6047bb96f4..91ef4590f0 100644 --- a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/error.html +++ b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/error.html @@ -1,5 +1,5 @@ - + Error
          - Thymeleaf - + Thymeleaf - Plain
          • Home
            • diff --git a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/home.html b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/home.html index 6fa69dc027..4916814d72 100644 --- a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/home.html +++ b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/home.html @@ -1,5 +1,5 @@ - + Title
            - Thymeleaf - + Thymeleaf - Plain
            • Home
              • diff --git a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/login.html b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/login.html index b126882c18..96b02cb7a3 100644 --- a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/login.html +++ b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/login.html @@ -1,5 +1,5 @@ - + Login
              - Thymeleaf - + Thymeleaf - Plain
              • Home
                • diff --git a/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/error.html b/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/error.html index 6047bb96f4..91ef4590f0 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/error.html +++ b/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/error.html @@ -1,5 +1,5 @@ - + Error
                - Thymeleaf - + Thymeleaf - Plain
                • Home
                  • diff --git a/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/home.html b/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/home.html index 024fee0209..d46f92b709 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/home.html +++ b/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/home.html @@ -1,5 +1,5 @@ - + Title
                  - Thymeleaf - + Thymeleaf - Plain
                  • Home
                    • diff --git a/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/login.html b/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/login.html index b126882c18..96b02cb7a3 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/login.html +++ b/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/login.html @@ -1,5 +1,5 @@ - + Login
                    - Thymeleaf - + Thymeleaf - Plain
                    • Home
                      • diff --git a/spring-boot-samples/spring-boot-sample-web-secure-github/src/main/resources/static/index.html b/spring-boot-samples/spring-boot-sample-web-secure-github/src/main/resources/static/index.html index 3351b2e32c..d337db34fa 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-github/src/main/resources/static/index.html +++ b/spring-boot-samples/spring-boot-sample-web-secure-github/src/main/resources/static/index.html @@ -8,7 +8,7 @@
                      - Spring + Spring diff --git a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/error.html b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/error.html index 6047bb96f4..91ef4590f0 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/error.html +++ b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/error.html @@ -1,5 +1,5 @@ - + Error
                      - Thymeleaf - + Thymeleaf - Plain
                      • Home
                        • diff --git a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/home.html b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/home.html index 024fee0209..d46f92b709 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/home.html +++ b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/home.html @@ -1,5 +1,5 @@ - + Title
                        - Thymeleaf - + Thymeleaf - Plain
                        • Home
                          • diff --git a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/login.html b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/login.html index b126882c18..96b02cb7a3 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/login.html +++ b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/login.html @@ -1,5 +1,5 @@ - + Login
                          - Thymeleaf - + Thymeleaf - Plain
                          • Home
                            • diff --git a/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/error.html b/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/error.html index 6047bb96f4..91ef4590f0 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/error.html +++ b/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/error.html @@ -1,5 +1,5 @@ - + Error
                            - Thymeleaf - + Thymeleaf - Plain
                            • Home
                              • diff --git a/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/home.html b/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/home.html index 024fee0209..d46f92b709 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/home.html +++ b/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/home.html @@ -1,5 +1,5 @@ - + Title
                              - Thymeleaf - + Thymeleaf - Plain
                              • Home
                                • diff --git a/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/login.html b/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/login.html index b126882c18..96b02cb7a3 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/login.html +++ b/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/login.html @@ -1,5 +1,5 @@ - + Login
                                - Thymeleaf - + Thymeleaf - Plain
                                • Home
                                  • diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/static/js/jquery-1.7.2.js b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/static/js/jquery-1.7.2.js index feeda93159..381b3e74cf 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/static/js/jquery-1.7.2.js +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/static/js/jquery-1.7.2.js @@ -1,13 +1,13 @@ /*! * jQuery JavaScript Library v1.7.2 - * http://jquery.com/ + * https://jquery.com/ * * Copyright 2011, John Resig * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license + * https://jquery.org/license * * Includes Sizzle.js - * http://sizzlejs.com/ + * https://sizzlejs.com/ * Copyright 2011, The Dojo Foundation * Released under the MIT, BSD, and GPL Licenses. * @@ -565,7 +565,7 @@ jQuery.extend({ } // Make sure the incoming data is actual JSON - // Logic borrowed from http://json.org/json2.js + // Logic borrowed from https://json.org/json2.js if ( rvalidchars.test( data.replace( rvalidescape, "@" ) .replace( rvalidtokens, "]" ) .replace( rvalidbraces, "")) ) { @@ -604,7 +604,7 @@ jQuery.extend({ // Evaluates a script in a global context // Workarounds based on findings by Jim Driscoll - // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context + // https://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context globalEval: function( data ) { if ( data && rnotwhite.test( data ) ) { // We use execScript on Internet Explorer @@ -880,7 +880,7 @@ jQuery.extend({ }, // Use of jQuery.browser is frowned upon. - // More details: http://docs.jquery.com/Utilities/jQuery.browser + // More details: https://docs.jquery.com/Utilities/jQuery.browser uaMatch: function( ua ) { ua = ua.toLowerCase(); @@ -2159,7 +2159,7 @@ jQuery.fn.extend({ }); }, // Based off of the plugin by Clint Helfers, with permission. - // http://blindsignals.com/index.php/2009/07/jquery-delay/ + // http://blindsignals.com delay: function( time, type ) { time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time; type = type || "fx"; @@ -2688,7 +2688,7 @@ jQuery.extend({ tabIndex: { get: function( elem ) { // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set - // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ + // https://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ var attributeNode = elem.getAttributeNode("tabindex"); return attributeNode && attributeNode.specified ? @@ -3551,7 +3551,7 @@ function returnTrue() { } // jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding -// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html +// https://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html jQuery.Event.prototype = { preventDefault: function() { this.isDefaultPrevented = returnTrue; @@ -3941,7 +3941,7 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl * Sizzle CSS Selector Engine * Copyright 2011, The Dojo Foundation * Released under the MIT, BSD, and GPL Licenses. - * More information: http://sizzlejs.com/ + * More information: https://sizzlejs.com/ */ (function(){ @@ -6298,7 +6298,7 @@ function findInputs( elem ) { } } -// Derived From: http://www.iecss.com/shimprove/javascript/shimprove.1-0-1.js +// Derived From: https://www.iecss.com/shimprove/javascript/shimprove.1-0-1.js function shimCloneNode( elem ) { var div = document.createElement( "div" ); safeFragment.appendChild( div ); @@ -6735,7 +6735,7 @@ if ( document.defaultView && document.defaultView.getComputedStyle ) { // A tribute to the "awesome hack by Dean Edwards" // WebKit uses "computed value (percentage if specified)" instead of "used value" for margins - // which is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values + // which is against the CSSOM draft spec: https://dev.w3.org/csswg/cssom/#resolved-values if ( !jQuery.support.pixelMargin && computedStyle && rmargin.test( name ) && rnumnonpx.test( ret ) ) { width = style.width; style.width = ret; @@ -8250,7 +8250,7 @@ if ( jQuery.support.ajax ) { // Firefox throws exceptions when accessing properties // of an xhr when a network error occured - // http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE) + // https://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE) try { // Was never called and is aborted or complete diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/static/js/jquery.validate.js b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/static/js/jquery.validate.js index f2f398ae81..a28ef2376c 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/static/js/jquery.validate.js +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/static/js/jquery.validate.js @@ -1,20 +1,20 @@ /** * jQuery Validation Plugin @VERSION * - * http://bassistance.de/jquery-plugins/jquery-plugin-validation/ - * http://docs.jquery.com/Plugins/Validation + * https://bassistance.de/jquery-plugins/jquery-plugin-validation/ + * https://docs.jquery.com/Plugins/Validation * * Copyright (c) 2012 Jörn Zaefferer * * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html + * https://www.opensource.org/licenses/mit-license.php + * https://www.gnu.org/licenses/gpl.html */ (function($) { $.extend($.fn, { - // http://docs.jquery.com/Plugins/Validation/validate + // https://docs.jquery.com/Plugins/Validation/validate validate: function( options ) { // if nothing is selected, return nothing; can't chain anyway @@ -92,7 +92,7 @@ $.extend($.fn, { return validator; }, - // http://docs.jquery.com/Plugins/Validation/valid + // https://docs.jquery.com/Plugins/Validation/valid valid: function() { if ( $(this[0]).is('form')) { return this.validate().form(); @@ -115,7 +115,7 @@ $.extend($.fn, { }); return result; }, - // http://docs.jquery.com/Plugins/Validation/rules + // https://docs.jquery.com/Plugins/Validation/rules rules: function(command, argument) { var element = this[0]; @@ -167,11 +167,11 @@ $.extend($.fn, { // Custom selectors $.extend($.expr[":"], { - // http://docs.jquery.com/Plugins/Validation/blank + // https://docs.jquery.com/Plugins/Validation/blank blank: function(a) {return !$.trim("" + a.value);}, - // http://docs.jquery.com/Plugins/Validation/filled + // https://docs.jquery.com/Plugins/Validation/filled filled: function(a) {return !!$.trim("" + a.value);}, - // http://docs.jquery.com/Plugins/Validation/unchecked + // https://docs.jquery.com/Plugins/Validation/unchecked unchecked: function(a) {return !a.checked;} }); @@ -264,7 +264,7 @@ $.extend($.validator, { } }, - // http://docs.jquery.com/Plugins/Validation/Validator/setDefaults + // https://docs.jquery.com/Plugins/Validation/Validator/setDefaults setDefaults: function(settings) { $.extend( $.validator.defaults, settings ); }, @@ -336,7 +336,7 @@ $.extend($.validator, { } }, - // http://docs.jquery.com/Plugins/Validation/Validator/form + // https://docs.jquery.com/Plugins/Validation/Validator/form form: function() { this.checkForm(); $.extend(this.submitted, this.errorMap); @@ -356,7 +356,7 @@ $.extend($.validator, { return this.valid(); }, - // http://docs.jquery.com/Plugins/Validation/Validator/element + // https://docs.jquery.com/Plugins/Validation/Validator/element element: function( element ) { element = this.validationTargetFor( this.clean( element ) ); this.lastElement = element; @@ -376,7 +376,7 @@ $.extend($.validator, { return result; }, - // http://docs.jquery.com/Plugins/Validation/Validator/showErrors + // https://docs.jquery.com/Plugins/Validation/Validator/showErrors showErrors: function(errors) { if(errors) { // add items to error list and map @@ -400,7 +400,7 @@ $.extend($.validator, { } }, - // http://docs.jquery.com/Plugins/Validation/Validator/resetForm + // https://docs.jquery.com/Plugins/Validation/Validator/resetForm resetForm: function() { if ( $.fn.resetForm ) { $( this.currentForm ).resetForm(); @@ -966,7 +966,7 @@ $.extend($.validator, { return data; }, - // http://docs.jquery.com/Plugins/Validation/Validator/addMethod + // https://docs.jquery.com/Plugins/Validation/Validator/addMethod addMethod: function(name, method, message) { $.validator.methods[name] = method; $.validator.messages[name] = message !== undefined ? message : $.validator.messages[name]; @@ -977,7 +977,7 @@ $.extend($.validator, { methods: { - // http://docs.jquery.com/Plugins/Validation/Methods/required + // https://docs.jquery.com/Plugins/Validation/Methods/required required: function(value, element, param) { // check if dependency is met if ( !this.depend(param, element) ) { @@ -994,7 +994,7 @@ $.extend($.validator, { return $.trim(value).length > 0; }, - // http://docs.jquery.com/Plugins/Validation/Methods/remote + // https://docs.jquery.com/Plugins/Validation/Methods/remote remote: function(value, element, param) { if ( this.optional(element) ) { return "dependency-mismatch"; @@ -1049,73 +1049,73 @@ $.extend($.validator, { return "pending"; }, - // http://docs.jquery.com/Plugins/Validation/Methods/minlength + // https://docs.jquery.com/Plugins/Validation/Methods/minlength minlength: function(value, element, param) { var length = $.isArray( value ) ? value.length : this.getLength($.trim(value), element); return this.optional(element) || length >= param; }, - // http://docs.jquery.com/Plugins/Validation/Methods/maxlength + // https://docs.jquery.com/Plugins/Validation/Methods/maxlength maxlength: function(value, element, param) { var length = $.isArray( value ) ? value.length : this.getLength($.trim(value), element); return this.optional(element) || length <= param; }, - // http://docs.jquery.com/Plugins/Validation/Methods/rangelength + // https://docs.jquery.com/Plugins/Validation/Methods/rangelength rangelength: function(value, element, param) { var length = $.isArray( value ) ? value.length : this.getLength($.trim(value), element); return this.optional(element) || ( length >= param[0] && length <= param[1] ); }, - // http://docs.jquery.com/Plugins/Validation/Methods/min + // https://docs.jquery.com/Plugins/Validation/Methods/min min: function( value, element, param ) { return this.optional(element) || value >= param; }, - // http://docs.jquery.com/Plugins/Validation/Methods/max + // https://docs.jquery.com/Plugins/Validation/Methods/max max: function( value, element, param ) { return this.optional(element) || value <= param; }, - // http://docs.jquery.com/Plugins/Validation/Methods/range + // https://docs.jquery.com/Plugins/Validation/Methods/range range: function( value, element, param ) { return this.optional(element) || ( value >= param[0] && value <= param[1] ); }, - // http://docs.jquery.com/Plugins/Validation/Methods/email + // https://docs.jquery.com/Plugins/Validation/Methods/email email: function(value, element) { // contributed by Scott Gonzalez: http://projects.scottsplayground.com/email_address_validation/ return this.optional(element) || /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i.test(value); }, - // http://docs.jquery.com/Plugins/Validation/Methods/url + // https://docs.jquery.com/Plugins/Validation/Methods/url url: function(value, element) { // contributed by Scott Gonzalez: http://projects.scottsplayground.com/iri/ return this.optional(element) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value); }, - // http://docs.jquery.com/Plugins/Validation/Methods/date + // https://docs.jquery.com/Plugins/Validation/Methods/date date: function(value, element) { return this.optional(element) || !/Invalid|NaN/.test(new Date(value)); }, - // http://docs.jquery.com/Plugins/Validation/Methods/dateISO + // https://docs.jquery.com/Plugins/Validation/Methods/dateISO dateISO: function(value, element) { return this.optional(element) || /^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/.test(value); }, - // http://docs.jquery.com/Plugins/Validation/Methods/number + // https://docs.jquery.com/Plugins/Validation/Methods/number number: function(value, element) { return this.optional(element) || /^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(value); }, - // http://docs.jquery.com/Plugins/Validation/Methods/digits + // https://docs.jquery.com/Plugins/Validation/Methods/digits digits: function(value, element) { return this.optional(element) || /^\d+$/.test(value); }, - // http://docs.jquery.com/Plugins/Validation/Methods/creditcard - // based on http://en.wikipedia.org/wiki/Luhn + // https://docs.jquery.com/Plugins/Validation/Methods/creditcard + // based on https://en.wikipedia.org/wiki/Luhn creditcard: function(value, element) { if ( this.optional(element) ) { return "dependency-mismatch"; @@ -1145,13 +1145,13 @@ $.extend($.validator, { return (nCheck % 10) === 0; }, - // http://docs.jquery.com/Plugins/Validation/Methods/accept + // https://docs.jquery.com/Plugins/Validation/Methods/accept accept: function(value, element, param) { param = typeof param === "string" ? param.replace(/,/g, '|') : "png|jpe?g|gif"; return this.optional(element) || value.match(new RegExp(".(" + param + ")$", "i")); }, - // http://docs.jquery.com/Plugins/Validation/Methods/equalTo + // https://docs.jquery.com/Plugins/Validation/Methods/equalTo equalTo: function(value, element, param) { // bind to the blur event of the target in order to revalidate whenever the target field is updated // TODO find a way to bind the event just once, avoiding the unbind-rebind overhead diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/layout.html b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/layout.html index 83a1cd8312..c2fd11c836 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/layout.html +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/layout.html @@ -1,5 +1,5 @@ - Layout diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/form.html b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/form.html index 747f029161..608de02698 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/form.html +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/form.html @@ -1,5 +1,5 @@ - diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/list.html b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/list.html index 2082622b17..cd7e9a1828 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/list.html +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/list.html @@ -1,5 +1,5 @@ - diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/view.html b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/view.html index 16c2ab3ada..5128aa4b9a 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/view.html +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/view.html @@ -1,4 +1,4 @@ - diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/resources/static/snake.html b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/resources/static/snake.html index 492529d74e..fe0a2ea88e 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/resources/static/snake.html +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/resources/static/snake.html @@ -16,7 +16,7 @@ limitations under the License. --> + "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/resources/static/snake.html b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/resources/static/snake.html index 492529d74e..fe0a2ea88e 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/resources/static/snake.html +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/resources/static/snake.html @@ -16,7 +16,7 @@ limitations under the License. --> + "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/resources/static/snake.html b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/resources/static/snake.html index 492529d74e..fe0a2ea88e 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/resources/static/snake.html +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/resources/static/snake.html @@ -16,7 +16,7 @@ limitations under the License. --> + "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> diff --git a/spring-boot-samples/spring-boot-sample-ws/README.adoc b/spring-boot-samples/spring-boot-sample-ws/README.adoc index 9fab87f6b0..9acfd45e2d 100644 --- a/spring-boot-samples/spring-boot-sample-ws/README.adoc +++ b/spring-boot-samples/spring-boot-sample-ws/README.adoc @@ -1,8 +1,8 @@ == Spring Boot - Samples - Web Services -This sample project demonstrates how to use http://projects.spring.io/spring-ws/[Spring Web Services] +This sample project demonstrates how to use https://projects.spring.io/spring-ws/[Spring Web Services] with Spring Boot. It is an implementation of the -http://docs.spring.io/spring-ws/site/reference/html/tutorial.html#tutorial.implementing.endpoint[Holiday Request sample] +https://docs.spring.io/spring-ws/site/reference/html/tutorial.html#tutorial.implementing.endpoint[Holiday Request sample] in the Spring Web Services reference guide. The sample uses Maven. It can be built and run from the command line: diff --git a/spring-boot-starters/README.adoc b/spring-boot-starters/README.adoc index 333f9dff9a..8e9a9e00aa 100644 --- a/spring-boot-starters/README.adoc +++ b/spring-boot-starters/README.adoc @@ -8,14 +8,14 @@ JPA for database access just include the `spring-boot-starter-data-jpa` dependen your project, and you are good to go. For complete details see the -http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#using-boot-starter-poms[reference documentation] +https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#using-boot-starter-poms[reference documentation] == Community Contributions If you create a starter for a technology that is not already in the standard list we can list it here. Just send a pull request for this page. WARNING: While the -http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#using-boot-starter-poms[reference documentation] +https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#using-boot-starter-poms[reference documentation] mentions that 3rd party starters should not start with `spring-boot`, some starters do as they were designed before this was clarified. @@ -28,10 +28,10 @@ do as they were designed before this was clarified. | http://modelmapper.org/[ModelMapper] | https://github.com/jmnarloch/modelmapper-spring-boot-starter -| http://secondmarket.github.io/mongeez/[Mongeez] +| https://secondmarket.github.io/mongeez/[Mongeez] | https://github.com/hzpz/mongeez-spring-boot-starter/ -| http://ha-jdbc.github.io/[HA JDBC] +| https://ha-jdbc.github.io/[HA JDBC] | https://github.com/lievendoclo/hajdbc-spring-boot | https://github.com/jknack/handlebars.java[Handlebars] @@ -40,16 +40,16 @@ do as they were designed before this was clarified. | https://vaadin.com/[Vaadin] | https://github.com/vaadin/spring/tree/master/vaadin-spring-boot-starter -| http://camel.apache.org/spring-boot.html[Apache Camel] +| https://camel.apache.org/spring-boot.html[Apache Camel] | https://github.com/apache/camel/tree/master/components/camel-spring-boot | https://code.google.com/p/wro4j/[WRO4J] | https://github.com/sbuettner/spring-boot-autoconfigure-wro4j -| http://projects.spring.io/spring-batch/[Spring Batch] (Advanced usage) +| https://projects.spring.io/spring-batch/[Spring Batch] (Advanced usage) | https://github.com/codecentric/spring-boot-starter-batch-web -| http://hdiv.org/[HDIV] +| https://hdiv.org/[HDIV] | https://github.com/hdiv/spring-boot-starter-hdiv | https://github.com/neuland/jade4j[Jade Templates] (Jade4J) @@ -58,10 +58,10 @@ do as they were designed before this was clarified. | https://www.google.com/recaptcha[Google's reCAPTCHA] | https://github.com/mkopylec/recaptcha-spring-boot-starter -| http://mybatis.org/mybatis-3/[Mybatis] +| http://www.mybatis.org/mybatis-3/[Mybatis] | https://github.com/mybatis/mybatis-spring-boot -| http://wicket.apache.org/[Apache Wicket] +| https://wicket.apache.org/[Apache Wicket] | https://github.com/MarcGiffing/wicket-spring-boot |=== diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryEndRecord.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryEndRecord.java index b8c4128dfe..ad15fb06e6 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryEndRecord.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryEndRecord.java @@ -24,7 +24,7 @@ import org.springframework.boot.loader.data.RandomAccessData; * A ZIP File "End of central directory record" (EOCD). * * @author Phillip Webb - * @see Zip File Format + * @see Zip File Format */ class CentralDirectoryEndRecord { diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/PropertiesMergingResourceTransformer.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/PropertiesMergingResourceTransformer.java index 06e9d3d4ce..728a9b2f18 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/PropertiesMergingResourceTransformer.java +++ b/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 Maven + * Extension for the Maven * shade plugin to allow properties files (e.g. {@literal META-INF/spring.factories}) * to be merged without losing any information. * diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java index f8dccbbe9f..e514d74027 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java @@ -99,7 +99,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 the maven documentation for more details. * @since 1.0 */ diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/it-random-port.apt.vm b/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/it-random-port.apt.vm index 2acd949568..54beaa7a59 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/it-random-port.apt.vm +++ b/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://mojo.codehaus.org/build-helper-maven-plugin/}build-helper-plugin}}: --- diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/index.apt b/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/index.apt index d7a7e99595..fe38374059 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/index.apt +++ b/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/index.apt @@ -29,7 +29,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 diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/usage.apt.vm b/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/usage.apt.vm index dbc9c88d58..0750b9a68d 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/usage.apt.vm +++ b/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/usage.apt.vm @@ -242,7 +242,7 @@ spring.devtools.remote.restart.enabled=false --- - 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. For more detailed examples of how to configure this goal see: diff --git a/spring-boot/src/main/java/org/springframework/boot/cloud/CloudPlatform.java b/spring-boot/src/main/java/org/springframework/boot/cloud/CloudPlatform.java index 366b5c9975..289e223fbb 100644 --- a/spring-boot/src/main/java/org/springframework/boot/cloud/CloudPlatform.java +++ b/spring-boot/src/main/java/org/springframework/boot/cloud/CloudPlatform.java @@ -24,7 +24,7 @@ import org.springframework.core.env.Environment; * * @author Phillip Webb * @since 1.3.0 - * @see "http://cloud.spring.io" + * @see "https://cloud.spring.io" */ public enum CloudPlatform { diff --git a/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosDependsOnBeanFactoryPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosDependsOnBeanFactoryPostProcessor.java index 1d42500147..fe28aa6027 100644 --- a/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosDependsOnBeanFactoryPostProcessor.java +++ b/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosDependsOnBeanFactoryPostProcessor.java @@ -33,7 +33,7 @@ import org.springframework.core.Ordered; /** * {@link BeanFactoryPostProcessor} to automatically setup the recommended * {@link BeanDefinition#setDependsOn(String[]) dependsOn} settings for - * correct Atomikos + * correct Atomikos * ordering. * * @author Phillip Webb diff --git a/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java b/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java index 4ed760bb2b..d7302ea510 100644 --- a/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java +++ b/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java @@ -22,7 +22,7 @@ import java.util.TreeMap; /** * Bean friendly variant of - * Atomikos configuration + * Atomikos configuration * properties. Allows for setter based configuration and is amiable to relaxed data * binding. * @@ -93,7 +93,7 @@ public class AtomikosProperties { * address. If you plan to run more than one transaction manager against one database * you must set this property to a unique value or you might run into duplicate * transaction ID (XID) problems that can be quite subtle (example: - * {@literal http://fogbugz.atomikos.com/default.asp?community.6.2225.7}). If multiple + * {@literal https://fogbugz.atomikos.com/default.asp?community.6.2225.7}). If multiple * instances need to use the same properties file then the easiest way to ensure * uniqueness for this property is by referencing a system property specified at VM * startup. diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/log4j/Log4JLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/log4j/Log4JLoggingSystem.java index 9b2993d442..877f1b25b4 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/log4j/Log4JLoggingSystem.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/log4j/Log4JLoggingSystem.java @@ -34,7 +34,7 @@ import org.springframework.util.Log4jConfigurer; import org.springframework.util.StringUtils; /** - * {@link LoggingSystem} for Log4j. + * {@link LoggingSystem} for Log4j. * * @author Phillip Webb * @author Dave Syer diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java index 39ea06eae5..3eb853715a 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java @@ -49,7 +49,7 @@ import org.springframework.util.ResourceUtils; import org.springframework.util.StringUtils; /** - * {@link LoggingSystem} for Log4j 2. + * {@link LoggingSystem} for Log4j 2. * * @author Daniel Fullarton * @author Andy Wilkinson diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java index 4610693214..ab4ad36989 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java @@ -48,7 +48,7 @@ import org.springframework.util.ResourceUtils; import org.springframework.util.StringUtils; /** - * {@link LoggingSystem} for logback. + * {@link LoggingSystem} for logback. * * @author Phillip Webb * @author Dave Syer diff --git a/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringNamingStrategy.java b/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringNamingStrategy.java index de894a595d..2a24914c19 100644 --- a/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringNamingStrategy.java +++ b/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringNamingStrategy.java @@ -29,7 +29,7 @@ import org.springframework.util.StringUtils; * referenced column name. * * @author Phillip Webb - * @see "http://stackoverflow.com/questions/7689206/ejb3namingstrategy-vs-improvednamingstrategy-foreign-key-naming" + * @see "https://stackoverflow.com/questions/7689206/ejb3namingstrategy-vs-improvednamingstrategy-foreign-key-naming" * @since 1.2.0 */ @SuppressWarnings("serial") diff --git a/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/velocity/EmbeddedVelocityToolboxViewTests.java b/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/velocity/EmbeddedVelocityToolboxViewTests.java index 78070932f3..71ae1f18bf 100644 --- a/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/velocity/EmbeddedVelocityToolboxViewTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/velocity/EmbeddedVelocityToolboxViewTests.java @@ -82,7 +82,7 @@ public class EmbeddedVelocityToolboxViewTests { @Bean public EmbeddedVelocityToolboxView view() { EmbeddedVelocityToolboxView view = new EmbeddedVelocityToolboxView(); - view.setUrl("http://example.com"); + view.setUrl("https://example.com"); return view; } From 9be96c49e26f00d11b719f69f04c312af6737c9a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 Mar 2019 11:36:27 +0000 Subject: [PATCH 02/12] Polish "Use HTTPS for external links wherever possible" See gh-16316 --- .../src/main/asciidoc/index.adoc | 2 +- .../jta/BitronixJtaConfiguration.java | 4 ++-- .../grape/DetailedProgressReporterTests.java | 4 ++-- .../asciidoc/appendix-executable-jar-format.adoc | 2 +- .../src/main/asciidoc/deployment.adoc | 4 ++-- .../src/main/asciidoc/getting-started.adoc | 6 +++--- .../main/asciidoc/production-ready-features.adoc | 4 ++-- .../src/main/asciidoc/spring-boot-features.adoc | 16 ++++++++-------- .../main/java/sample/ws/WebServiceConfig.java | 2 +- .../java/sample/ws/endpoint/HolidayEndpoint.java | 2 +- .../src/main/resources/META-INF/schemas/hr.xsd | 4 ++-- .../java/sample/ws/SampleWsApplicationTests.java | 2 +- spring-boot-starters/README.adoc | 6 +++--- .../loader/jar/CentralDirectoryEndRecord.java | 2 +- .../boot/loader/jar/JarEntryData.java | 6 +++--- .../src/site/apt/examples/it-random-port.apt.vm | 2 +- 16 files changed, 34 insertions(+), 34 deletions(-) diff --git a/spring-boot-actuator-docs/src/main/asciidoc/index.adoc b/spring-boot-actuator-docs/src/main/asciidoc/index.adoc index 9f15bdb7ff..a3a6ce6f67 100644 --- a/spring-boot-actuator-docs/src/main/asciidoc/index.adoc +++ b/spring-boot-actuator-docs/src/main/asciidoc/index.adoc @@ -60,7 +60,7 @@ HAL browser is not active). If https://projects.spring.io/spring-hateoas[Spring HATEOAS] is enabled (i.e. if it is on the classpath by default) then the Actuator endpoint responses are enhanced with hypermedia in the form of "links". The default media type for responses is -http://stateless.co/hal_specification.html[HAL], resulting in each resource having an +https://github.com/mikekelly/hal_specification[HAL], resulting in each resource having an extra property called "_links". You can change the media type to another one supported by Spring HATEOAS by providing your own `@EnableHypermedia` annotation and custom providers as necessary. diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java index e478bec450..4a69e75e45 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 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. @@ -42,7 +42,7 @@ import org.springframework.transaction.jta.JtaTransactionManager; import org.springframework.util.StringUtils; /** - * JTA Configuration for Bitronix. + * JTA Configuration for Bitronix. * * @author Josh Long * @author Phillip Webb diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporterTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporterTests.java index a6fe6b955c..bb55ae6a8f 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporterTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2013 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. @@ -39,7 +39,7 @@ import static org.junit.Assert.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"; diff --git a/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc b/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc index deb97126a1..33eb9e62da 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc @@ -279,6 +279,6 @@ alternatives could be considered: * https://maven.apache.org/plugins/maven-shade-plugin/[Maven Shade Plugin] * http://www.jdotsoft.com/JarClassLoader.php[JarClassLoader] -* http://one-jar.sourceforge.net[OneJar] +* https://sourceforge.net/projects/one-jar/[OneJar] diff --git a/spring-boot-docs/src/main/asciidoc/deployment.adoc b/spring-boot-docs/src/main/asciidoc/deployment.adoc index c20b1fde30..2530d0a84c 100644 --- a/spring-boot-docs/src/main/asciidoc/deployment.adoc +++ b/spring-boot-docs/src/main/asciidoc/deployment.adoc @@ -340,8 +340,8 @@ and then configure and start the necessary resources on AWS: Creating security group boxfuse-sg_axelfontaine/myapp:1.0 ... Launching t2.micro instance of axelfontaine/myapp:1.0 (ami-d23f38cf) in eu-central-1 ... Instance launched in 00:30.306s -> i-92ef9f53 - Waiting for AWS to boot Instance i-92ef9f53 and Payload to start at http://52.28.235.61/ ... - Payload started in 00:29.266s -> http://52.28.235.61/ + Waiting for AWS to boot Instance i-92ef9f53 and Payload to start at https://52.28.235.61/ ... + Payload started in 00:29.266s -> https://52.28.235.61/ Remapping Elastic IP 52.28.233.167 to i-92ef9f53 ... Waiting 15s for AWS to complete Elastic IP Zero Downtime transition ... Deployment completed successfully. axelfontaine/myapp:1.0 is up and running at https://myapp-axelfontaine.boxfuse.io/ diff --git a/spring-boot-docs/src/main/asciidoc/getting-started.adoc b/spring-boot-docs/src/main/asciidoc/getting-started.adoc index a484b5498b..1f71753348 100644 --- a/spring-boot-docs/src/main/asciidoc/getting-started.adoc +++ b/spring-boot-docs/src/main/asciidoc/getting-started.adoc @@ -262,8 +262,8 @@ endif::release[] [[getting-started-installing-the-cli]] === Installing the Spring Boot CLI The Spring Boot CLI is a command line tool that can be used if you want to quickly -prototype with Spring. It allows you to run https://groovy.codehaus.org/[Groovy] scripts, -which means that you have a familiar Java-like syntax, without so much boilerplate code. +prototype with Spring. It allows you to run http://groovy-lang.org[Groovy] scripts, which +means that you have a familiar Java-like syntax, without so much boilerplate code. You don't need to use the CLI to work with Spring Boot but it's definitely the quickest way to get a Spring application off the ground. @@ -370,7 +370,7 @@ install the Spring Boot CLI is: [[getting-started-cli-command-line-completion]] ==== Command-line completion Spring Boot CLI ships with scripts that provide command completion for -https://en.wikipedia.org/wiki/Bash_%2528Unix_shell%2529[BASH] and +https://en.wikipedia.org/wiki/Bash_%28Unix_shell%29[BASH] and https://en.wikipedia.org/wiki/Zsh[zsh] shells. You can `source` the script (also named `spring`) in any shell, or put it in your personal or system-wide bash completion initialization. On a Debian system the system-wide scripts are in `/shell-completion/bash` diff --git a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc index 293e4e139b..b75b4cec32 100644 --- a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc @@ -1191,8 +1191,8 @@ recommendations. [[production-ready-metric-writers-export-to-open-tsdb]] ==== Example: Export to Open TSDB If you provide a `@Bean` of type `OpenTsdbGaugeWriter` and mark it -`@ExportMetricWriter` metrics are exported to http://opentsdb.net/[Open TSDB] for -aggregation. The `OpenTsdbGaugeWriter` has a `url` property that you need to set +`@ExportMetricWriter` metrics are exported to https://github.com/OpenTSDB/opentsdb[Open +TSDB] for aggregation. The `OpenTsdbGaugeWriter` has a `url` property that you need to set to the Open TSDB "`/put`" endpoint, e.g. `http://localhost:4242/api/put`). It also has a `namingStrategy` that you can customize or configure to make the metrics match the data structure you need on the server. By default it just passes through the metric name as an diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 096ab287f8..12cf3f8595 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -558,10 +558,10 @@ For example, the following YAML document: ---- environments: dev: - url: https://dev.bar.com + url: http://dev.example.com name: Developer Setup prod: - url: https://foo.bar.com + url: http://another.example.com name: My Cool App ---- @@ -569,9 +569,9 @@ Would be transformed into these properties: [source,properties,indent=0] ---- - environments.dev.url=https://dev.bar.com + environments.dev.url=http://dev.example.com environments.dev.name=Developer Setup - environments.prod.url=https://foo.bar.com + environments.prod.url=http://another.example.com environments.prod.name=My Cool App ---- @@ -582,16 +582,16 @@ for example this YAML: ---- my: servers: - - dev.bar.com - - foo.bar.com + - dev.example.com + - another.example.com ---- Would be transformed into these properties: [source,properties,indent=0] ---- - my.servers[0]=dev.bar.com - my.servers[1]=foo.bar.com + my.servers[0]=dev.example.com + my.servers[1]=another.example.com ---- To bind to properties like that using the Spring `DataBinder` utilities (which is what diff --git a/spring-boot-samples/spring-boot-sample-ws/src/main/java/sample/ws/WebServiceConfig.java b/spring-boot-samples/spring-boot-sample-ws/src/main/java/sample/ws/WebServiceConfig.java index 2f4fd1e9fa..b041ab8ecf 100644 --- a/spring-boot-samples/spring-boot-sample-ws/src/main/java/sample/ws/WebServiceConfig.java +++ b/spring-boot-samples/spring-boot-sample-ws/src/main/java/sample/ws/WebServiceConfig.java @@ -45,7 +45,7 @@ public class WebServiceConfig extends WsConfigurerAdapter { DefaultWsdl11Definition wsdl11Definition = new DefaultWsdl11Definition(); wsdl11Definition.setPortTypeName("HumanResource"); wsdl11Definition.setLocationUri("/holidayService/"); - wsdl11Definition.setTargetNamespace("http://mycompany.com/hr/definitions"); + wsdl11Definition.setTargetNamespace("https://company.example.com/hr/definitions"); wsdl11Definition.setSchema(countriesSchema); return wsdl11Definition; } diff --git a/spring-boot-samples/spring-boot-sample-ws/src/main/java/sample/ws/endpoint/HolidayEndpoint.java b/spring-boot-samples/spring-boot-sample-ws/src/main/java/sample/ws/endpoint/HolidayEndpoint.java index 3575a638a0..32b1255b31 100644 --- a/spring-boot-samples/spring-boot-sample-ws/src/main/java/sample/ws/endpoint/HolidayEndpoint.java +++ b/spring-boot-samples/spring-boot-sample-ws/src/main/java/sample/ws/endpoint/HolidayEndpoint.java @@ -38,7 +38,7 @@ import org.springframework.ws.server.endpoint.annotation.RequestPayload; @Endpoint public class HolidayEndpoint { - private static final String NAMESPACE_URI = "http://mycompany.com/hr/schemas"; + private static final String NAMESPACE_URI = "https://company.example.com/hr/schemas"; private XPathExpression startDateExpression; private XPathExpression endDateExpression; diff --git a/spring-boot-samples/spring-boot-sample-ws/src/main/resources/META-INF/schemas/hr.xsd b/spring-boot-samples/spring-boot-sample-ws/src/main/resources/META-INF/schemas/hr.xsd index 860ba4e59b..2c32e433c4 100644 --- a/spring-boot-samples/spring-boot-sample-ws/src/main/resources/META-INF/schemas/hr.xsd +++ b/spring-boot-samples/spring-boot-sample-ws/src/main/resources/META-INF/schemas/hr.xsd @@ -1,7 +1,7 @@ + targetNamespace="https://company.example.com/hr/schemas"> diff --git a/spring-boot-samples/spring-boot-sample-ws/src/test/java/sample/ws/SampleWsApplicationTests.java b/spring-boot-samples/spring-boot-sample-ws/src/test/java/sample/ws/SampleWsApplicationTests.java index 465f4ab4de..84dfd4288b 100644 --- a/spring-boot-samples/spring-boot-sample-ws/src/test/java/sample/ws/SampleWsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-ws/src/test/java/sample/ws/SampleWsApplicationTests.java @@ -56,7 +56,7 @@ public class SampleWsApplicationTests { @Test public void testSendingHolidayRequest() { - final String request = "" + final String request = "" + " " + " 2013-10-20" + " 2013-11-22" + " " + " " + " 1" diff --git a/spring-boot-starters/README.adoc b/spring-boot-starters/README.adoc index 8e9a9e00aa..677d705ff5 100644 --- a/spring-boot-starters/README.adoc +++ b/spring-boot-starters/README.adoc @@ -25,10 +25,10 @@ do as they were designed before this was clarified. | Central Authentication Service (CAS) client | https://github.com/Unicon/cas-client-autoconfig-support -| http://modelmapper.org/[ModelMapper] +| https://github.com/modelmapper/modelmapper/[ModelMapper] | https://github.com/jmnarloch/modelmapper-spring-boot-starter -| https://secondmarket.github.io/mongeez/[Mongeez] +| https://github.com/mongeez/mongeez[Mongeez] | https://github.com/hzpz/mongeez-spring-boot-starter/ | https://ha-jdbc.github.io/[HA JDBC] @@ -58,7 +58,7 @@ do as they were designed before this was clarified. | https://www.google.com/recaptcha[Google's reCAPTCHA] | https://github.com/mkopylec/recaptcha-spring-boot-starter -| http://www.mybatis.org/mybatis-3/[Mybatis] +| https://github.com/mybatis/mybatis-3[MyBatis] | https://github.com/mybatis/mybatis-spring-boot | https://wicket.apache.org/[Apache Wicket] diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryEndRecord.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryEndRecord.java index ad15fb06e6..67dcdac07c 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryEndRecord.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryEndRecord.java @@ -24,7 +24,7 @@ import org.springframework.boot.loader.data.RandomAccessData; * A ZIP File "End of central directory record" (EOCD). * * @author Phillip Webb - * @see Zip File Format + * @see Zip File Format */ class CentralDirectoryEndRecord { diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryData.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryData.java index a0abd87cb7..e9ec874b22 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryData.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryData.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 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. @@ -156,8 +156,8 @@ public final class JarEntryData { /** * Decode MS-DOS Date Time details. See - * mindprod.com/jgloss/zip.html for - * more details of the format. + * + * Microsoft's documentation for more details of the format. * @param date the date part * @param time the time part * @return a {@link Calendar} containing the decoded date. diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/it-random-port.apt.vm b/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/it-random-port.apt.vm index 54beaa7a59..8635e87c3b 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/it-random-port.apt.vm +++ b/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 - {{{https://mojo.codehaus.org/build-helper-maven-plugin/}build-helper-plugin}}: + {{{https://www.mojohaus.org/build-helper-maven-plugin/}build-helper-plugin}}: --- From cf2b0bc8c2e0229e386cad6ef71845ba91e6f8b7 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 Mar 2019 12:23:55 +0000 Subject: [PATCH 03/12] Use HTTPS in YAML exmaple See gh-16316 --- .../src/main/asciidoc/spring-boot-features.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 12cf3f8595..59d9938fd9 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -558,10 +558,10 @@ For example, the following YAML document: ---- environments: dev: - url: http://dev.example.com + url: https://dev.example.com name: Developer Setup prod: - url: http://another.example.com + url: https://another.example.com name: My Cool App ---- @@ -569,9 +569,9 @@ Would be transformed into these properties: [source,properties,indent=0] ---- - environments.dev.url=http://dev.example.com + environments.dev.url=https://dev.example.com environments.dev.name=Developer Setup - environments.prod.url=http://another.example.com + environments.prod.url=https://another.example.com environments.prod.name=My Cool App ---- From 189eeefbb161495e50d7343914973cea61530756 Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Tue, 26 Mar 2019 04:15:00 -0500 Subject: [PATCH 04/12] Use HTTPS for external links wherever possible See gh-16317 --- CODE_OF_CONDUCT.adoc | 4 +- ...ServerTokenServicesConfigurationTests.java | 2 +- ...plateBasicOAuth2SsoConfigurationTests.java | 4 +- .../content/legal/open_source_licenses.txt | 6 +- .../main/asciidoc/spring-boot-features.adoc | 22 +++--- .../src/main/resources/templates/error.ftl | 2 +- .../src/main/resources/templates/home.ftl | 2 +- .../spring-boot-sample-cache/README.adoc | 2 +- .../main/java/sample/jooq/domain/Author.java | 2 +- .../main/java/sample/jooq/domain/Book.java | 2 +- .../java/sample/jooq/domain/BookStore.java | 2 +- .../sample/jooq/domain/BookToBookStore.java | 2 +- .../sample/jooq/domain/DefaultCatalog.java | 2 +- .../java/sample/jooq/domain/Language.java | 2 +- .../VehicleIdentificationNumberTests.java | 4 +- .../main/resources/static/js/jquery-1.7.2.js | 26 +++---- .../resources/static/js/jquery.validate.js | 68 +++++++++---------- .../src/main/resources/templates/layout.html | 4 +- .../resources/templates/messages/form.html | 4 +- .../resources/templates/messages/list.html | 4 +- .../resources/templates/messages/view.html | 4 +- spring-boot-starters/README.adoc | 18 ++--- .../web/client/AnotherExampleRestClient.java | 2 +- .../web/client/ExampleRestClient.java | 2 +- .../web/servlet/HateoasController.java | 2 +- .../RootUriRequestExpectationManager.java | 2 +- .../test/web/client/TestRestTemplate.java | 10 +-- ...MockServerRestTemplateCustomizerTests.java | 4 +- ...RootUriRequestExpectationManagerTests.java | 16 ++--- .../jar/CentralDirectoryFileHeader.java | 2 +- .../springframework/boot/ansi/AnsiColors.java | 2 +- .../web/client/RestTemplateBuilderTests.java | 8 +-- .../client/RootUriTemplateHandlerTests.java | 22 +++--- 33 files changed, 130 insertions(+), 130 deletions(-) diff --git a/CODE_OF_CONDUCT.adoc b/CODE_OF_CONDUCT.adoc index f013d6f36b..17783c7c06 100644 --- a/CODE_OF_CONDUCT.adoc +++ b/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/] diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java index 48ebeef907..c5550b1bc6 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java @@ -128,7 +128,7 @@ public class ResourceServerTokenServicesConfigurationTests { @Test public void userInfoWithPrincipal() { EnvironmentTestUtils.addEnvironment(this.environment, - "security.oauth2.resource.userInfoUri:http://example.com"); + "security.oauth2.resource.userInfoUri:https://example.com"); this.context = new SpringApplicationBuilder(PrincipalConfiguration.class) .environment(this.environment).web(false).run(); UserInfoTokenServices services = this.context diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomRestTemplateBasicOAuth2SsoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomRestTemplateBasicOAuth2SsoConfigurationTests.java index 0ddb2b23e8..1853ed0cfd 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomRestTemplateBasicOAuth2SsoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomRestTemplateBasicOAuth2SsoConfigurationTests.java @@ -48,8 +48,8 @@ import static org.mockito.Mockito.verifyZeroInteractions; @SpringBootTest @TestPropertySource(properties = { "security.oauth2.client.clientId=client", "security.oauth2.client.clientSecret=secret", - "security.oauth2.client.userAuthorizationUri=http://example.com/oauth/authorize", - "security.oauth2.client.accessTokenUri=http://example.com/oauth/token", + "security.oauth2.client.userAuthorizationUri=https://example.com/oauth/authorize", + "security.oauth2.client.accessTokenUri=https://example.com/oauth/token", "security.oauth2.resource.jwt.keyValue=SSSSHHH" }) public class CustomRestTemplateBasicOAuth2SsoConfigurationTests { diff --git a/spring-boot-cli/src/main/content/legal/open_source_licenses.txt b/spring-boot-cli/src/main/content/legal/open_source_licenses.txt index ea9d2bfa1e..ed797fbe20 100644 --- a/spring-boot-cli/src/main/content/legal/open_source_licenses.txt +++ b/spring-boot-cli/src/main/content/legal/open_source_licenses.txt @@ -230,7 +230,7 @@ limitations under the License >>> CGLIB 3.0 (cglib:cglib:3.0): Per the LICENSE file in the CGLIB JAR distribution downloaded from -http://sourceforge.net/projects/cglib/files/cglib3/3.0/cglib-3.0.jar/download, +https://sourceforge.net/projects/cglib/files/cglib3/3.0/cglib-3.0.jar/download, CGLIB 3.0 is licensed under the Apache License, version 2.0, the text of which is included above. @@ -250,7 +250,7 @@ Eclipse Public License, Version 1.0 is applicable to the following component(s). The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the -EPL is available at http://www.eclipse.org/legal/epl-v10.html. +EPL is available at https://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content. @@ -260,7 +260,7 @@ terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and -such source code may be obtained at http://www.eclipse.org/ +such source code may be obtained at https://www.eclipse.org/ diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index f9a7752576..912aebece0 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -1587,7 +1587,7 @@ it's loaded too early. You need to either use `logback-spring.xml` or define a `logging.config` property. WARNING: The extensions cannot be used with Logback's -http://logback.qos.ch/manual/configuration.html#autoScan[configuration scanning]. If you +https://logback.qos.ch/manual/configuration.html#autoScan[configuration scanning]. If you attempt to do so, making changes to the configuration file will result in an error similar to once of the following being logged: @@ -1766,7 +1766,7 @@ of converters. You can also override default converters that way. ==== Custom JSON Serializers and Deserializers If you're using Jackson to serialize and deserialize JSON data, you might want to write your own `JsonSerializer` and `JsonDeserializer` classes. Custom serializers are usually -http://wiki.fasterxml.com/JacksonHowToCustomDeserializers[registered with Jackson via a Module], +https://wiki.fasterxml.com/JacksonHowToCustomDeserializers[registered with Jackson via a Module], but Spring Boot provides an alternative `@JsonComponent` annotation which makes it easier to directly register Spring Beans. @@ -3449,7 +3449,7 @@ Mongo instance's configuration and logging routing. [[boot-features-neo4j]] === Neo4j -http://neo4j.com/[Neo4j] is an open-source NoSQL graph database that uses a rich data +https://neo4j.com/[Neo4j] is an open-source NoSQL graph database that uses a rich data model of nodes related by first class relationships which is better suited for connected big data than traditional rdbms approaches. Spring Boot offers several conveniences for working with Neo4j, including the `spring-boot-starter-data-neo4j` '`Starter`'. @@ -3560,7 +3560,7 @@ following two annotations to your Spring configuration: ---- TIP: For complete details of Spring Data Neo4j, including its rich object mapping -technologies, refer to their http://projects.spring.io/spring-data-neo4j/[reference +technologies, refer to their https://projects.spring.io/spring-data-neo4j/[reference documentation]. @@ -3648,7 +3648,7 @@ configured: [source,properties,indent=0] ---- - spring.elasticsearch.jest.uris=http://search.example.com:9200 + spring.elasticsearch.jest.uris=https://search.example.com:9200 spring.elasticsearch.jest.read-timeout=10000 spring.elasticsearch.jest.username=user spring.elasticsearch.jest.password=secret @@ -3775,7 +3775,7 @@ https://docs.spring.io/spring-data/cassandra/docs/[reference documentation]. [[boot-features-couchbase]] === Couchbase -http://www.couchbase.com/[Couchbase] is an open-source, distributed multi-model NoSQL +https://www.couchbase.com/[Couchbase] is an open-source, distributed multi-model NoSQL document-oriented database that is optimized for interactive applications. Spring Boot offers auto-configuration for Couchbase and abstractions on top of it provided by https://github.com/spring-projects/spring-data-couchbase[Spring Data Couchbase]. @@ -3824,7 +3824,7 @@ Check the `spring.couchbase.env.*` properties for more details. ==== Spring Data Couchbase repositories Spring Data includes repository support for Couchbase. For complete details of Spring Data Couchbase, refer to their -http://docs.spring.io/spring-data/couchbase/docs/current/reference/html/[reference documentation]. +https://docs.spring.io/spring-data/couchbase/docs/current/reference/html/[reference documentation]. You can inject an auto-configured `CouchbaseTemplate` instance as you would with any other Spring Bean as long as a _default_ `CouchbaseConfigurer` is available (that @@ -5023,13 +5023,13 @@ If you use the `spring-boot-starter-test` '`Starter`' (in the `test` `scope`), you will find the following provided libraries: -* http://junit.org[JUnit] -- The de-facto standard for unit testing Java applications. +* https://junit.org[JUnit] -- The de-facto standard for unit testing Java applications. * {spring-reference}/#integration-testing[Spring Test] & Spring Boot Test -- Utilities and integration test support for Spring Boot applications. -* http://joel-costigliola.github.io/assertj/[AssertJ] -- A fluent assertion library. +* https://joel-costigliola.github.io/assertj/[AssertJ] -- A fluent assertion library. * http://hamcrest.org/JavaHamcrest/[Hamcrest] -- A library of matcher objects (also known as constraints or predicates). -* http://mockito.org/[Mockito] -- A Java mocking framework. +* https://mockito.github.io[Mockito] -- A Java mocking framework. * https://github.com/skyscreamer/JSONassert[JSONassert] -- An assertion library for JSON. * https://github.com/jayway/JsonPath[JsonPath] -- XPath for JSON. @@ -5763,7 +5763,7 @@ public class MyTest { @Test public void testRequest() throws Exception { - HttpHeaders headers = template.getForEntity("http://myhost.com", String.class).getHeaders(); + HttpHeaders headers = template.getForEntity("https://myhost.com", String.class).getHeaders(); assertThat(headers.getLocation().toString(), containsString("myotherhost")); } diff --git a/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/error.ftl b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/error.ftl index 5c454e5cbc..f1c4444f93 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/error.ftl +++ b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/error.ftl @@ -11,7 +11,7 @@
                                  - FreeMarker - + FreeMarker - Plain
                                  • Home
                                    • diff --git a/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/home.ftl b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/home.ftl index ef97397c71..9f3e89cbab 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/home.ftl +++ b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/home.ftl @@ -11,7 +11,7 @@
                                    - FreeMarker - + FreeMarker - Plain
                                    • Home
                                      • diff --git a/spring-boot-samples/spring-boot-sample-cache/README.adoc b/spring-boot-samples/spring-boot-sample-cache/README.adoc index 7bc450fb39..e445a30f11 100644 --- a/spring-boot-samples/spring-boot-sample-cache/README.adoc +++ b/spring-boot-samples/spring-boot-sample-cache/README.adoc @@ -62,7 +62,7 @@ Simply add the `net.sf.ehcache:ehcache` dependency to the project. Since there i default `ehcache.xml` configuration file at the root of the classpath, it is automatically used to configure the underlying `CacheManager`. Note that EhCache 3 uses a different format and doesn't default to `ehcache.xml` anymore. Check -http://www.ehcache.org/documentation/3.0/xml.html[the documentation] for more details. +https://www.ehcache.org/documentation/3.0/xml.html[the documentation] for more details. diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Author.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Author.java index bad6cbd805..acf74c3135 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Author.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Author.java @@ -24,7 +24,7 @@ import org.jooq.impl.TableImpl; */ @Generated( value = { - "http://www.jooq.org", + "https://www.jooq.org", "jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ" diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Book.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Book.java index c1956abc04..0be1f1380f 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Book.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Book.java @@ -24,7 +24,7 @@ import org.jooq.impl.TableImpl; */ @Generated( value = { - "http://www.jooq.org", + "https://www.jooq.org", "jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ" diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookStore.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookStore.java index 2a9ec44f91..c726437715 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookStore.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookStore.java @@ -23,7 +23,7 @@ import org.jooq.impl.TableImpl; */ @Generated( value = { - "http://www.jooq.org", + "https://www.jooq.org", "jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ" diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookToBookStore.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookToBookStore.java index 14d7670efa..e8f535f968 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookToBookStore.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookToBookStore.java @@ -24,7 +24,7 @@ import org.jooq.impl.TableImpl; */ @Generated( value = { - "http://www.jooq.org", + "https://www.jooq.org", "jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ" diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/DefaultCatalog.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/DefaultCatalog.java index ad694671be..db89b2afdc 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/DefaultCatalog.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/DefaultCatalog.java @@ -19,7 +19,7 @@ import org.jooq.impl.CatalogImpl; */ @Generated( value = { - "http://www.jooq.org", + "https://www.jooq.org", "jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ" diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Language.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Language.java index d428bab66e..8f10139c02 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Language.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Language.java @@ -23,7 +23,7 @@ import org.jooq.impl.TableImpl; */ @Generated( value = { - "http://www.jooq.org", + "https://www.jooq.org", "jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ" diff --git a/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/domain/VehicleIdentificationNumberTests.java b/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/domain/VehicleIdentificationNumberTests.java index 5c6c13bfc2..d395bb5bcf 100644 --- a/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/domain/VehicleIdentificationNumberTests.java +++ b/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/domain/VehicleIdentificationNumberTests.java @@ -26,9 +26,9 @@ import static org.assertj.core.api.Assertions.assertThat; * Tests for {@link VehicleIdentificationNumber}. * * @author Phillip Webb - * @see + * @see * Naming standards for unit tests - * @see AssertJ + * @see AssertJ */ public class VehicleIdentificationNumberTests { diff --git a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/static/js/jquery-1.7.2.js b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/static/js/jquery-1.7.2.js index feeda93159..381b3e74cf 100644 --- a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/static/js/jquery-1.7.2.js +++ b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/static/js/jquery-1.7.2.js @@ -1,13 +1,13 @@ /*! * jQuery JavaScript Library v1.7.2 - * http://jquery.com/ + * https://jquery.com/ * * Copyright 2011, John Resig * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license + * https://jquery.org/license * * Includes Sizzle.js - * http://sizzlejs.com/ + * https://sizzlejs.com/ * Copyright 2011, The Dojo Foundation * Released under the MIT, BSD, and GPL Licenses. * @@ -565,7 +565,7 @@ jQuery.extend({ } // Make sure the incoming data is actual JSON - // Logic borrowed from http://json.org/json2.js + // Logic borrowed from https://json.org/json2.js if ( rvalidchars.test( data.replace( rvalidescape, "@" ) .replace( rvalidtokens, "]" ) .replace( rvalidbraces, "")) ) { @@ -604,7 +604,7 @@ jQuery.extend({ // Evaluates a script in a global context // Workarounds based on findings by Jim Driscoll - // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context + // https://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context globalEval: function( data ) { if ( data && rnotwhite.test( data ) ) { // We use execScript on Internet Explorer @@ -880,7 +880,7 @@ jQuery.extend({ }, // Use of jQuery.browser is frowned upon. - // More details: http://docs.jquery.com/Utilities/jQuery.browser + // More details: https://docs.jquery.com/Utilities/jQuery.browser uaMatch: function( ua ) { ua = ua.toLowerCase(); @@ -2159,7 +2159,7 @@ jQuery.fn.extend({ }); }, // Based off of the plugin by Clint Helfers, with permission. - // http://blindsignals.com/index.php/2009/07/jquery-delay/ + // http://blindsignals.com delay: function( time, type ) { time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time; type = type || "fx"; @@ -2688,7 +2688,7 @@ jQuery.extend({ tabIndex: { get: function( elem ) { // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set - // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ + // https://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ var attributeNode = elem.getAttributeNode("tabindex"); return attributeNode && attributeNode.specified ? @@ -3551,7 +3551,7 @@ function returnTrue() { } // jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding -// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html +// https://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html jQuery.Event.prototype = { preventDefault: function() { this.isDefaultPrevented = returnTrue; @@ -3941,7 +3941,7 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl * Sizzle CSS Selector Engine * Copyright 2011, The Dojo Foundation * Released under the MIT, BSD, and GPL Licenses. - * More information: http://sizzlejs.com/ + * More information: https://sizzlejs.com/ */ (function(){ @@ -6298,7 +6298,7 @@ function findInputs( elem ) { } } -// Derived From: http://www.iecss.com/shimprove/javascript/shimprove.1-0-1.js +// Derived From: https://www.iecss.com/shimprove/javascript/shimprove.1-0-1.js function shimCloneNode( elem ) { var div = document.createElement( "div" ); safeFragment.appendChild( div ); @@ -6735,7 +6735,7 @@ if ( document.defaultView && document.defaultView.getComputedStyle ) { // A tribute to the "awesome hack by Dean Edwards" // WebKit uses "computed value (percentage if specified)" instead of "used value" for margins - // which is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values + // which is against the CSSOM draft spec: https://dev.w3.org/csswg/cssom/#resolved-values if ( !jQuery.support.pixelMargin && computedStyle && rmargin.test( name ) && rnumnonpx.test( ret ) ) { width = style.width; style.width = ret; @@ -8250,7 +8250,7 @@ if ( jQuery.support.ajax ) { // Firefox throws exceptions when accessing properties // of an xhr when a network error occured - // http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE) + // https://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE) try { // Was never called and is aborted or complete diff --git a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/static/js/jquery.validate.js b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/static/js/jquery.validate.js index f2f398ae81..a28ef2376c 100644 --- a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/static/js/jquery.validate.js +++ b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/static/js/jquery.validate.js @@ -1,20 +1,20 @@ /** * jQuery Validation Plugin @VERSION * - * http://bassistance.de/jquery-plugins/jquery-plugin-validation/ - * http://docs.jquery.com/Plugins/Validation + * https://bassistance.de/jquery-plugins/jquery-plugin-validation/ + * https://docs.jquery.com/Plugins/Validation * * Copyright (c) 2012 Jörn Zaefferer * * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html + * https://www.opensource.org/licenses/mit-license.php + * https://www.gnu.org/licenses/gpl.html */ (function($) { $.extend($.fn, { - // http://docs.jquery.com/Plugins/Validation/validate + // https://docs.jquery.com/Plugins/Validation/validate validate: function( options ) { // if nothing is selected, return nothing; can't chain anyway @@ -92,7 +92,7 @@ $.extend($.fn, { return validator; }, - // http://docs.jquery.com/Plugins/Validation/valid + // https://docs.jquery.com/Plugins/Validation/valid valid: function() { if ( $(this[0]).is('form')) { return this.validate().form(); @@ -115,7 +115,7 @@ $.extend($.fn, { }); return result; }, - // http://docs.jquery.com/Plugins/Validation/rules + // https://docs.jquery.com/Plugins/Validation/rules rules: function(command, argument) { var element = this[0]; @@ -167,11 +167,11 @@ $.extend($.fn, { // Custom selectors $.extend($.expr[":"], { - // http://docs.jquery.com/Plugins/Validation/blank + // https://docs.jquery.com/Plugins/Validation/blank blank: function(a) {return !$.trim("" + a.value);}, - // http://docs.jquery.com/Plugins/Validation/filled + // https://docs.jquery.com/Plugins/Validation/filled filled: function(a) {return !!$.trim("" + a.value);}, - // http://docs.jquery.com/Plugins/Validation/unchecked + // https://docs.jquery.com/Plugins/Validation/unchecked unchecked: function(a) {return !a.checked;} }); @@ -264,7 +264,7 @@ $.extend($.validator, { } }, - // http://docs.jquery.com/Plugins/Validation/Validator/setDefaults + // https://docs.jquery.com/Plugins/Validation/Validator/setDefaults setDefaults: function(settings) { $.extend( $.validator.defaults, settings ); }, @@ -336,7 +336,7 @@ $.extend($.validator, { } }, - // http://docs.jquery.com/Plugins/Validation/Validator/form + // https://docs.jquery.com/Plugins/Validation/Validator/form form: function() { this.checkForm(); $.extend(this.submitted, this.errorMap); @@ -356,7 +356,7 @@ $.extend($.validator, { return this.valid(); }, - // http://docs.jquery.com/Plugins/Validation/Validator/element + // https://docs.jquery.com/Plugins/Validation/Validator/element element: function( element ) { element = this.validationTargetFor( this.clean( element ) ); this.lastElement = element; @@ -376,7 +376,7 @@ $.extend($.validator, { return result; }, - // http://docs.jquery.com/Plugins/Validation/Validator/showErrors + // https://docs.jquery.com/Plugins/Validation/Validator/showErrors showErrors: function(errors) { if(errors) { // add items to error list and map @@ -400,7 +400,7 @@ $.extend($.validator, { } }, - // http://docs.jquery.com/Plugins/Validation/Validator/resetForm + // https://docs.jquery.com/Plugins/Validation/Validator/resetForm resetForm: function() { if ( $.fn.resetForm ) { $( this.currentForm ).resetForm(); @@ -966,7 +966,7 @@ $.extend($.validator, { return data; }, - // http://docs.jquery.com/Plugins/Validation/Validator/addMethod + // https://docs.jquery.com/Plugins/Validation/Validator/addMethod addMethod: function(name, method, message) { $.validator.methods[name] = method; $.validator.messages[name] = message !== undefined ? message : $.validator.messages[name]; @@ -977,7 +977,7 @@ $.extend($.validator, { methods: { - // http://docs.jquery.com/Plugins/Validation/Methods/required + // https://docs.jquery.com/Plugins/Validation/Methods/required required: function(value, element, param) { // check if dependency is met if ( !this.depend(param, element) ) { @@ -994,7 +994,7 @@ $.extend($.validator, { return $.trim(value).length > 0; }, - // http://docs.jquery.com/Plugins/Validation/Methods/remote + // https://docs.jquery.com/Plugins/Validation/Methods/remote remote: function(value, element, param) { if ( this.optional(element) ) { return "dependency-mismatch"; @@ -1049,73 +1049,73 @@ $.extend($.validator, { return "pending"; }, - // http://docs.jquery.com/Plugins/Validation/Methods/minlength + // https://docs.jquery.com/Plugins/Validation/Methods/minlength minlength: function(value, element, param) { var length = $.isArray( value ) ? value.length : this.getLength($.trim(value), element); return this.optional(element) || length >= param; }, - // http://docs.jquery.com/Plugins/Validation/Methods/maxlength + // https://docs.jquery.com/Plugins/Validation/Methods/maxlength maxlength: function(value, element, param) { var length = $.isArray( value ) ? value.length : this.getLength($.trim(value), element); return this.optional(element) || length <= param; }, - // http://docs.jquery.com/Plugins/Validation/Methods/rangelength + // https://docs.jquery.com/Plugins/Validation/Methods/rangelength rangelength: function(value, element, param) { var length = $.isArray( value ) ? value.length : this.getLength($.trim(value), element); return this.optional(element) || ( length >= param[0] && length <= param[1] ); }, - // http://docs.jquery.com/Plugins/Validation/Methods/min + // https://docs.jquery.com/Plugins/Validation/Methods/min min: function( value, element, param ) { return this.optional(element) || value >= param; }, - // http://docs.jquery.com/Plugins/Validation/Methods/max + // https://docs.jquery.com/Plugins/Validation/Methods/max max: function( value, element, param ) { return this.optional(element) || value <= param; }, - // http://docs.jquery.com/Plugins/Validation/Methods/range + // https://docs.jquery.com/Plugins/Validation/Methods/range range: function( value, element, param ) { return this.optional(element) || ( value >= param[0] && value <= param[1] ); }, - // http://docs.jquery.com/Plugins/Validation/Methods/email + // https://docs.jquery.com/Plugins/Validation/Methods/email email: function(value, element) { // contributed by Scott Gonzalez: http://projects.scottsplayground.com/email_address_validation/ return this.optional(element) || /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i.test(value); }, - // http://docs.jquery.com/Plugins/Validation/Methods/url + // https://docs.jquery.com/Plugins/Validation/Methods/url url: function(value, element) { // contributed by Scott Gonzalez: http://projects.scottsplayground.com/iri/ return this.optional(element) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value); }, - // http://docs.jquery.com/Plugins/Validation/Methods/date + // https://docs.jquery.com/Plugins/Validation/Methods/date date: function(value, element) { return this.optional(element) || !/Invalid|NaN/.test(new Date(value)); }, - // http://docs.jquery.com/Plugins/Validation/Methods/dateISO + // https://docs.jquery.com/Plugins/Validation/Methods/dateISO dateISO: function(value, element) { return this.optional(element) || /^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/.test(value); }, - // http://docs.jquery.com/Plugins/Validation/Methods/number + // https://docs.jquery.com/Plugins/Validation/Methods/number number: function(value, element) { return this.optional(element) || /^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(value); }, - // http://docs.jquery.com/Plugins/Validation/Methods/digits + // https://docs.jquery.com/Plugins/Validation/Methods/digits digits: function(value, element) { return this.optional(element) || /^\d+$/.test(value); }, - // http://docs.jquery.com/Plugins/Validation/Methods/creditcard - // based on http://en.wikipedia.org/wiki/Luhn + // https://docs.jquery.com/Plugins/Validation/Methods/creditcard + // based on https://en.wikipedia.org/wiki/Luhn creditcard: function(value, element) { if ( this.optional(element) ) { return "dependency-mismatch"; @@ -1145,13 +1145,13 @@ $.extend($.validator, { return (nCheck % 10) === 0; }, - // http://docs.jquery.com/Plugins/Validation/Methods/accept + // https://docs.jquery.com/Plugins/Validation/Methods/accept accept: function(value, element, param) { param = typeof param === "string" ? param.replace(/,/g, '|') : "png|jpe?g|gif"; return this.optional(element) || value.match(new RegExp(".(" + param + ")$", "i")); }, - // http://docs.jquery.com/Plugins/Validation/Methods/equalTo + // https://docs.jquery.com/Plugins/Validation/Methods/equalTo equalTo: function(value, element, param) { // bind to the blur event of the target in order to revalidate whenever the target field is updated // TODO find a way to bind the event just once, avoiding the unbind-rebind overhead diff --git a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/layout.html b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/layout.html index 57277bff30..e757afa19e 100644 --- a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/layout.html +++ b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/layout.html @@ -1,6 +1,6 @@ - + Layout - Messages : Create diff --git a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/list.html b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/list.html index df84c5bb43..33e781706c 100644 --- a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/list.html +++ b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/list.html @@ -1,6 +1,6 @@ - Messages : View all diff --git a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/view.html b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/view.html index d443309ef2..3e0fe7da1a 100644 --- a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/view.html +++ b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/view.html @@ -1,5 +1,5 @@ - Messages : View diff --git a/spring-boot-starters/README.adoc b/spring-boot-starters/README.adoc index 2ae659507f..8cca86acf0 100644 --- a/spring-boot-starters/README.adoc +++ b/spring-boot-starters/README.adoc @@ -46,7 +46,7 @@ do as they were designed before this was clarified. | https://code.google.com/p/wro4j/[WRO4J] | https://github.com/sbuettner/spring-boot-autoconfigure-wro4j -| http://alexo.github.io/wro4j/[Wro4j] (Advanced usage) +| https://alexo.github.io/wro4j/[Wro4j] (Advanced usage) | https://github.com/michael-simons/wro4j-spring-boot-starter | https://projects.spring.io/spring-batch/[Spring Batch] (Advanced usage) @@ -70,13 +70,13 @@ do as they were designed before this was clarified. | https://cloudant.com/[Cloudant] | https://github.com/icha024/cloudant-spring-boot-starter -| http://www.grpc.io/[gRPC] +| https://www.grpc.io/[gRPC] | https://github.com/LogNet/grpc-spring-boot-starter | https://github.com/facebook/nifty[Nifty] (Thrift on Netty) | https://github.com/bigdullrock/nifty-spring-boot-starter -| http://www.couchbase.com/[Couchbase] HTTP session +| https://www.couchbase.com/[Couchbase] HTTP session | https://github.com/mkopylec/session-couchbase-spring-boot-starter | https://github.com/oembedler/spring-graphql-common[Spring GraphQL] (GraphQL and GraphiQL) @@ -91,16 +91,16 @@ do as they were designed before this was clarified. | http://ff4j.org/[Feature Flipping For Java (FF4J)] | https://github.com/clun/ff4j/ -| http://resteasy.jboss.org/[RESTEasy] +| https://resteasy.jboss.org/[RESTEasy] | https://github.com/paypal/resteasy-spring-boot -| JSF (http://primefaces.org/[PrimeFaces], http://primefaces-extensions.github.io/[PrimeFaces Extensions], http://bootsfaces.net/[BootsFaces], http://butterfaces.org/[ButterFaces], http://omnifaces.org/[OmniFaces], http://angularfaces.net/[AngularFaces], https://javaserverfaces.java.net/[Mojarra] and http://myfaces.apache.org[MyFaces]) +| JSF (https://primefaces.org/[PrimeFaces], https://primefaces-extensions.github.io/[PrimeFaces Extensions], https://bootsfaces.net/[BootsFaces], http://butterfaces.org/[ButterFaces], https://omnifaces.org/[OmniFaces], https://angularfaces.net/[AngularFaces], https://javaserverfaces.java.net/[Mojarra] and https://myfaces.apache.org[MyFaces]) | http://joinfaces.org | Charon reverse proxy | https://github.com/mkopylec/charon-spring-boot-starter -| http://www.wiremock.org[WireMock] and Spring REST Docs +| http://wiremock.org/[WireMock] and Spring REST Docs | https://github.com/ePages-de/restdocs-wiremock | https://cxf.apache.org/docs/springboot.html[Apache CXF] @@ -109,13 +109,13 @@ do as they were designed before this was clarified. | LDAP | https://github.com/eddumelendez/ldap-spring-boot -| http://infinispan.org/[Infinispan] +| https://infinispan.org/[Infinispan] | https://github.com/infinispan/infinispan-spring-boot -| http://restfb.com/[RestFB] Messenger +| https://restfb.com/[RestFB] Messenger | https://github.com/marsbits/restfbmessenger -| http://square.github.io/okhttp/[OkHttp] +| https://square.github.io/okhttp/[OkHttp] | https://github.com/freefair/okhttp-spring-boot |=== diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/AnotherExampleRestClient.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/AnotherExampleRestClient.java index 000577ab4f..611489b4f5 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/AnotherExampleRestClient.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/AnotherExampleRestClient.java @@ -31,7 +31,7 @@ public class AnotherExampleRestClient { private RestTemplate restTemplate; public AnotherExampleRestClient(RestTemplateBuilder builder) { - this.restTemplate = builder.rootUri("http://example.com").build(); + this.restTemplate = builder.rootUri("https://example.com").build(); } protected RestTemplate getRestTemplate() { diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/ExampleRestClient.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/ExampleRestClient.java index c73461a960..bd187d5fb8 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/ExampleRestClient.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/ExampleRestClient.java @@ -31,7 +31,7 @@ public class ExampleRestClient { private RestTemplate restTemplate; public ExampleRestClient(RestTemplateBuilder builder) { - this.restTemplate = builder.rootUri("http://example.com").build(); + this.restTemplate = builder.rootUri("https://example.com").build(); } protected RestTemplate getRestTemplate() { diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/HateoasController.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/HateoasController.java index 7560a920b4..08bc4ea894 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/HateoasController.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/HateoasController.java @@ -36,7 +36,7 @@ class HateoasController { @RequestMapping("/resource") public Resource> resource() { return new Resource>(new HashMap(), - new Link("self", "http://api.example.com")); + new Link("self", "https://api.example.com")); } @RequestMapping("/plain") diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManager.java b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManager.java index dbf66844e8..b31914faf7 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManager.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManager.java @@ -41,7 +41,7 @@ import org.springframework.web.util.UriTemplateHandler; * {@link RequestExpectationManager} that strips the specified root URI from the request * before verification. Can be used to simply test declarations when all REST calls start * the same way. For example: 
                                      - * RestTemplate restTemplate = new RestTemplateBuilder().rootUri("http://example.com").build();
+ * RestTemplate restTemplate = new RestTemplateBuilder().rootUri("https://example.com").build();
  * MockRestServiceServer server = RootUriRequestExpectationManager.bindTo(restTemplate);
  * server.expect(requestTo("/hello")).andRespond(withSuccess());
  * restTemplate.getForEntity("/hello", String.class);
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
index 38015afcfa..bba2488711 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
@@ -791,7 +791,7 @@ public class TestRestTemplate {
 	 * {@link ParameterizedTypeReference} is used to pass generic type information:
 	 * 
                                       	 * ParameterizedTypeReference<List<MyBean>> myBean = new ParameterizedTypeReference<List<MyBean>>() {};
-	 * ResponseEntity<List<MyBean>> response = template.exchange("http://example.com",HttpMethod.GET, null, myBean);
+	 * ResponseEntity<List<MyBean>> response = template.exchange("https://example.com",HttpMethod.GET, null, myBean);
 	 * 
                                      
 	 * @param url the URL
 	 * @param method the HTTP method (GET, POST, etc)
@@ -819,7 +819,7 @@ public class TestRestTemplate {
 	 * {@link ParameterizedTypeReference} is used to pass generic type information:
 	 * 
                                       	 * ParameterizedTypeReference<List<MyBean>> myBean = new ParameterizedTypeReference<List<MyBean>>() {};
-	 * ResponseEntity<List<MyBean>> response = template.exchange("http://example.com",HttpMethod.GET, null, myBean);
+	 * ResponseEntity<List<MyBean>> response = template.exchange("https://example.com",HttpMethod.GET, null, myBean);
 	 * 
                                      
 	 * @param url the URL
 	 * @param method the HTTP method (GET, POST, etc)
@@ -847,7 +847,7 @@ public class TestRestTemplate {
 	 * {@link ParameterizedTypeReference} is used to pass generic type information:
 	 * 
                                       	 * ParameterizedTypeReference<List<MyBean>> myBean = new ParameterizedTypeReference<List<MyBean>>() {};
-	 * ResponseEntity<List<MyBean>> response = template.exchange("http://example.com",HttpMethod.GET, null, myBean);
+	 * ResponseEntity<List<MyBean>> response = template.exchange("https://example.com",HttpMethod.GET, null, myBean);
 	 * 
                                      
 	 * @param url the URL
 	 * @param method the HTTP method (GET, POST, etc)
@@ -873,7 +873,7 @@ public class TestRestTemplate {
 	 * response as {@link ResponseEntity}. Typically used in combination with the static
 	 * builder methods on {@code RequestEntity}, for instance: 
                                       	 * MyRequest body = ...
-	 * RequestEntity request = RequestEntity.post(new URI("http://example.com/foo")).accept(MediaType.APPLICATION_JSON).body(body);
+	 * RequestEntity request = RequestEntity.post(new URI("https://example.com/foo")).accept(MediaType.APPLICATION_JSON).body(body);
 	 * ResponseEntity<MyResponse> response = template.exchange(request, MyResponse.class);
 	 * 
                                      
 	 * @param requestEntity the entity to write to the request
@@ -894,7 +894,7 @@ public class TestRestTemplate {
 	 * response as {@link ResponseEntity}. The given {@link ParameterizedTypeReference} is
 	 * used to pass generic type information: 
                                       	 * MyRequest body = ...
-	 * RequestEntity request = RequestEntity.post(new URI("http://example.com/foo")).accept(MediaType.APPLICATION_JSON).body(body);
+	 * RequestEntity request = RequestEntity.post(new URI("https://example.com/foo")).accept(MediaType.APPLICATION_JSON).body(body);
 	 * ParameterizedTypeReference<List<MyResponse>> myBean = new ParameterizedTypeReference<List<MyResponse>>() {};
 	 * ResponseEntity<List<MyResponse>> response = template.exchange(request, myBean);
 	 * 
                                      
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizerTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizerTests.java
index 292c0ee211..1f76808a36 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizerTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizerTests.java
@@ -78,7 +78,7 @@ public class MockServerRestTemplateCustomizerTests {
 		MockServerRestTemplateCustomizer customizer = new MockServerRestTemplateCustomizer(
 				UnorderedRequestExpectationManager.class);
 		customizer.customize(
-				new RestTemplateBuilder().rootUri("http://example.com").build());
+				new RestTemplateBuilder().rootUri("https://example.com").build());
 		assertThat(customizer.getServer()).extracting("expectationManager")
 				.hasAtLeastOneElementOfType(RootUriRequestExpectationManager.class);
 	}
@@ -87,7 +87,7 @@ public class MockServerRestTemplateCustomizerTests {
 	public void setDetectRootUriShouldDisableRootUriDetection() throws Exception {
 		this.customizer.setDetectRootUri(false);
 		this.customizer.customize(
-				new RestTemplateBuilder().rootUri("http://example.com").build());
+				new RestTemplateBuilder().rootUri("https://example.com").build());
 		assertThat(this.customizer.getServer()).extracting("expectationManager")
 				.hasAtLeastOneElementOfType(SimpleRequestExpectationManager.class);
 
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManagerTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManagerTests.java
index 0767dc230d..fc57d5ac1a 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManagerTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManagerTests.java
@@ -54,7 +54,7 @@ public class RootUriRequestExpectationManagerTests {
 	@Rule
 	public ExpectedException thrown = ExpectedException.none();
 
-	private String uri = "http://example.com";
+	private String uri = "https://example.com";
 
 	@Mock
 	private RequestExpectationManager delegate;
@@ -97,7 +97,7 @@ public class RootUriRequestExpectationManagerTests {
 	public void validateRequestWhenUriDoesNotStartWithRootUriShouldDelegateToExpectationManager()
 			throws Exception {
 		ClientHttpRequest request = mock(ClientHttpRequest.class);
-		given(request.getURI()).willReturn(new URI("http://spring.io/test"));
+		given(request.getURI()).willReturn(new URI("https://spring.io/test"));
 		this.manager.validateRequest(request);
 		verify(this.delegate).validateRequest(request);
 	}
@@ -121,9 +121,9 @@ public class RootUriRequestExpectationManagerTests {
 		given(request.getURI()).willReturn(new URI(this.uri + "/hello"));
 		given(this.delegate.validateRequest((ClientHttpRequest) any()))
 				.willThrow(new AssertionError(
-						"Request URI expected: was:"));
+						"Request URI expected: was:"));
 		this.thrown.expect(AssertionError.class);
-		this.thrown.expectMessage("Request URI expected:");
+		this.thrown.expectMessage("Request URI expected:");
 		this.manager.validateRequest(request);
 	}
 
@@ -172,7 +172,7 @@ public class RootUriRequestExpectationManagerTests {
 	@Test
 	public void boundRestTemplateShouldPrefixRootUri() {
 		RestTemplate restTemplate = new RestTemplateBuilder()
-				.rootUri("http://example.com").build();
+				.rootUri("https://example.com").build();
 		MockRestServiceServer server = RootUriRequestExpectationManager
 				.bindTo(restTemplate);
 		server.expect(requestTo("/hello")).andRespond(withSuccess());
@@ -182,14 +182,14 @@ public class RootUriRequestExpectationManagerTests {
 	@Test
 	public void boundRestTemplateWhenUrlIncludesDomainShouldNotPrefixRootUri() {
 		RestTemplate restTemplate = new RestTemplateBuilder()
-				.rootUri("http://example.com").build();
+				.rootUri("https://example.com").build();
 		MockRestServiceServer server = RootUriRequestExpectationManager
 				.bindTo(restTemplate);
 		server.expect(requestTo("/hello")).andRespond(withSuccess());
 		this.thrown.expect(AssertionError.class);
 		this.thrown.expectMessage(
-				"expected: but was:");
-		restTemplate.getForEntity("http://spring.io/hello", String.class);
+				"expected: but was:");
+		restTemplate.getForEntity("https://spring.io/hello", String.class);
 	}
 
 }
diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java
index 48db830f6c..b334259300 100644
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java
@@ -27,7 +27,7 @@ import org.springframework.boot.loader.data.RandomAccessData;
  *
  * @author Phillip Webb
  * @author Andy Wilkinson
- * @see Zip File Format
+ * @see Zip File Format
  */
 
 final class CentralDirectoryFileHeader implements FileHeader {
diff --git a/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiColors.java b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiColors.java
index 3401a52a97..2b37386c11 100644
--- a/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiColors.java
+++ b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiColors.java
@@ -121,7 +121,7 @@ public final class AnsiColors {
 					: (1.0 / 3.0) * Math.pow(29.0 / 6.0, 2) * t + (4.0 / 29.0));
 		}
 
-		// See http://en.wikipedia.org/wiki/Color_difference#CIE94
+		// See https://en.wikipedia.org/wiki/Color_difference#CIE94
 		public double getDistance(LabColor other) {
 			double c1 = Math.sqrt(this.a * this.a + this.b * this.b);
 			double deltaC = c1 - Math.sqrt(other.a * other.a + other.b * other.b);
diff --git a/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java b/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java
index 64f5b3aa13..be3ac18f6c 100644
--- a/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java
@@ -111,9 +111,9 @@ public class RestTemplateBuilderTests {
 
 	@Test
 	public void rootUriShouldApply() throws Exception {
-		RestTemplate restTemplate = this.builder.rootUri("http://example.com").build();
+		RestTemplate restTemplate = this.builder.rootUri("https://example.com").build();
 		MockRestServiceServer server = MockRestServiceServer.bindTo(restTemplate).build();
-		server.expect(requestTo("http://example.com/hello")).andRespond(withSuccess());
+		server.expect(requestTo("https://example.com/hello")).andRespond(withSuccess());
 		restTemplate.getForEntity("/hello", String.class);
 		server.verify();
 	}
@@ -122,11 +122,11 @@ public class RestTemplateBuilderTests {
 	public void rootUriShouldApplyAfterUriTemplateHandler() throws Exception {
 		UriTemplateHandler uriTemplateHandler = mock(UriTemplateHandler.class);
 		RestTemplate template = this.builder.uriTemplateHandler(uriTemplateHandler)
-				.rootUri("http://example.com").build();
+				.rootUri("https://example.com").build();
 		UriTemplateHandler handler = template.getUriTemplateHandler();
 		handler.expand("/hello");
 		assertThat(handler).isInstanceOf(RootUriTemplateHandler.class);
-		verify(uriTemplateHandler).expand("http://example.com/hello");
+		verify(uriTemplateHandler).expand("https://example.com/hello");
 	}
 
 	@Test
diff --git a/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java b/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java
index 0435414f94..523d1ba276 100644
--- a/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java
@@ -58,8 +58,8 @@ public class RootUriTemplateHandlerTests {
 	@SuppressWarnings("unchecked")
 	public void setup() throws URISyntaxException {
 		MockitoAnnotations.initMocks(this);
-		this.uri = new URI("http://example.com/hello");
-		this.handler = new RootUriTemplateHandler("http://example.com", this.delegate);
+		this.uri = new URI("https://example.com/hello");
+		this.handler = new RootUriTemplateHandler("https://example.com", this.delegate);
 		given(this.delegate.expand(anyString(), anyMap())).willReturn(this.uri);
 		given(this.delegate.expand(anyString(), (Object[]) anyVararg()))
 				.willReturn(this.uri);
@@ -76,14 +76,14 @@ public class RootUriTemplateHandlerTests {
 	public void createWithNullHandlerShouldThrowException() throws Exception {
 		this.thrown.expect(IllegalArgumentException.class);
 		this.thrown.expectMessage("Handler must not be null");
-		new RootUriTemplateHandler("http://example.com", null);
+		new RootUriTemplateHandler("https://example.com", null);
 	}
 
 	@Test
 	public void expandMapVariablesShouldPrefixRoot() throws Exception {
 		HashMap uriVariables = new HashMap();
 		URI expanded = this.handler.expand("/hello", uriVariables);
-		verify(this.delegate).expand("http://example.com/hello", uriVariables);
+		verify(this.delegate).expand("https://example.com/hello", uriVariables);
 		assertThat(expanded).isEqualTo(this.uri);
 	}
 
@@ -91,8 +91,8 @@ public class RootUriTemplateHandlerTests {
 	public void expandMapVariablesWhenPathDoesNotStartWithSlashShouldNotPrefixRoot()
 			throws Exception {
 		HashMap uriVariables = new HashMap();
-		URI expanded = this.handler.expand("http://spring.io/hello", uriVariables);
-		verify(this.delegate).expand("http://spring.io/hello", uriVariables);
+		URI expanded = this.handler.expand("https://spring.io/hello", uriVariables);
+		verify(this.delegate).expand("https://spring.io/hello", uriVariables);
 		assertThat(expanded).isEqualTo(this.uri);
 	}
 
@@ -100,7 +100,7 @@ public class RootUriTemplateHandlerTests {
 	public void expandArrayVariablesShouldPrefixRoot() throws Exception {
 		Object[] uriVariables = new Object[0];
 		URI expanded = this.handler.expand("/hello", uriVariables);
-		verify(this.delegate).expand("http://example.com/hello", uriVariables);
+		verify(this.delegate).expand("https://example.com/hello", uriVariables);
 		assertThat(expanded).isEqualTo(this.uri);
 	}
 
@@ -108,8 +108,8 @@ public class RootUriTemplateHandlerTests {
 	public void expandArrayVariablesWhenPathDoesNotStartWithSlashShouldNotPrefixRoot()
 			throws Exception {
 		Object[] uriVariables = new Object[0];
-		URI expanded = this.handler.expand("http://spring.io/hello", uriVariables);
-		verify(this.delegate).expand("http://spring.io/hello", uriVariables);
+		URI expanded = this.handler.expand("https://spring.io/hello", uriVariables);
+		verify(this.delegate).expand("https://spring.io/hello", uriVariables);
 		assertThat(expanded).isEqualTo(this.uri);
 	}
 
@@ -117,10 +117,10 @@ public class RootUriTemplateHandlerTests {
 	public void applyShouldWrapExistingTemplate() throws Exception {
 		RestTemplate restTemplate = new RestTemplate();
 		restTemplate.setUriTemplateHandler(this.delegate);
-		this.handler = RootUriTemplateHandler.addTo(restTemplate, "http://example.com");
+		this.handler = RootUriTemplateHandler.addTo(restTemplate, "https://example.com");
 		Object[] uriVariables = new Object[0];
 		URI expanded = this.handler.expand("/hello", uriVariables);
-		verify(this.delegate).expand("http://example.com/hello", uriVariables);
+		verify(this.delegate).expand("https://example.com/hello", uriVariables);
 		assertThat(expanded).isEqualTo(this.uri);
 	}
 

From 5bc43ae76b9af490618b04ed7e4e0d80232ce993 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson 
Date: Wed, 27 Mar 2019 12:37:39 +0000
Subject: [PATCH 05/12] Polish "Use HTTPS for external links wherever possible"

See gh-16317
---
 .../transaction/jta/NarayanaJtaConfiguration.java         | 4 ++--
 .../src/main/asciidoc/spring-boot-features.adoc           | 4 ++--
 spring-boot-starters/README.adoc                          | 8 ++++----
 .../boot/loader/jar/CentralDirectoryFileHeader.java       | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java
index 29b0dece50..331f949b37 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.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.
@@ -44,7 +44,7 @@ import org.springframework.transaction.jta.JtaTransactionManager;
 import org.springframework.util.StringUtils;
 
 /**
- * JTA Configuration for Narayana.
+ * JTA Configuration for Narayana.
  *
  * @author Gytis Trikleris
  * @since 1.4.0
diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
index 912aebece0..b9d704e305 100644
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -5027,8 +5027,8 @@ the following provided libraries:
 * {spring-reference}/#integration-testing[Spring Test] & Spring Boot Test --
   Utilities and integration test support for Spring Boot applications.
 * https://joel-costigliola.github.io/assertj/[AssertJ] -- A fluent assertion library.
-* http://hamcrest.org/JavaHamcrest/[Hamcrest] -- A library of matcher objects (also known
-  as constraints or predicates).
+* https://github.com/hamcrest/JavaHamcrest[Hamcrest] -- A library of matcher objects
+  (also known as constraints or predicates).
 * https://mockito.github.io[Mockito] -- A Java mocking framework.
 * https://github.com/skyscreamer/JSONassert[JSONassert] -- An assertion library for JSON.
 * https://github.com/jayway/JsonPath[JsonPath] -- XPath for JSON.
diff --git a/spring-boot-starters/README.adoc b/spring-boot-starters/README.adoc
index 8cca86acf0..816b4691dc 100644
--- a/spring-boot-starters/README.adoc
+++ b/spring-boot-starters/README.adoc
@@ -88,19 +88,19 @@ do as they were designed before this was clarified.
 | https://camunda.org/[Camunda BPM]
 | https://github.com/camunda/camunda-bpm-spring-boot-starter
 
-| http://ff4j.org/[Feature Flipping For Java (FF4J)]
+| https://ff4j.github.io[Feature Flipping For Java (FF4J)]
 | https://github.com/clun/ff4j/
 
 | https://resteasy.jboss.org/[RESTEasy]
 | https://github.com/paypal/resteasy-spring-boot
 
-| JSF (https://primefaces.org/[PrimeFaces], https://primefaces-extensions.github.io/[PrimeFaces Extensions], https://bootsfaces.net/[BootsFaces], http://butterfaces.org/[ButterFaces], https://omnifaces.org/[OmniFaces], https://angularfaces.net/[AngularFaces], https://javaserverfaces.java.net/[Mojarra] and https://myfaces.apache.org[MyFaces])
-| http://joinfaces.org
+| JSF (https://primefaces.org/[PrimeFaces], https://primefaces-extensions.github.io/[PrimeFaces Extensions], https://bootsfaces.net/[BootsFaces], https://github.com/ButterFaces/ButterFaces[ButterFaces], https://omnifaces.org/[OmniFaces], https://angularfaces.net/[AngularFaces], https://javaserverfaces.java.net/[Mojarra] and https://myfaces.apache.org[MyFaces])
+| https://github.com/joinfaces/joinfaces
 
 | Charon reverse proxy
 | https://github.com/mkopylec/charon-spring-boot-starter
 
-| http://wiremock.org/[WireMock] and Spring REST Docs
+| https://github.com/tomakehurst/wiremock[WireMock] and Spring REST Docs
 | https://github.com/ePages-de/restdocs-wiremock
 
 | https://cxf.apache.org/docs/springboot.html[Apache CXF]
diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java
index b334259300..7de06f68c7 100644
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.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.
@@ -27,7 +27,7 @@ import org.springframework.boot.loader.data.RandomAccessData;
  *
  * @author Phillip Webb
  * @author Andy Wilkinson
- * @see Zip File Format
+ * @see Zip File Format
  */
 
 final class CentralDirectoryFileHeader implements FileHeader {
@@ -123,8 +123,8 @@ final class CentralDirectoryFileHeader implements FileHeader {
 
 	/**
 	 * Decode MS-DOS Date Time details. See
-	 * mindprod.com/jgloss/zip.html for
-	 * more details of the format.
+	 * 
+	 * Microsoft's documentation for more details of the format.
 	 * @param date the date part
 	 * @param time the time part
 	 * @return a {@link Calendar} containing the decoded date.

From bbbfee64804eb0f56098e4a2d5f061852d489389 Mon Sep 17 00:00:00 2001
From: Spring Operator 
Date: Tue, 26 Mar 2019 04:15:27 -0500
Subject: [PATCH 06/12] Use HTTPS for external links wherever possible

See gh-16318
---
 .../CloudFoundryActuatorAutoConfigurationTests.java       | 4 ++--
 .../CloudFoundrySecurityInterceptorTests.java             | 2 +-
 .../cloudfoundry/CloudFoundrySecurityServiceTests.java    | 6 +++---
 .../boot/actuate/cloudfoundry/TokenValidatorTests.java    | 2 +-
 .../endpoint/mvc/AbstractEndpointHandlerMappingTests.java | 2 +-
 .../MultipleResourceServerConfigurationTests.java         | 2 +-
 .../ResourceServerTokenServicesConfigurationTests.java    | 4 ++--
 spring-boot-docs/src/main/asciidoc/deployment.adoc        | 4 ++--
 .../src/main/asciidoc/spring-boot-features.adoc           | 6 +++---
 .../spring-boot-sample-data-neo4j/README.adoc             | 2 +-
 .../src/main/resources/static/snake.html                  | 2 +-
 spring-boot-starters/README.adoc                          | 8 ++++----
 .../boot/configurationprocessor/json/JSONTokener.java     | 2 +-
 13 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java
index 8e1753aaa4..f5687359fc 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java
@@ -115,7 +115,7 @@ public class CloudFoundryActuatorAutoConfigurationTests {
 				"cloudFoundrySecurityService");
 		String cloudControllerUrl = (String) ReflectionTestUtils
 				.getField(interceptorSecurityService, "cloudControllerUrl");
-		assertThat(cloudControllerUrl).isEqualTo("http://my-cloud-controller.com");
+		assertThat(cloudControllerUrl).isEqualTo("https://my-cloud-controller.com");
 	}
 
 	@Test
@@ -189,7 +189,7 @@ public class CloudFoundryActuatorAutoConfigurationTests {
 	private CloudFoundryEndpointHandlerMapping getHandlerMapping() {
 		EnvironmentTestUtils.addEnvironment(this.context, "VCAP_APPLICATION:---",
 				"vcap.application.application_id:my-app-id",
-				"vcap.application.cf_api:http://my-cloud-controller.com");
+				"vcap.application.cf_api:https://my-cloud-controller.com");
 		this.context.refresh();
 		return this.context.getBean("cloudFoundryEndpointHandlerMapping",
 				CloudFoundryEndpointHandlerMapping.class);
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityInterceptorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityInterceptorTests.java
index a564fca0e4..142a9f1abf 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityInterceptorTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityInterceptorTests.java
@@ -74,7 +74,7 @@ public class CloudFoundrySecurityInterceptorTests {
 	@Test
 	public void preHandleWhenRequestIsPreFlightShouldReturnTrue() throws Exception {
 		this.request.setMethod("OPTIONS");
-		this.request.addHeader(HttpHeaders.ORIGIN, "http://example.com");
+		this.request.addHeader(HttpHeaders.ORIGIN, "https://example.com");
 		this.request.addHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "GET");
 		boolean preHandle = this.interceptor.preHandle(this.request, this.response,
 				this.handlerMethod);
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityServiceTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityServiceTests.java
index 86eb44046f..d2ec0ba355 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityServiceTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityServiceTests.java
@@ -50,12 +50,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;
 
@@ -152,7 +152,7 @@ public class CloudFoundrySecurityServiceTests {
 	public void fetchTokenKeysWhenSuccessfulShouldReturnListOfKeysFromUAA()
 			throws Exception {
 		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"
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/TokenValidatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/TokenValidatorTests.java
index 8101c537e4..e77a66cd55 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/TokenValidatorTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/TokenValidatorTests.java
@@ -182,7 +182,7 @@ public class TokenValidatorTests {
 	@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
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/AbstractEndpointHandlerMappingTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/AbstractEndpointHandlerMappingTests.java
index f23aa00b81..5d74e4a65f 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/AbstractEndpointHandlerMappingTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/AbstractEndpointHandlerMappingTests.java
@@ -75,7 +75,7 @@ public abstract class AbstractEndpointHandlerMappingTests {
 		mapping.setSecurityInterceptor(securityInterceptor);
 		mapping.afterPropertiesSet();
 		MockHttpServletRequest request = request("POST", "/a");
-		request.addHeader("Origin", "http://example.com");
+		request.addHeader("Origin", "https://example.com");
 		assertThat(mapping.getHandler(request).getInterceptors().length).isEqualTo(3);
 		assertThat(mapping.getHandler(request).getInterceptors()[2])
 				.isEqualTo(securityInterceptor);
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/MultipleResourceServerConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/MultipleResourceServerConfigurationTests.java
index 2625924cfe..303b24cb85 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/MultipleResourceServerConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/MultipleResourceServerConfigurationTests.java
@@ -56,7 +56,7 @@ public class MultipleResourceServerConfigurationTests {
 		this.context = new AnnotationConfigWebApplicationContext();
 		this.context.register(DoubleResourceConfiguration.class);
 		EnvironmentTestUtils.addEnvironment(this.context,
-				"security.oauth2.resource.tokenInfoUri:http://example.com",
+				"security.oauth2.resource.tokenInfoUri:https://example.com",
 				"security.oauth2.client.clientId=acme");
 		this.context.refresh();
 		assertThat(this.context
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java
index 15ec12e75f..1134daca6a 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java
@@ -239,7 +239,7 @@ public class ResourceServerTokenServicesConfigurationTests {
 	@Test
 	public void customUserInfoRestTemplateFactory() {
 		EnvironmentTestUtils.addEnvironment(this.environment,
-				"security.oauth2.resource.userInfoUri:http://example.com");
+				"security.oauth2.resource.userInfoUri:https://example.com");
 		this.context = new SpringApplicationBuilder(
 				CustomUserInfoRestTemplateFactory.class, ResourceConfiguration.class)
 						.environment(this.environment).web(false).run();
@@ -420,7 +420,7 @@ public class ResourceServerTokenServicesConfigurationTests {
 
 		@Bean
 		public TokenStore tokenStore() {
-			return new JwkTokenStore("http://my.key-set.uri");
+			return new JwkTokenStore("https://my.key-set.uri");
 		}
 
 	}
diff --git a/spring-boot-docs/src/main/asciidoc/deployment.adoc b/spring-boot-docs/src/main/asciidoc/deployment.adoc
index 77b426e05f..de6c995ea1 100644
--- a/spring-boot-docs/src/main/asciidoc/deployment.adoc
+++ b/spring-boot-docs/src/main/asciidoc/deployment.adoc
@@ -312,7 +312,7 @@ option : AWS Elastic Beanstalk.
 
 
 ==== AWS Elastic Beanstalk
-As described in the official http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/create_deploy_Java.html[Elastic
+As described in the official https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/create_deploy_Java.html[Elastic
 Beanstalk Java guide], there are two main options to deploy a Java application; You can
 either use the "`Tomcat Platform`" or the "`Java SE platform`".
 
@@ -356,7 +356,7 @@ binaries instead, add the following to your `.elasticbeanstalk/config.yml` file:
 ====== Reduce costs by setting the environment type
 By default an Elastic Beanstalk environment is load balanced. The load balancer has a cost
 perspective, to avoid it, set the environment type to "`Single instance`" as described
-http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/environments-create-wizard.html#environments-create-wizard-capacity[in the Amazon documentation].
+https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/environments-create-wizard.html#environments-create-wizard-capacity[in the Amazon documentation].
 Single instance environments can be created using the CLI as well using the following
 command:
 
diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
index 10c702b4ff..98c35f63e5 100644
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -3590,7 +3590,7 @@ persistence for the embedded mode:
 ====
 The Neo4j OGM embedded driver does not provide the Neo4j kernel. Users are expected to
 provide this dependency manually, see
-http://neo4j.com/docs/ogm-manual/current/reference/#reference:getting-started[the documentation]
+https://neo4j.com/docs/ogm-manual/current/reference/#reference:getting-started[the documentation]
 for more details.
 ====
 
@@ -4015,7 +4015,7 @@ If you need to customize connection settings you can use the `spring.ldap.base`
 ==== Spring Data LDAP repositories
 Spring Data includes repository support for LDAP. For complete details of Spring
 Data LDAP, refer to their
-http://docs.spring.io/spring-data/ldap/docs/1.0.x/reference/html/[reference documentation].
+https://docs.spring.io/spring-data/ldap/docs/1.0.x/reference/html/[reference documentation].
 
 You can also inject an auto-configured `LdapTemplate` instance as you would with any
 other Spring Bean.
@@ -4828,7 +4828,7 @@ reached.
 
 [[boot-features-kafka]]
 === Apache Kafka Support
-http://kafka.apache.org/[Apache Kafka] is supported by providing auto-configuration of the
+https://kafka.apache.org/[Apache Kafka] is supported by providing auto-configuration of the
 `spring-kafka` project.
 
 Kafka configuration is controlled by external configuration properties in
diff --git a/spring-boot-samples/spring-boot-sample-data-neo4j/README.adoc b/spring-boot-samples/spring-boot-sample-data-neo4j/README.adoc
index 60c402ac57..9e7d37cb24 100644
--- a/spring-boot-samples/spring-boot-sample-data-neo4j/README.adoc
+++ b/spring-boot-samples/spring-boot-sample-data-neo4j/README.adoc
@@ -12,5 +12,5 @@ spring.data.neo4j.password=secret
 You can also locally add the embedded driver to embed Neo4j instead. Note
 that Spring Boot does not provide dependency management for that GPL-licensed
 library, see
-http://docs.spring.io/spring-data/neo4j/docs/4.2.x/reference/html/#reference.getting_started.driver[the official documentation]
+https://docs.spring.io/spring-data/neo4j/docs/4.2.x/reference/html/#reference.getting_started.driver[the official documentation]
 for more details.
diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty93/src/main/resources/static/snake.html b/spring-boot-samples/spring-boot-sample-websocket-jetty93/src/main/resources/static/snake.html
index 492529d74e..fe0a2ea88e 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-jetty93/src/main/resources/static/snake.html
+++ b/spring-boot-samples/spring-boot-sample-websocket-jetty93/src/main/resources/static/snake.html
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 
 
+		"https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 
 	
diff --git a/spring-boot-starters/README.adoc b/spring-boot-starters/README.adoc
index 445b43365f..99b68a9fc7 100644
--- a/spring-boot-starters/README.adoc
+++ b/spring-boot-starters/README.adoc
@@ -31,7 +31,7 @@ do as they were designed before this was clarified.
 | https://qpid.apache.org/components/jms/[Apache Qpid]
 | https://github.com/amqphub/amqp-10-jms-spring-boot
 
-| http://wicket.apache.org/[Apache Wicket]
+| https://wicket.apache.org/[Apache Wicket]
 | https://github.com/MarcGiffing/wicket-spring-boot
 
 | https://camunda.org/[Camunda BPM]
@@ -82,7 +82,7 @@ do as they were designed before this was clarified.
 | JSF (https://primefaces.org/[PrimeFaces], https://primefaces-extensions.github.io/[PrimeFaces Extensions], https://bootsfaces.net/[BootsFaces], https://github.com/ButterFaces/ButterFaces[ButterFaces], https://omnifaces.org/[OmniFaces], https://angularfaces.net/[AngularFaces], https://javaserverfaces.java.net/[Mojarra] and https://myfaces.apache.org[MyFaces])
 | https://github.com/joinfaces/joinfaces
 
-| http://log4jdbc.brunorozendo.com/[Log4jdbc]
+| https://log4jdbc.brunorozendo.com/[Log4jdbc]
 | https://github.com/candrews/log4jdbc-spring-boot-starter
 
 | https://logback.qos.ch/access.html[Logback-access]
@@ -109,7 +109,7 @@ do as they were designed before this was clarified.
 | https://square.github.io/okhttp/[OkHttp]
 | https://github.com/freefair/okhttp-spring-boot
 
-| http://orika-mapper.github.io/orika-docs/[Orika]
+| https://orika-mapper.github.io/orika-docs/[Orika]
 | https://github.com/akihyro/orika-spring-boot-starter
 
 | https://resteasy.jboss.org/[RESTEasy]
@@ -127,7 +127,7 @@ do as they were designed before this was clarified.
 | https://github.com/StripesFramework/stripes[Stripes]
 | https://github.com/juanpablo-santos/stripes-spring-boot
 
-| http://teiid.org/[Teiid]
+| https://teiid.github.io/teiid.io/[Teiid]
 | https://github.com/teiid/teiid-spring-boot
 
 | https://vaadin.com/[Vaadin]
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONTokener.java b/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONTokener.java
index 42c2ab3733..443c8054af 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONTokener.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONTokener.java
@@ -19,7 +19,7 @@ package org.springframework.boot.configurationprocessor.json;
 // Note: this class was written without inspecting the non-free org.json sourcecode.
 
 /**
- * Parses a JSON (RFC 4627) encoded
+ * Parses a JSON (RFC 4627) encoded
  * string into the corresponding object. Most clients of this class will use only need the
  * {@link #JSONTokener(String) constructor} and {@link #nextValue} method. Example usage:
  * 
                                      
From 365fed59caf84323128b5a01fb3442aadb04fbd9 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson 
Date: Wed, 27 Mar 2019 15:01:48 +0000
Subject: [PATCH 07/12] Polish "Use HTTPS for external links wherever possible"

See gh-16381
---
 .../boot/loader/jar/CentralDirectoryFileHeader.java       | 4 ++--
 .../boot/jta/atomikos/AtomikosProperties.java             | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java
index ae4deb530c..eaf9d36670 100644
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java
@@ -122,8 +122,8 @@ final class CentralDirectoryFileHeader implements FileHeader {
 	}
 
 	/**
-	 * Decode MS-DOS Date Time details. See
-	 * 
+	 * Decode MS-DOS Date Time details. See 
 	 * Microsoft's documentation for more details of the format.
 	 * @param date the date part
 	 * @param time the time part
diff --git a/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java b/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java
index b5b5c92481..1b0863f4dd 100644
--- a/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java
+++ b/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java
@@ -178,10 +178,10 @@ public class AtomikosProperties {
 	 * address. If you plan to run more than one transaction manager against one database
 	 * you must set this property to a unique value or you might run into duplicate
 	 * transaction ID (XID) problems that can be quite subtle (example:
-	 * {@literal https://fogbugz.atomikos.com/default.asp?community.6.2225.7}). If multiple
-	 * instances need to use the same properties file then the easiest way to ensure
-	 * uniqueness for this property is by referencing a system property specified at VM
-	 * startup.
+	 * {@literal https://fogbugz.atomikos.com/default.asp?community.6.2225.7}). If
+	 * multiple instances need to use the same properties file then the easiest way to
+	 * ensure uniqueness for this property is by referencing a system property specified
+	 * at VM startup.
 	 * @param uniqueName the unique name
 	 */
 	public void setTransactionManagerUniqueName(String uniqueName) {

From c4d44574b20c49639937c043a8b784c6a72f01da Mon Sep 17 00:00:00 2001
From: Andy Wilkinson 
Date: Wed, 27 Mar 2019 20:05:29 +0000
Subject: [PATCH 08/12] Correct link to Groovy MarkupTemplateEngine
 documentation

See gh-16316
---
 .../src/main/resources/templates/layout.tpl                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/resources/templates/layout.tpl b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/resources/templates/layout.tpl
index b04ddd99ee..9e470ed9bb 100644
--- a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/resources/templates/layout.tpl
+++ b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/resources/templates/layout.tpl
@@ -8,7 +8,7 @@ html {
       div(class:'navbar') {
         div(class:'navbar-inner') {
           a(class:'brand',
-              href:'http://groovy-lang.org/404.html') {
+              href:'http://docs.groovy-lang.org/docs/latest/html/documentation/markup-template-engine.html') {
               yield 'Groovy - Layout'
           }
           ul(class:'nav') {

From 1a4c6f2dacac9d2ab9fa5e2649a36b2a96b2f894 Mon Sep 17 00:00:00 2001
From: Spring Operator 
Date: Tue, 26 Mar 2019 04:15:59 -0500
Subject: [PATCH 09/12] Use HTTPS for external links wherever possible

See gh-16319
---
 ...oundryWebFluxEndpointIntegrationTests.java |   6 +-
 ...FoundryActuatorAutoConfigurationTests.java |  22 ++--
 ...eCloudFoundrySecurityInterceptorTests.java |   2 +-
 ...ctiveCloudFoundrySecurityServiceTests.java |   2 +-
 .../reactive/ReactiveTokenValidatorTests.java |   2 +-
 ...FoundryActuatorAutoConfigurationTests.java |  18 +--
 ...FoundryMvcWebEndpointIntegrationTests.java |   6 +-
 .../CloudFoundrySecurityInterceptorTests.java |   2 +-
 .../boot/actuate/endpoint/web/LinkTests.java  |   6 +-
 .../WebFluxEndpointIntegrationTests.java      |   6 +-
 .../MvcWebEndpointIntegrationTests.java       |   6 +-
 ...entPropertiesRegistrationAdapterTests.java |  24 ++--
 .../OAuth2WebSecurityConfigurationTests.java  |   8 +-
 .../WebClientAutoConfigurationTests.java      |   8 +-
 .../src/test/resources/wsdl/service.wsdl      |   2 +-
 .../main/xslt/post-process-flattened-pom.xsl  |   2 +-
 .../devtools/restart/ChangeableUrlsTests.java |   2 +-
 .../src/main/asciidoc/build-tool-plugins.adoc |   8 +-
 .../src/main/asciidoc/deployment.adoc         |  12 +-
 .../src/main/asciidoc/getting-started.adoc    |  12 +-
 .../src/main/asciidoc/howto.adoc              |  12 +-
 .../src/main/asciidoc/index.adoc              |  10 +-
 .../asciidoc/production-ready-features.adoc   |   8 +-
 .../src/main/asciidoc/spring-boot-cli.adoc    |   4 +-
 .../main/asciidoc/spring-boot-features.adoc   | 106 +++++++++---------
 .../spring-boot-starters/README.adoc          |   8 +-
 .../main/xslt/post-process-flattened-pom.xsl  |   2 +-
 .../LocalHostUriTemplateHandlerTests.java     |   2 +-
 .../web/client/TestRestTemplateTests.java     |   4 +-
 .../env/OriginTrackedYamlLoaderTests.java     |   2 +-
 .../springframework/boot/env/test-yaml.yml    |   4 +-
 .../src/main/resources/templates/error.ftl    |   2 +-
 .../src/main/resources/templates/home.ftl     |   2 +-
 .../main/resources/templates/fragments.html   |   4 +-
 34 files changed, 163 insertions(+), 163 deletions(-)

diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryWebFluxEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryWebFluxEndpointIntegrationTests.java
index 51a9f021d1..8c773f57bd 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryWebFluxEndpointIntegrationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryWebFluxEndpointIntegrationTests.java
@@ -113,9 +113,9 @@ public class CloudFoundryWebFluxEndpointIntegrationTests {
 		this.contextRunner.run(withWebTestClient((client) -> client.options()
 				.uri("/cfApplication/test").accept(MediaType.APPLICATION_JSON)
 				.header("Access-Control-Request-Method", "POST")
-				.header("Origin", "http://example.com").exchange().expectStatus().isOk()
+				.header("Origin", "https://example.com").exchange().expectStatus().isOk()
 				.expectHeader()
-				.valueEquals("Access-Control-Allow-Origin", "http://example.com")
+				.valueEquals("Access-Control-Allow-Origin", "https://example.com")
 				.expectHeader().valueEquals("Access-Control-Allow-Methods", "GET,POST")));
 	}
 
@@ -204,7 +204,7 @@ public class CloudFoundryWebFluxEndpointIntegrationTests {
 				EndpointMediaTypes endpointMediaTypes,
 				CloudFoundrySecurityInterceptor interceptor) {
 			CorsConfiguration corsConfiguration = new CorsConfiguration();
-			corsConfiguration.setAllowedOrigins(Arrays.asList("http://example.com"));
+			corsConfiguration.setAllowedOrigins(Arrays.asList("https://example.com"));
 			corsConfiguration.setAllowedMethods(Arrays.asList("GET", "POST"));
 			return new CloudFoundryWebFluxEndpointHandlerMapping(
 					new EndpointMapping("/cfApplication"),
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java
index afac3d603b..1a37ef949d 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java
@@ -102,7 +102,7 @@ public class ReactiveCloudFoundryActuatorAutoConfigurationTests {
 		this.contextRunner
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
-						"vcap.application.cf_api:http://my-cloud-controller.com")
+						"vcap.application.cf_api:https://my-cloud-controller.com")
 				.run((context) -> {
 					CloudFoundryWebFluxEndpointHandlerMapping handlerMapping = getHandlerMapping(
 							context);
@@ -126,7 +126,7 @@ public class ReactiveCloudFoundryActuatorAutoConfigurationTests {
 		this.contextRunner
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
-						"vcap.application.cf_api:http://my-cloud-controller.com")
+						"vcap.application.cf_api:https://my-cloud-controller.com")
 				.run((context) -> {
 					WebTestClient webTestClient = WebTestClient
 							.bindToApplicationContext(context).build();
@@ -140,7 +140,7 @@ public class ReactiveCloudFoundryActuatorAutoConfigurationTests {
 		this.contextRunner
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
-						"vcap.application.cf_api:http://my-cloud-controller.com")
+						"vcap.application.cf_api:https://my-cloud-controller.com")
 				.run((context) -> {
 					CloudFoundryWebFluxEndpointHandlerMapping handlerMapping = getHandlerMapping(
 							context);
@@ -157,7 +157,7 @@ public class ReactiveCloudFoundryActuatorAutoConfigurationTests {
 		this.contextRunner
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
-						"vcap.application.cf_api:http://my-cloud-controller.com")
+						"vcap.application.cf_api:https://my-cloud-controller.com")
 				.run((context) -> {
 					CloudFoundryWebFluxEndpointHandlerMapping handlerMapping = getHandlerMapping(
 							context);
@@ -168,7 +168,7 @@ public class ReactiveCloudFoundryActuatorAutoConfigurationTests {
 					String cloudControllerUrl = (String) ReflectionTestUtils
 							.getField(interceptorSecurityService, "cloudControllerUrl");
 					assertThat(cloudControllerUrl)
-							.isEqualTo("http://my-cloud-controller.com");
+							.isEqualTo("https://my-cloud-controller.com");
 				});
 	}
 
@@ -193,7 +193,7 @@ public class ReactiveCloudFoundryActuatorAutoConfigurationTests {
 		this.contextRunner
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
-						"vcap.application.cf_api:http://my-cloud-controller.com")
+						"vcap.application.cf_api:https://my-cloud-controller.com")
 				.run((context) -> {
 					WebFilterChainProxy chainProxy = context
 							.getBean(WebFilterChainProxy.class);
@@ -240,7 +240,7 @@ public class ReactiveCloudFoundryActuatorAutoConfigurationTests {
 		this.contextRunner.withUserConfiguration(TestConfiguration.class)
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
-						"vcap.application.cf_api:http://my-cloud-controller.com")
+						"vcap.application.cf_api:https://my-cloud-controller.com")
 				.run((context) -> {
 					CloudFoundryWebFluxEndpointHandlerMapping handlerMapping = getHandlerMapping(
 							context);
@@ -258,7 +258,7 @@ public class ReactiveCloudFoundryActuatorAutoConfigurationTests {
 		this.contextRunner.withUserConfiguration(TestConfiguration.class)
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
-						"vcap.application.cf_api:http://my-cloud-controller.com")
+						"vcap.application.cf_api:https://my-cloud-controller.com")
 				.run((context) -> {
 					CloudFoundryWebFluxEndpointHandlerMapping handlerMapping = getHandlerMapping(
 							context);
@@ -282,7 +282,7 @@ public class ReactiveCloudFoundryActuatorAutoConfigurationTests {
 						AutoConfigurations.of(HealthEndpointAutoConfiguration.class))
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
-						"vcap.application.cf_api:http://my-cloud-controller.com")
+						"vcap.application.cf_api:https://my-cloud-controller.com")
 				.run((context) -> {
 					Collection endpoints = getHandlerMapping(
 							context).getEndpoints();
@@ -304,7 +304,7 @@ public class ReactiveCloudFoundryActuatorAutoConfigurationTests {
 						AutoConfigurations.of(HealthEndpointAutoConfiguration.class))
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
-						"vcap.application.cf_api:http://my-cloud-controller.com",
+						"vcap.application.cf_api:https://my-cloud-controller.com",
 						"management.cloudfoundry.skip-ssl-validation:true")
 				.run((context) -> {
 					CloudFoundryWebFluxEndpointHandlerMapping handlerMapping = getHandlerMapping(
@@ -327,7 +327,7 @@ public class ReactiveCloudFoundryActuatorAutoConfigurationTests {
 						AutoConfigurations.of(HealthEndpointAutoConfiguration.class))
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
-						"vcap.application.cf_api:http://my-cloud-controller.com")
+						"vcap.application.cf_api:https://my-cloud-controller.com")
 				.run((context) -> {
 					CloudFoundryWebFluxEndpointHandlerMapping handlerMapping = getHandlerMapping(
 							context);
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityInterceptorTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityInterceptorTests.java
index e18dd43135..b2be64d684 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityInterceptorTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityInterceptorTests.java
@@ -61,7 +61,7 @@ public class ReactiveCloudFoundrySecurityInterceptorTests {
 	@Test
 	public void preHandleWhenRequestIsPreFlightShouldBeOk() {
 		MockServerWebExchange request = MockServerWebExchange.from(MockServerHttpRequest
-				.options("/a").header(HttpHeaders.ORIGIN, "http://example.com")
+				.options("/a").header(HttpHeaders.ORIGIN, "https://example.com")
 				.header(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "GET").build());
 		StepVerifier.create(this.interceptor.preHandle(request, "/a")).consumeNextWith(
 				(response) -> assertThat(response.getStatus()).isEqualTo(HttpStatus.OK))
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityServiceTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityServiceTests.java
index 3cd8e92001..2d7055afad 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityServiceTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityServiceTests.java
@@ -46,7 +46,7 @@ public class ReactiveCloudFoundrySecurityServiceTests {
 	private static final String CLOUD_CONTROLLER_PERMISSIONS = CLOUD_CONTROLLER
 			+ "/v2/apps/my-app-id/permissions";
 
-	private static final String UAA_URL = "http://my-cloud-controller.com/uaa";
+	private static final String UAA_URL = "https://my-cloud-controller.com/uaa";
 
 	private ReactiveCloudFoundrySecurityService securityService;
 
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveTokenValidatorTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveTokenValidatorTests.java
index a7a663f2ba..5286356700 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveTokenValidatorTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveTokenValidatorTests.java
@@ -259,7 +259,7 @@ public class ReactiveTokenValidatorTests {
 	public void validateTokenWhenIssuerIsNotValidShouldThrowException() throws Exception {
 		given(this.securityService.fetchTokenKeys()).willReturn(Mono.just(VALID_KEYS));
 		given(this.securityService.getUaaUrl())
-				.willReturn(Mono.just("http://other-uaa.com"));
+				.willReturn(Mono.just("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\", \"scope\": [\"foo.bar\"]}";
 		StepVerifier
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java
index b9762af38d..ba3babeb99 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java
@@ -84,7 +84,7 @@ public class CloudFoundryActuatorAutoConfigurationTests {
 		this.contextRunner
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
-						"vcap.application.cf_api:http://my-cloud-controller.com")
+						"vcap.application.cf_api:https://my-cloud-controller.com")
 				.run((context) -> {
 					CloudFoundryWebEndpointServletHandlerMapping handlerMapping = getHandlerMapping(
 							context);
@@ -108,7 +108,7 @@ public class CloudFoundryActuatorAutoConfigurationTests {
 		this.contextRunner
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
-						"vcap.application.cf_api:http://my-cloud-controller.com")
+						"vcap.application.cf_api:https://my-cloud-controller.com")
 				.run((context) -> {
 					MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(context).build();
 					mockMvc.perform(get("/cloudfoundryapplication"))
@@ -122,7 +122,7 @@ public class CloudFoundryActuatorAutoConfigurationTests {
 		this.contextRunner
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
-						"vcap.application.cf_api:http://my-cloud-controller.com")
+						"vcap.application.cf_api:https://my-cloud-controller.com")
 				.run((context) -> {
 					CloudFoundryWebEndpointServletHandlerMapping handlerMapping = getHandlerMapping(
 							context);
@@ -139,7 +139,7 @@ public class CloudFoundryActuatorAutoConfigurationTests {
 		this.contextRunner
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
-						"vcap.application.cf_api:http://my-cloud-controller.com")
+						"vcap.application.cf_api:https://my-cloud-controller.com")
 				.run((context) -> {
 					CloudFoundryWebEndpointServletHandlerMapping handlerMapping = getHandlerMapping(
 							context);
@@ -150,7 +150,7 @@ public class CloudFoundryActuatorAutoConfigurationTests {
 					String cloudControllerUrl = (String) ReflectionTestUtils
 							.getField(interceptorSecurityService, "cloudControllerUrl");
 					assertThat(cloudControllerUrl)
-							.isEqualTo("http://my-cloud-controller.com");
+							.isEqualTo("https://my-cloud-controller.com");
 				});
 	}
 
@@ -159,7 +159,7 @@ public class CloudFoundryActuatorAutoConfigurationTests {
 		this.contextRunner
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
-						"vcap.application.cf_api:http://my-cloud-controller.com",
+						"vcap.application.cf_api:https://my-cloud-controller.com",
 						"management.cloudfoundry.skip-ssl-validation:true")
 				.run((context) -> {
 					CloudFoundryWebEndpointServletHandlerMapping handlerMapping = getHandlerMapping(
@@ -229,7 +229,7 @@ public class CloudFoundryActuatorAutoConfigurationTests {
 		this.contextRunner.withUserConfiguration(TestConfiguration.class)
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
-						"vcap.application.cf_api:http://my-cloud-controller.com")
+						"vcap.application.cf_api:https://my-cloud-controller.com")
 				.run((context) -> {
 					CloudFoundryWebEndpointServletHandlerMapping handlerMapping = getHandlerMapping(
 							context);
@@ -247,7 +247,7 @@ public class CloudFoundryActuatorAutoConfigurationTests {
 		this.contextRunner
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
-						"vcap.application.cf_api:http://my-cloud-controller.com",
+						"vcap.application.cf_api:https://my-cloud-controller.com",
 						"management.endpoints.web.path-mapping.test=custom")
 				.withUserConfiguration(TestConfiguration.class).run((context) -> {
 					CloudFoundryWebEndpointServletHandlerMapping handlerMapping = getHandlerMapping(
@@ -271,7 +271,7 @@ public class CloudFoundryActuatorAutoConfigurationTests {
 		this.contextRunner
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
-						"vcap.application.cf_api:http://my-cloud-controller.com")
+						"vcap.application.cf_api:https://my-cloud-controller.com")
 				.withConfiguration(
 						AutoConfigurations.of(HealthEndpointAutoConfiguration.class))
 				.run((context) -> {
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryMvcWebEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryMvcWebEndpointIntegrationTests.java
index c904a39c98..cc107cb500 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryMvcWebEndpointIntegrationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryMvcWebEndpointIntegrationTests.java
@@ -98,9 +98,9 @@ public class CloudFoundryMvcWebEndpointIntegrationTests {
 		load(TestEndpointConfiguration.class, (client) -> client.options()
 				.uri("/cfApplication/test").accept(MediaType.APPLICATION_JSON)
 				.header("Access-Control-Request-Method", "POST")
-				.header("Origin", "http://example.com").exchange().expectStatus().isOk()
+				.header("Origin", "https://example.com").exchange().expectStatus().isOk()
 				.expectHeader()
-				.valueEquals("Access-Control-Allow-Origin", "http://example.com")
+				.valueEquals("Access-Control-Allow-Origin", "https://example.com")
 				.expectHeader().valueEquals("Access-Control-Allow-Methods", "GET,POST"));
 	}
 
@@ -203,7 +203,7 @@ public class CloudFoundryMvcWebEndpointIntegrationTests {
 				EndpointMediaTypes endpointMediaTypes,
 				CloudFoundrySecurityInterceptor interceptor) {
 			CorsConfiguration corsConfiguration = new CorsConfiguration();
-			corsConfiguration.setAllowedOrigins(Arrays.asList("http://example.com"));
+			corsConfiguration.setAllowedOrigins(Arrays.asList("https://example.com"));
 			corsConfiguration.setAllowedMethods(Arrays.asList("GET", "POST"));
 			return new CloudFoundryWebEndpointServletHandlerMapping(
 					new EndpointMapping("/cfApplication"),
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundrySecurityInterceptorTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundrySecurityInterceptorTests.java
index 5fa174c60d..391656e2a6 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundrySecurityInterceptorTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundrySecurityInterceptorTests.java
@@ -64,7 +64,7 @@ public class CloudFoundrySecurityInterceptorTests {
 	@Test
 	public void preHandleWhenRequestIsPreFlightShouldReturnTrue() {
 		this.request.setMethod("OPTIONS");
-		this.request.addHeader(HttpHeaders.ORIGIN, "http://example.com");
+		this.request.addHeader(HttpHeaders.ORIGIN, "https://example.com");
 		this.request.addHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "GET");
 		SecurityResponse response = this.interceptor.preHandle(this.request,
 				EndpointId.of("test"));
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/LinkTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/LinkTests.java
index 8d306f92f9..462599457c 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/LinkTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/LinkTests.java
@@ -41,21 +41,21 @@ public class LinkTests {
 
 	@Test
 	public void getHrefShouldReturnHref() {
-		String href = "http://example.com";
+		String href = "https://example.com";
 		Link link = new Link(href);
 		assertThat(link.getHref()).isEqualTo(href);
 	}
 
 	@Test
 	public void isTemplatedWhenContainsPlaceholderShouldReturnTrue() {
-		String href = "http://example.com/{path}";
+		String href = "https://example.com/{path}";
 		Link link = new Link(href);
 		assertThat(link.isTemplated()).isTrue();
 	}
 
 	@Test
 	public void isTemplatedWhenContainsNoPlaceholderShouldReturnFalse() {
-		String href = "http://example.com/path";
+		String href = "https://example.com/path";
 		Link link = new Link(href);
 		assertThat(link.isTemplated()).isFalse();
 	}
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/reactive/WebFluxEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/reactive/WebFluxEndpointIntegrationTests.java
index 7066fcb7fe..01d06909bc 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/reactive/WebFluxEndpointIntegrationTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/reactive/WebFluxEndpointIntegrationTests.java
@@ -82,9 +82,9 @@ public class WebFluxEndpointIntegrationTests extends
 		load(TestEndpointConfiguration.class, (client) -> client.options().uri("/test")
 				.accept(MediaType.APPLICATION_JSON)
 				.header("Access-Control-Request-Method", "POST")
-				.header("Origin", "http://example.com").exchange().expectStatus().isOk()
+				.header("Origin", "https://example.com").exchange().expectStatus().isOk()
 				.expectHeader()
-				.valueEquals("Access-Control-Allow-Origin", "http://example.com")
+				.valueEquals("Access-Control-Allow-Origin", "https://example.com")
 				.expectHeader().valueEquals("Access-Control-Allow-Methods", "GET,POST"));
 	}
 
@@ -127,7 +127,7 @@ public class WebFluxEndpointIntegrationTests extends
 				Environment environment, WebEndpointDiscoverer endpointDiscoverer,
 				EndpointMediaTypes endpointMediaTypes) {
 			CorsConfiguration corsConfiguration = new CorsConfiguration();
-			corsConfiguration.setAllowedOrigins(Arrays.asList("http://example.com"));
+			corsConfiguration.setAllowedOrigins(Arrays.asList("https://example.com"));
 			corsConfiguration.setAllowedMethods(Arrays.asList("GET", "POST"));
 			return new WebFluxEndpointHandlerMapping(
 					new EndpointMapping(environment.getProperty("endpointPath")),
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/MvcWebEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/MvcWebEndpointIntegrationTests.java
index f5e6fbda04..a3187ec048 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/MvcWebEndpointIntegrationTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/MvcWebEndpointIntegrationTests.java
@@ -88,9 +88,9 @@ public class MvcWebEndpointIntegrationTests extends
 		load(TestEndpointConfiguration.class, (client) -> client.options().uri("/test")
 				.accept(MediaType.APPLICATION_JSON)
 				.header("Access-Control-Request-Method", "POST")
-				.header("Origin", "http://example.com").exchange().expectStatus().isOk()
+				.header("Origin", "https://example.com").exchange().expectStatus().isOk()
 				.expectHeader()
-				.valueEquals("Access-Control-Allow-Origin", "http://example.com")
+				.valueEquals("Access-Control-Allow-Origin", "https://example.com")
 				.expectHeader().valueEquals("Access-Control-Allow-Methods", "GET,POST"));
 	}
 
@@ -149,7 +149,7 @@ public class MvcWebEndpointIntegrationTests extends
 				Environment environment, WebEndpointDiscoverer endpointDiscoverer,
 				EndpointMediaTypes endpointMediaTypes) {
 			CorsConfiguration corsConfiguration = new CorsConfiguration();
-			corsConfiguration.setAllowedOrigins(Arrays.asList("http://example.com"));
+			corsConfiguration.setAllowedOrigins(Arrays.asList("https://example.com"));
 			corsConfiguration.setAllowedMethods(Arrays.asList("GET", "POST"));
 			return new WebMvcEndpointHandlerMapping(
 					new EndpointMapping(environment.getProperty("endpointPath")),
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java
index 25ccf44c21..5e8ebd3e6d 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java
@@ -47,18 +47,18 @@ public class OAuth2ClientPropertiesRegistrationAdapterTests {
 	public void getClientRegistrationsWhenUsingDefinedProviderShouldAdapt() {
 		OAuth2ClientProperties properties = new OAuth2ClientProperties();
 		Provider provider = new Provider();
-		provider.setAuthorizationUri("http://example.com/auth");
-		provider.setTokenUri("http://example.com/token");
-		provider.setUserInfoUri("http://example.com/info");
+		provider.setAuthorizationUri("https://example.com/auth");
+		provider.setTokenUri("https://example.com/token");
+		provider.setUserInfoUri("https://example.com/info");
 		provider.setUserNameAttribute("sub");
-		provider.setJwkSetUri("http://example.com/jwk");
+		provider.setJwkSetUri("https://example.com/jwk");
 		Registration registration = new Registration();
 		registration.setProvider("provider");
 		registration.setClientId("clientId");
 		registration.setClientSecret("clientSecret");
 		registration.setClientAuthenticationMethod("post");
 		registration.setAuthorizationGrantType("authorization_code");
-		registration.setRedirectUriTemplate("http://example.com/redirect");
+		registration.setRedirectUriTemplate("https://example.com/redirect");
 		registration.setScope(Collections.singleton("scope"));
 		registration.setClientName("clientName");
 		properties.getProvider().put("provider", provider);
@@ -68,13 +68,13 @@ public class OAuth2ClientPropertiesRegistrationAdapterTests {
 		ClientRegistration adapted = registrations.get("registration");
 		ProviderDetails adaptedProvider = adapted.getProviderDetails();
 		assertThat(adaptedProvider.getAuthorizationUri())
-				.isEqualTo("http://example.com/auth");
-		assertThat(adaptedProvider.getTokenUri()).isEqualTo("http://example.com/token");
+				.isEqualTo("https://example.com/auth");
+		assertThat(adaptedProvider.getTokenUri()).isEqualTo("https://example.com/token");
 		assertThat(adaptedProvider.getUserInfoEndpoint().getUri())
-				.isEqualTo("http://example.com/info");
+				.isEqualTo("https://example.com/info");
 		assertThat(adaptedProvider.getUserInfoEndpoint().getUserNameAttributeName())
 				.isEqualTo("sub");
-		assertThat(adaptedProvider.getJwkSetUri()).isEqualTo("http://example.com/jwk");
+		assertThat(adaptedProvider.getJwkSetUri()).isEqualTo("https://example.com/jwk");
 		assertThat(adapted.getRegistrationId()).isEqualTo("registration");
 		assertThat(adapted.getClientId()).isEqualTo("clientId");
 		assertThat(adapted.getClientSecret()).isEqualTo("clientSecret");
@@ -83,7 +83,7 @@ public class OAuth2ClientPropertiesRegistrationAdapterTests {
 		assertThat(adapted.getAuthorizationGrantType()).isEqualTo(
 				org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE);
 		assertThat(adapted.getRedirectUriTemplate())
-				.isEqualTo("http://example.com/redirect");
+				.isEqualTo("https://example.com/redirect");
 		assertThat(adapted.getScopes()).containsExactly("scope");
 		assertThat(adapted.getClientName()).isEqualTo("clientName");
 	}
@@ -132,7 +132,7 @@ public class OAuth2ClientPropertiesRegistrationAdapterTests {
 		registration.setClientSecret("clientSecret");
 		registration.setClientAuthenticationMethod("post");
 		registration.setAuthorizationGrantType("authorization_code");
-		registration.setRedirectUriTemplate("http://example.com/redirect");
+		registration.setRedirectUriTemplate("https://example.com/redirect");
 		registration.setScope(Collections.singleton("scope"));
 		registration.setClientName("clientName");
 		properties.getRegistration().put("registration", registration);
@@ -158,7 +158,7 @@ public class OAuth2ClientPropertiesRegistrationAdapterTests {
 		assertThat(adapted.getAuthorizationGrantType()).isEqualTo(
 				org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE);
 		assertThat(adapted.getRedirectUriTemplate())
-				.isEqualTo("http://example.com/redirect");
+				.isEqualTo("https://example.com/redirect");
 		assertThat(adapted.getScopes()).containsExactly("scope");
 		assertThat(adapted.getClientName()).isEqualTo("clientName");
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java
index 7eab884b20..f3f2b49ef2 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java
@@ -183,7 +183,7 @@ public class OAuth2WebSecurityConfigurationTests {
 		@Bean
 		public ClientRegistrationRepository clientRegistrationRepository() {
 			List registrations = new ArrayList<>();
-			registrations.add(getClientRegistration("first", "http://user-info-uri.com"));
+			registrations.add(getClientRegistration("first", "https://user-info-uri.com"));
 			registrations.add(getClientRegistration("second", "http://other-user-info"));
 			return new InMemoryClientRegistrationRepository(registrations);
 		}
@@ -195,9 +195,9 @@ public class OAuth2WebSecurityConfigurationTests {
 					org.springframework.security.oauth2.core.ClientAuthenticationMethod.BASIC)
 					.authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
 					.scope("read").clientSecret("secret")
-					.redirectUriTemplate("http://redirect-uri.com")
-					.authorizationUri("http://authorization-uri.com")
-					.tokenUri("http://token-uri.com").userInfoUri(userInfoUri)
+					.redirectUriTemplate("https://redirect-uri.com")
+					.authorizationUri("https://authorization-uri.com")
+					.tokenUri("https://token-uri.com").userInfoUri(userInfoUri)
 					.userNameAttributeName("login");
 			return builder.build();
 		}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientAutoConfigurationTests.java
index 0b3a16aa44..017b0f8b34 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientAutoConfigurationTests.java
@@ -100,23 +100,23 @@ public class WebClientAutoConfigurationTests {
 					WebClient.Builder firstBuilder = context
 							.getBean(WebClient.Builder.class);
 					firstBuilder.clientConnector(firstConnector)
-							.baseUrl("http://first.example.org");
+							.baseUrl("https://first.example.org");
 					ClientHttpConnector secondConnector = mock(ClientHttpConnector.class);
 					given(secondConnector.connect(any(), any(), any()))
 							.willReturn(Mono.just(response));
 					WebClient.Builder secondBuilder = context
 							.getBean(WebClient.Builder.class);
 					secondBuilder.clientConnector(secondConnector)
-							.baseUrl("http://second.example.org");
+							.baseUrl("https://second.example.org");
 					assertThat(firstBuilder).isNotEqualTo(secondBuilder);
 					firstBuilder.build().get().uri("/foo").exchange()
 							.block(Duration.ofSeconds(30));
 					secondBuilder.build().get().uri("/foo").exchange()
 							.block(Duration.ofSeconds(30));
 					verify(firstConnector).connect(eq(HttpMethod.GET),
-							eq(URI.create("http://first.example.org/foo")), any());
+							eq(URI.create("https://first.example.org/foo")), any());
 					verify(secondConnector).connect(eq(HttpMethod.GET),
-							eq(URI.create("http://second.example.org/foo")), any());
+							eq(URI.create("https://second.example.org/foo")), any());
 					WebClientCustomizer customizer = context
 							.getBean(WebClientCustomizer.class);
 					verify(customizer, times(1)).customize(any(WebClient.Builder.class));
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl
index 82c0467301..7daeeabdc1 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl
@@ -23,7 +23,7 @@
 	
 	
 		
+			transport="http://schemas.xmlsoap.org/soap/http/" />
 		
 			
 			
diff --git a/spring-boot-project/spring-boot-dependencies/src/main/xslt/post-process-flattened-pom.xsl b/spring-boot-project/spring-boot-dependencies/src/main/xslt/post-process-flattened-pom.xsl
index 72e984b0f9..f00a6e8da0 100644
--- a/spring-boot-project/spring-boot-dependencies/src/main/xslt/post-process-flattened-pom.xsl
+++ b/spring-boot-project/spring-boot-dependencies/src/main/xslt/post-process-flattened-pom.xsl
@@ -3,7 +3,7 @@
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:m="http://maven.apache.org/POM/4.0.0"
 	exclude-result-prefixes="m">
 	
+		xslt:indent-amount="4" xmlns:xslt="https://xml.apache.org/xslt" />
 	
 	
 		
diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ChangeableUrlsTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ChangeableUrlsTests.java
index 236acd5d01..1bf089221d 100644
--- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ChangeableUrlsTests.java
+++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ChangeableUrlsTests.java
@@ -59,7 +59,7 @@ public class ChangeableUrlsTests {
 
 	@Test
 	public void httpUrl() throws Exception {
-		URL url = new URL("http://spring.io");
+		URL url = new URL("https://spring.io");
 		assertThat(ChangeableUrls.fromUrls(url)).isEmpty();
 	}
 
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc
index 4a29dbe0a8..b4c6ff1112 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc
@@ -33,7 +33,7 @@ section of your `pom.xml`, as shown in the following example:
 ----
 	
 	
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 		4.0.0
 		
 		
@@ -108,7 +108,7 @@ the usual `packaging` element, as shown in the following example:
 ----
 	
 	
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 		
 		jar
 		
@@ -137,7 +137,7 @@ following example:
 ----
 	
 	
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 		
 		war
 		
@@ -366,7 +366,7 @@ If your archive already includes libraries, you can use `Libraries.NONE`.
 [[build-tool-plugins-find-a-main-class]]
 === Finding a Main Class
 If you do not use `Repackager.setMainClass()` to specify a main class, the repackager
-uses http://asm.ow2.org/[ASM] to read class files and tries to find a suitable class with
+uses https://asm.ow2.org/[ASM] to read class files and tries to find a suitable class with
 a `public static void main(String[] args)` method. An exception is thrown if more than one
 candidate is found.
 
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc
index cc644d783d..9adde705ab 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc
@@ -113,7 +113,7 @@ using the `cf apps` command, as shown in the following example:
 
 Once Cloud Foundry acknowledges that your application has been deployed, you should be
 able to find the application at the URI given. In the preceding example, you could find
-it at `\http://acloudyspringtime.cfapps.io/`.
+it at `\https://acloudyspringtime.cfapps.io/`.
 
 
 
@@ -202,7 +202,7 @@ deployments is to `git push` the code to production, as shown in the following e
 	       Downloading: https://repo.spring.io/...
 	       Downloaded: https://repo.spring.io/... (818 B at 1.8 KB/sec)
 			....
-	       Downloaded: http://s3pository.heroku.com/jvm/... (152 KB at 595.3 KB/sec)
+	       Downloaded: https://s3pository.heroku.com/jvm/... (152 KB at 595.3 KB/sec)
 	       [INFO] Installing /tmp/build_0c35a5d2-a067-4abc-a232-14b1fb7a8229/target/...
 	       [INFO] Installing /tmp/build_0c35a5d2-a067-4abc-a232-14b1fb7a8229/pom.xml ...
 	       [INFO] ------------------------------------------------------------------------
@@ -218,7 +218,7 @@ deployments is to `git push` the code to production, as shown in the following e
 
 	-----> Compressing... *done*, 70.4MB
 	-----> Launching... *done*, v6
-	       http://agile-sierra-1405.herokuapp.com/ *deployed to Heroku*
+	       https://agile-sierra-1405.herokuapp.com/ *deployed to Heroku*
 
 	To git@heroku.com:agile-sierra-1405.git
 	 * [new branch]      master -> master
@@ -376,7 +376,7 @@ example:
 	Payload started in 00:29.266s -> http://52.28.235.61/
 	Remapping Elastic IP 52.28.233.167 to i-92ef9f53 ...
 	Waiting 15s for AWS to complete Elastic IP Zero Downtime transition ...
-	Deployment completed successfully. axelfontaine/myapp:1.0 is up and running at http://myapp-axelfontaine.boxfuse.io/
+	Deployment completed successfully. axelfontaine/myapp:1.0 is up and running at https://myapp-axelfontaine.boxfuse.io/
 ----
 
 Your application should now be up and running on AWS.
@@ -643,7 +643,7 @@ the `run` command is used by default.
 Note that, unlike when running as an `init.d` service, the user that runs the application,
 the PID file, and the console log file are managed by `systemd` itself and therefore must
 be configured by using appropriate fields in the '`service`' script. Consult the
-http://www.freedesktop.org/software/systemd/man/systemd.service.html[service unit
+https://www.freedesktop.org/software/systemd/man/systemd.service.html[service unit
 configuration man page] for more details.
 
 To flag the application to start automatically on system boot, use the following command:
@@ -812,7 +812,7 @@ If it is not a symlink or you want to explicitly set the app name, this can be u
 NOTE: The `PID_FOLDER`, `LOG_FOLDER`, and `LOG_FILENAME` variables are only valid for an
 `init.d` service. For `systemd`, the equivalent customizations are made by using the
 '`service`' script. See the
-http://www.freedesktop.org/software/systemd/man/systemd.service.html[service unit
+https://www.freedesktop.org/software/systemd/man/systemd.service.html[service unit
 configuration man page] for more details.
 
 [[deployment-script-customization-conf-file]]
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc
index d247c077c4..04ce237570 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc
@@ -129,7 +129,7 @@ The following listing shows a typical `pom.xml` file:
 ----
 	
 	
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 		4.0.0
 
 		com.example
@@ -257,7 +257,7 @@ classpath is set correctly).
 ==== Installation with SDKMAN!
 SDKMAN! (The Software Development Kit Manager) can be used for managing multiple versions
 of various binary SDKs, including Groovy and the Spring Boot CLI.
-Get SDKMAN! from http://sdkman.io and install Spring Boot by using the following
+Get SDKMAN! from https://sdkman.io and install Spring Boot by using the following
 commands:
 
 [indent=0,subs="verbatim,quotes,attributes"]
@@ -305,7 +305,7 @@ You can see it by running the following command:
 
 [[getting-started-homebrew-cli-installation]]
 ==== OSX Homebrew Installation
-If you are on a Mac and use http://brew.sh/[Homebrew], you can install the Spring Boot
+If you are on a Mac and use https://brew.sh/[Homebrew], you can install the Spring Boot
 CLI by using the following commands:
 
 [indent=0]
@@ -323,7 +323,7 @@ that case, run `brew update` and try again.
 
 [[getting-started-macports-cli-installation]]
 ==== MacPorts Installation
-If you are on a Mac and use http://www.macports.org/[MacPorts], you can install the
+If you are on a Mac and use https://www.macports.org/[MacPorts], you can install the
 Spring Boot CLI by using the following command:
 
 [indent=0]
@@ -358,7 +358,7 @@ completion scripts are automatically registered with your shell.
 
 [[getting-started-scoop-cli-installation]]
 ==== Windows Scoop Installation
-If you are on a Windows and use http://scoop.sh/[Scoop], you can install the Spring Boot
+If you are on a Windows and use https://scoop.sh/[Scoop], you can install the Spring Boot
 CLI by using the following commands:
 
 [indent=0]
@@ -499,7 +499,7 @@ used to build your project. Open your favorite text editor and add the following
 ----
 	
 	
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 		4.0.0
 
 		com.example
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc
index ca932b8c2c..5c85640967 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc
@@ -1447,7 +1447,7 @@ include::{code-examples}/web/client/RestTemplateProxyCustomizationExample.java[t
 
 Spring Boot has no mandatory logging dependency, except for the Commons Logging API, which
 is typically provided by Spring Framework's `spring-jcl` module. To use
-http://logback.qos.ch[Logback], you need to include it and `spring-jcl` on the classpath.
+https://logback.qos.ch[Logback], you need to include it and `spring-jcl` on the classpath.
 The simplest way to do that is through the starters, which all depend on
 `spring-boot-starter-logging`. For a web application, you need only
 `spring-boot-starter-web`, since it depends transitively on the logging starter. If you
@@ -1551,7 +1551,7 @@ following example:
 
 [[howto-configure-log4j-for-logging]]
 === Configure Log4j for Logging
-Spring Boot supports http://logging.apache.org/log4j/2.x[Log4j 2] for logging
+Spring Boot supports https://logging.apache.org/log4j/2.x[Log4j 2] for logging
 configuration if it is on the classpath. If you use the starters for
 assembling dependencies, you have to exclude Logback and then include log4j 2
 instead. If you do not use the starters, you need to provide (at least) `spring-jcl` in
@@ -2201,7 +2201,7 @@ You can also switch off the initialization explicitly by setting
 [[howto-use-a-higher-level-database-migration-tool]]
 === Use a Higher-level Database Migration Tool
 Spring Boot supports two higher-level migration tools: https://flywaydb.org/[Flyway]
-and http://www.liquibase.org/[Liquibase].
+and https://www.liquibase.org/[Liquibase].
 
 [[howto-execute-flyway-database-migrations-on-startup]]
 ==== Execute Flyway Database Migrations on Startup
@@ -2591,7 +2591,7 @@ for other Groovy customization options.
 === Fast Application Restarts
 The `spring-boot-devtools` module includes support for automatic application restarts.
 While not as fast as technologies such as
-http://zeroturnaround.com/software/jrebel/[JRebel] it is usually significantly faster than
+https://zeroturnaround.com/software/jrebel/[JRebel] it is usually significantly faster than
 a "`cold start`". You should probably give it a try before investigating some of the more
 complex reload options discussed later in this document.
 
@@ -3227,9 +3227,9 @@ rather than the version that was pre-installed with the server. You can do so by
 		xmlns:wls="http://xmlns.oracle.com/weblogic/weblogic-web-app"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-			http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd
+			https://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd
 			http://xmlns.oracle.com/weblogic/weblogic-web-app
-			http://xmlns.oracle.com/weblogic/weblogic-web-app/1.4/weblogic-web-app.xsd">
+			https://xmlns.oracle.com/weblogic/weblogic-web-app/1.4/weblogic-web-app.xsd">
 		
 			
 				org.slf4j
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/index.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/index.adoc
index ada56e9adf..5c3db85e90 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/index.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/index.adoc
@@ -46,9 +46,9 @@ Phillip Webb; Dave Syer; Josh Long; Stéphane Nicoll; Rob Winch; Andy Wilkinson;
 :spring-rest-docs: https://projects.spring.io/spring-restdocs/
 :spring-integration: https://projects.spring.io/spring-integration/
 :spring-session: https://projects.spring.io/spring-session/
-:spring-framework: http://projects.spring.io/spring-framework/
-:spring-security: http://projects.spring.io/spring-security/
-:spring-data-jpa: http://projects.spring.io/spring-data-jpa/
+:spring-framework: https://projects.spring.io/spring-framework/
+:spring-security: https://projects.spring.io/spring-security/
+:spring-data-jpa: https://projects.spring.io/spring-data-jpa/
 :spring-security-reference: https://docs.spring.io/spring-security/site/docs/{spring-security-docs-version}/reference/htmlsingle
 :spring-security-oauth2-reference: https://projects.spring.io/spring-security-oauth/docs/oauth2.html
 :spring-webservices-reference: https://docs.spring.io/spring-ws/docs/{spring-webservices-docs-version}/reference/
@@ -62,7 +62,7 @@ Phillip Webb; Dave Syer; Josh Long; Stéphane Nicoll; Rob Winch; Andy Wilkinson;
 :spring-data: https://projects.spring.io/spring-data/
 :spring-data-rest-javadoc: https://docs.spring.io/spring-data/rest/docs/current/api/org/springframework/data/rest
 :gradle-userguide: https://www.gradle.org/docs/current/userguide
-:ant-manual: http://ant.apache.org/manual
+:ant-manual: https://ant.apache.org/manual
 :code-examples: ../java/org/springframework/boot/docs
 :test-examples: ../../test/java/org/springframework/boot/docs
 :gradle-user-guide: https://docs.gradle.org/4.2.1/userguide
@@ -70,7 +70,7 @@ Phillip Webb; Dave Syer; Josh Long; Stéphane Nicoll; Rob Winch; Andy Wilkinson;
 :jetty-documentation: https://www.eclipse.org/jetty/documentation/9.4.x
 :jooq-manual: https://www.jooq.org/doc/{jooq-version}/manual-single-page
 :micrometer-concepts-documentation: https://micrometer.io/docs/concepts
-:micrometer-registry-documentation: http://micrometer.io/docs/registry
+:micrometer-registry-documentation: https://micrometer.io/docs/registry
 :tomcat-documentation: https://tomcat.apache.org/tomcat-8.5-doc
 :kotlin-documentation: https://kotlinlang.org/docs/reference/
 :junit5-documentation: https://junit.org/junit5/docs/current/user-guide
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
index 005ecb1465..f5b17a62d8 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
@@ -474,7 +474,7 @@ configuration permits `GET` and `POST` calls from the `example.com` domain:
 
 [source,properties,indent=0]
 ----
-	management.endpoints.web.cors.allowed-origins=http://example.com
+	management.endpoints.web.cors.allowed-origins=https://example.com
 	management.endpoints.web.cors.allowed-methods=GET,POST
 ----
 
@@ -1401,7 +1401,7 @@ https://github.com/Netflix/atlas[Atlas server] to use can be provided using:
 
 [source,properties,indent=0]
 ----
-	management.metrics.export.atlas.uri=http://atlas.example.com:7101/api/v1/publish
+	management.metrics.export.atlas.uri=https://atlas.example.com:7101/api/v1/publish
 ----
 
 
@@ -1478,7 +1478,7 @@ server] to use can be provided using:
 
 [source,properties,indent=0]
 ----
-	management.metrics.export.influx.uri=http://influx.example.com:8086
+	management.metrics.export.influx.uri=https://influx.example.com:8086
 ----
 
 
@@ -2049,7 +2049,7 @@ include::{code-examples}/cloudfoundry/CloudFoundryCustomContextPathExample.java[
 == What to Read Next
 If you want to explore some of the concepts discussed in this chapter, you can take a
 look at the actuator {github-code}/spring-boot-samples[sample applications]. You also
-might want to read about graphing tools such as http://graphite.wikidot.com/[Graphite].
+might want to read about graphing tools such as https://graphite.wikidot.com/[Graphite].
 
 Otherwise, you can continue on, to read about <> or jump ahead for some in-depth information about Spring Boot's
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-cli.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-cli.adoc
index 215a93989c..cf24b7dce6 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-cli.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-cli.adoc
@@ -247,7 +247,7 @@ You can use `@DependencyManagementBom` anywhere that you can use `@Grab`. Howeve
 ensure consistent ordering of the dependency management, you can use
 `@DependencyManagementBom` at most once in your application. A useful source of dependency
 management (which is a superset of Spring Boot's dependency management) is the
-http://platform.spring.io/[Spring IO Platform], which you might include with the following
+https://platform.spring.io/[Spring IO Platform], which you might include with the following
 line:
 
 [source,java,indent=0]
@@ -421,7 +421,7 @@ following example:
 [[cli-groovy-beans-dsl]]
 == Developing Applications with the Groovy Beans DSL
 Spring Framework 4.0 has native support for a `beans{}` "`DSL`" (borrowed from
-http://grails.org/[Grails]), and you can embed bean definitions in your Groovy application
+https://grails.org/[Grails]), and you can embed bean definitions in your Groovy application
 scripts by using the same format. This is sometimes a good way to include external
 features like middleware declarations, as shown in the following example:
 
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
index b968e9a241..12630181a5 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -667,10 +667,10 @@ https://www.vaultproject.io/[HashiCorp Vault].
 
 [[boot-features-external-config-yaml]]
 === Using YAML Instead of Properties
-http://yaml.org[YAML] is a superset of JSON and, as such, is a convenient format for
+https://yaml.org[YAML] is a superset of JSON and, as such, is a convenient format for
 specifying hierarchical configuration data. The `SpringApplication` class automatically
 supports YAML as an alternative to properties whenever you have the
-http://www.snakeyaml.org/[SnakeYAML] library on your classpath.
+https://bitbucket.org/asomov/snakeyaml[SnakeYAML] library on your classpath.
 
 NOTE: If you use "`Starters`", SnakeYAML is automatically provided by
 `spring-boot-starter`.
@@ -689,10 +689,10 @@ For example, consider the following YAML document:
 ----
 	environments:
 		dev:
-			url: http://dev.example.com
+			url: https://dev.example.com
 			name: Developer Setup
 		prod:
-			url: http://another.example.com
+			url: https://another.example.com
 			name: My Cool App
 ----
 
@@ -700,9 +700,9 @@ The preceding example would be transformed into the following properties:
 
 [source,properties,indent=0]
 ----
-	environments.dev.url=http://dev.example.com
+	environments.dev.url=https://dev.example.com
 	environments.dev.name=Developer Setup
-	environments.prod.url=http://another.example.com
+	environments.prod.url=https://another.example.com
 	environments.prod.name=My Cool App
 ----
 
@@ -1506,12 +1506,12 @@ See "<>" for details.
 
 [[boot-features-logging]]
 == Logging
-Spring Boot uses http://commons.apache.org/logging[Commons Logging] for all internal
+Spring Boot uses https://commons.apache.org/logging[Commons Logging] for all internal
 logging but leaves the underlying log implementation open. Default configurations are
 provided for
 {java-javadoc}/java/util/logging/package-summary.html[Java Util
-Logging], http://logging.apache.org/log4j/2.x/[Log4J2], and
-http://logback.qos.ch/[Logback]. In each case, loggers are pre-configured to use console
+Logging], https://logging.apache.org/log4j/2.x/[Log4J2], and
+https://logback.qos.ch/[Logback]. In each case, loggers are pre-configured to use console
 output with optional file output also available.
 
 By default, if you use the "`Starters`", Logback is used for logging. Appropriate Logback
@@ -1829,7 +1829,7 @@ cannot use extensions in it. You need to either use `logback-spring.xml` or defi
 `logging.config` property.
 
 WARNING: The extensions cannot be used with Logback's
-http://logback.qos.ch/manual/configuration.html#autoScan[configuration scanning]. If you
+https://logback.qos.ch/manual/configuration.html#autoScan[configuration scanning]. If you
 attempt to do so, making changes to the configuration file results in an error similar to
 one of the following being logged:
 
@@ -2293,7 +2293,7 @@ Spring Boot includes auto-configuration support for the following templating eng
 
  * https://freemarker.apache.org/docs/[FreeMarker]
  * http://docs.groovy-lang.org/docs/next/html/documentation/template-engines.html#_the_markuptemplateengine[Groovy]
- * http://www.thymeleaf.org[Thymeleaf]
+ * https://www.thymeleaf.org[Thymeleaf]
  * https://mustache.github.io/[Mustache]
 
 TIP: If possible, JSPs should be avoided. There are several
@@ -2508,7 +2508,7 @@ described earlier.
 ==== CORS Support
 
 https://en.wikipedia.org/wiki/Cross-origin_resource_sharing[Cross-origin resource sharing]
-(CORS) is a http://www.w3.org/TR/cors/[W3C specification] implemented by
+(CORS) is a https://www.w3.org/TR/cors/[W3C specification] implemented by
 https://caniuse.com/#feat=cors[most browsers] that lets you specify in a flexible
 way what kind of cross-domain requests are authorized, instead of using some less secure
 and less powerful approaches such as IFRAME or JSONP.
@@ -2546,7 +2546,7 @@ defined by registering a `WebMvcConfigurer` bean with a customized
 
 Spring WebFlux is the new reactive web framework introduced in Spring Framework 5.0.
 Unlike Spring MVC, it does not require the Servlet API, is fully asynchronous and
-non-blocking, and implements the http://www.reactive-streams.org/[Reactive Streams]
+non-blocking, and implements the https://www.reactive-streams.org/[Reactive Streams]
 specification through https://projectreactor.io/[the Reactor project].
 
 Spring WebFlux comes in two flavors: functional and annotation-based. The
@@ -2723,8 +2723,8 @@ Thymeleaf, FreeMarker, and Mustache.
 Spring Boot includes auto-configuration support for the following templating engines:
 
  * https://freemarker.apache.org/docs/[FreeMarker]
- * http://www.thymeleaf.org[Thymeleaf]
- * http://mustache.github.io/[Mustache]
+ * https://www.thymeleaf.org[Thymeleaf]
+ * https://mustache.github.io/[Mustache]
 
 When you use one of these templating engines with the default configuration, your
 templates are picked up automatically from `src/main/resources/templates`.
@@ -2845,7 +2845,7 @@ does so, the orders shown in the following table will be used:
 === JAX-RS and Jersey
 If you prefer the JAX-RS programming model for REST endpoints, you can use one of the
 available implementations instead of Spring MVC. https://jersey.github.io/[Jersey] 1.x and
-http://cxf.apache.org/[Apache CXF] work quite well out of the box if you register their
+https://cxf.apache.org/[Apache CXF] work quite well out of the box if you register their
 `Servlet` or `Filter` as a `@Bean` in your application context. Jersey 2.x has some native
 Spring support, so we also provide auto-configuration support for it in Spring Boot,
 together with a starter.
@@ -2921,7 +2921,7 @@ JAX-RS resources are packaged as nested jars, you may need to do the same.
 
 [[boot-features-embedded-container]]
 === Embedded Servlet Container Support
-Spring Boot includes support for embedded http://tomcat.apache.org/[Tomcat],
+Spring Boot includes support for embedded https://tomcat.apache.org/[Tomcat],
 https://www.eclipse.org/jetty/[Jetty], and http://undertow.io/[Undertow] servers. Most
 developers use the appropriate "`Starter`" to obtain a fully configured instance. By
 default, the embedded server listens for HTTP requests on port `8080`.
@@ -3248,7 +3248,7 @@ You can register multiple OAuth2 clients and providers under the
 	spring.security.oauth2.client.registration.my-client-1.client-name=Client for user scope
 	spring.security.oauth2.client.registration.my-client-1.provider=my-oauth-provider
 	spring.security.oauth2.client.registration.my-client-1.scope=user
-	spring.security.oauth2.client.registration.my-client-1.redirect-uri-template=http://my-redirect-uri.com
+	spring.security.oauth2.client.registration.my-client-1.redirect-uri-template=https://my-redirect-uri.com
 	spring.security.oauth2.client.registration.my-client-1.client-authentication-method=basic
 	spring.security.oauth2.client.registration.my-client-1.authorization-grant-type=authorization_code
 
@@ -3257,7 +3257,7 @@ You can register multiple OAuth2 clients and providers under the
 	spring.security.oauth2.client.registration.my-client-2.client-name=Client for email scope
 	spring.security.oauth2.client.registration.my-client-2.provider=my-oauth-provider
 	spring.security.oauth2.client.registration.my-client-2.scope=email
-	spring.security.oauth2.client.registration.my-client-2.redirect-uri-template=http://my-redirect-uri.com
+	spring.security.oauth2.client.registration.my-client-2.redirect-uri-template=https://my-redirect-uri.com
 	spring.security.oauth2.client.registration.my-client-2.client-authentication-method=basic
 	spring.security.oauth2.client.registration.my-client-2.authorization-grant-type=authorization_code
 
@@ -3388,8 +3388,8 @@ application ends.
 TIP: The "`How-to`" section includes a <>.
 
-Spring Boot can auto-configure embedded http://www.h2database.com[H2],
-http://hsqldb.org/[HSQL], and http://db.apache.org/derby/[Derby] databases. You need not
+Spring Boot can auto-configure embedded https://www.h2database.com[H2],
+http://hsqldb.org/[HSQL], and https://db.apache.org/derby/[Derby] databases. You need not
 provide any connection URLs. You need only include a build dependency to the embedded
 database that you want to use.
 
@@ -3483,7 +3483,7 @@ settings by using their respective prefix (`+spring.datasource.hikari.*+`,
 documentation of the connection pool implementation you are using for more details.
 
 For instance, if you use the
-http://tomcat.apache.org/tomcat-8.0-doc/jdbc-pool.html#Common_Attributes[Tomcat
+https://tomcat.apache.org/tomcat-8.0-doc/jdbc-pool.html#Common_Attributes[Tomcat
 connection pool], you could customize many additional settings, as shown in the following
 example:
 
@@ -3725,8 +3725,8 @@ views. If you do not want this behavior, you should set `spring.jpa.open-in-view
 
 [[boot-features-sql-h2-console]]
 === Using H2's Web Console
-The http://www.h2database.com[H2 database] provides a
-http://www.h2database.com/html/quickstart.html#h2_console[browser-based console] that
+The https://www.h2database.com[H2 database] provides a
+https://www.h2database.com/html/quickstart.html#h2_console[browser-based console] that
 Spring Boot can auto-configure for you. The console is auto-configured when the following
 conditions are met:
 
@@ -3753,8 +3753,8 @@ path by using the `spring.h2.console.path` property.
 
 [[boot-features-jooq]]
 === Using jOOQ
-Java Object Oriented Querying (http://www.jooq.org/[jOOQ]) is a popular product from
-http://www.datageekery.com/[Data Geekery] which generates Java code from your
+Java Object Oriented Querying (https://www.jooq.org/[jOOQ]) is a popular product from
+https://www.datageekery.com/[Data Geekery] which generates Java code from your
 database and lets you build type-safe SQL queries through its fluent API. Both the
 commercial and open source editions can be used with Spring Boot.
 
@@ -3886,7 +3886,7 @@ https://projects.spring.io/spring-data[projects.spring.io/spring-data].
 
 [[boot-features-redis]]
 === Redis
-http://redis.io/[Redis] is a cache, message broker, and richly-featured key-value store.
+https://redis.io/[Redis] is a cache, message broker, and richly-featured key-value store.
 Spring Boot offers basic auto-configuration for the
 https://github.com/lettuce-io/lettuce-core/[Lettuce] and
 https://github.com/xetorthio/jedis/[Jedis] client libraries and the abstractions on top
@@ -3940,7 +3940,7 @@ get a pooled connection factory.
 
 [[boot-features-mongodb]]
 === MongoDB
-http://www.mongodb.com/[MongoDB] is an open-source NoSQL document database that uses a
+https://www.mongodb.com/[MongoDB] is an open-source NoSQL document database that uses a
 JSON-like schema instead of traditional table-based relational data. Spring Boot offers
 several conveniences for working with MongoDB, including the
 `spring-boot-starter-data-mongodb` and `spring-boot-starter-data-mongodb-reactive`
@@ -4107,7 +4107,7 @@ the Mongo instance's configuration and logging routing.
 
 [[boot-features-neo4j]]
 === Neo4j
-http://neo4j.com/[Neo4j] is an open-source NoSQL graph database that uses a rich data
+https://neo4j.com/[Neo4j] is an open-source NoSQL graph database that uses a rich data
 model of nodes connected by first class relationships, which is better suited for
 connected big data than traditional RDBMS approaches. Spring Boot offers several
 conveniences for working with Neo4j, including the `spring-boot-starter-data-neo4j`
@@ -4248,7 +4248,7 @@ https://github.com/spring-projects/spring-data-gemfire/blob/master/src/main/java
 
 [[boot-features-solr]]
 === Solr
-http://lucene.apache.org/solr/[Apache Solr] is a search engine. Spring Boot offers basic
+https://lucene.apache.org/solr/[Apache Solr] is a search engine. Spring Boot offers basic
 auto-configuration for the Solr 5 client library and the abstractions on top of it
 provided by https://github.com/spring-projects/spring-data-solr[Spring Data Solr]. There
 is a `spring-boot-starter-data-solr` "`Starter`" for collecting the dependencies in a
@@ -4299,7 +4299,7 @@ https://projects.spring.io/spring-data-solr/[reference documentation].
 
 [[boot-features-elasticsearch]]
 === Elasticsearch
-http://www.elasticsearch.org/[Elasticsearch] is an open source, distributed, real-time
+https://www.elastic.co/[Elasticsearch] is an open source, distributed, real-time
 search and analytics engine. Spring Boot offers basic auto-configuration for
 Elasticsearch and the abstractions on top of it provided by
 https://github.com/spring-projects/spring-data-elasticsearch[Spring Data Elasticsearch].
@@ -4317,7 +4317,7 @@ configured, as shown in the following example:
 
 [source,properties,indent=0]
 ----
-	spring.elasticsearch.jest.uris=http://search.example.com:9200
+	spring.elasticsearch.jest.uris=https://search.example.com:9200
 	spring.elasticsearch.jest.read-timeout=10000
 	spring.elasticsearch.jest.username=user
 	spring.elasticsearch.jest.password=secret
@@ -4388,7 +4388,7 @@ https://docs.spring.io/spring-data/elasticsearch/docs/[reference documentation].
 
 [[boot-features-cassandra]]
 === Cassandra
-http://cassandra.apache.org/[Cassandra] is an open source, distributed database
+https://cassandra.apache.org/[Cassandra] is an open source, distributed database
 management system designed to handle large amounts of data across many commodity servers.
 Spring Boot offers auto-configuration for Cassandra and the abstractions on top of it
 provided by https://github.com/spring-projects/spring-data-cassandra[Spring Data
@@ -4446,7 +4446,7 @@ https://docs.spring.io/spring-data/cassandra/docs/[reference documentation].
 
 [[boot-features-couchbase]]
 === Couchbase
-http://www.couchbase.com/[Couchbase] is an open-source, distributed, multi-model NoSQL
+https://www.couchbase.com/[Couchbase] is an open-source, distributed, multi-model NoSQL
 document-oriented database that is optimized for interactive applications. Spring Boot
 offers auto-configuration for Couchbase and the abstractions on top of it provided by
 https://github.com/spring-projects/spring-data-couchbase[Spring Data Couchbase]. There are
@@ -4685,7 +4685,7 @@ example:
 
 [source,properties,indent=0]
 ----
-	spring.influx.url=http://172.0.0.1:8086
+	spring.influx.url=https://172.0.0.1:8086
 ----
 
 If the connection to InfluxDB requires a user and password, you can set the
@@ -4868,7 +4868,7 @@ abstraction expects. No further customization is applied to it.
 
 [[boot-features-caching-provider-ehcache2]]
 ==== EhCache 2.x
-http://www.ehcache.org/[EhCache] 2.x is used if a file named `ehcache.xml` can be found at
+https://www.ehcache.org/[EhCache] 2.x is used if a file named `ehcache.xml` can be found at
 the root of the classpath. If EhCache 2.x is found, the `EhCacheCacheManager` provided by
 the `spring-boot-starter-cache` "`Starter`" is used to bootstrap the cache manager. An
 alternate configuration file can be provided as well, as shown in the following example:
@@ -4891,7 +4891,7 @@ Spring Boot has <>. If a
 
 [[boot-features-caching-provider-infinispan]]
 ==== Infinispan
-http://infinispan.org/[Infinispan] has no default configuration file location, so it must
+https://infinispan.org/[Infinispan] has no default configuration file location, so it must
 be specified explicitly. Otherwise, the default bootstrap is used.
 
 [source,properties,indent=0]
@@ -4967,7 +4967,7 @@ auto-configuration.
 
 [[boot-features-caching-provider-redis]]
 ==== Redis
-If http://redis.io/[Redis] is available and configured, a `RedisCacheManager` is
+If https://redis.io/[Redis] is available and configured, a `RedisCacheManager` is
 auto-configured. It is possible to create additional caches on startup by setting the
 `spring.cache.cache-names` property and cache defaults can be configured by using
 `spring.cache.redis.*` properties. For instance, the following configuration creates
@@ -5079,7 +5079,7 @@ infrastructure to send and receive messages.
 
 [[boot-features-activemq]]
 ==== ActiveMQ Support
-When http://activemq.apache.org/[ActiveMQ] is available on the classpath, Spring Boot can
+When https://activemq.apache.org/[ActiveMQ] is available on the classpath, Spring Boot can
 also configure a `ConnectionFactory`. If the broker is present, an embedded broker is
 automatically started and configured (provided no broker URL is specified through
 configuration).
@@ -5124,7 +5124,7 @@ are resolved against their provided names.
 [[boot-features-artemis]]
 ==== Artemis Support
 Spring Boot can auto-configure a `ConnectionFactory` when it detects that
-http://activemq.apache.org/artemis/[Artemis] is available on the classpath. If the broker
+https://activemq.apache.org/artemis/[Artemis] is available on the classpath. If the broker
 is present, an embedded broker is automatically started and configured (unless the mode
 property has been explicitly set). The supported modes are `embedded` (to make explicit
 that an embedded broker is required and that an error should occur if the broker is not
@@ -5463,7 +5463,7 @@ delivery attempts is reached.
 
 [[boot-features-kafka]]
 === Apache Kafka Support
-http://kafka.apache.org/[Apache Kafka] is supported by providing auto-configuration of
+https://kafka.apache.org/[Apache Kafka] is supported by providing auto-configuration of
 the `spring-kafka` project.
 
 Kafka configuration is controlled by external configuration properties in
@@ -5672,7 +5672,7 @@ The following code shows a typical example:
 		private final WebClient webClient;
 
 		public MyService(WebClient.Builder webClientBuilder) {
-			this.webClient = webClientBuilder.baseUrl("http://example.org").build();
+			this.webClient = webClientBuilder.baseUrl("https://example.org").build();
 		}
 
 		public Mono
                                       someRestCall(String name) {
@@ -5774,7 +5774,7 @@ When a `jndi-name` is set, it takes precedence over all other Session-related se
 [[boot-features-jta]]
 == Distributed Transactions with JTA
 Spring Boot supports distributed JTA transactions across multiple XA resources by using
-either an http://www.atomikos.com/[Atomikos] or https://github.com/bitronix/btm[Bitronix]
+either an https://www.atomikos.com/[Atomikos] or https://github.com/bitronix/btm[Bitronix]
 embedded transaction manager. JTA transactions are also supported when deploying to a
 suitable Java EE Application Server.
 
@@ -5948,7 +5948,7 @@ configuration, as shown in the following example:
 Otherwise, Spring Boot tries to find the Hazelcast configuration from the default
 locations: `hazelcast.xml` in the working directory or at the root of the classpath. We
 also check if the `hazelcast.config` system property is set. See the
-http://docs.hazelcast.org/docs/latest/manual/html-single/[Hazelcast documentation] for
+https://docs.hazelcast.org/docs/latest/manual/html-single/[Hazelcast documentation] for
 more details.
 
 If `hazelcast-client` is present on the classpath, Spring Boot first attempts to create a
@@ -5969,7 +5969,7 @@ implementation.
 [[boot-features-quartz]]
 == Quartz Scheduler
 Spring Boot offers several conveniences for working with the
-http://www.quartz-scheduler.org/[Quartz scheduler], including the
+https://www.quartz-scheduler.org/[Quartz scheduler], including the
 `spring-boot-starter-quartz` "`Starter`". If Quartz is available, a `Scheduler` is
 auto-configured (through the `SchedulerFactoryBean` abstraction).
 
@@ -6146,13 +6146,13 @@ libraries.
 The `spring-boot-starter-test` "`Starter`" (in the `test` `scope`) contains
 the following provided libraries:
 
-* http://junit.org[JUnit]: The de-facto standard for unit testing Java applications.
+* https://junit.org[JUnit]: The de-facto standard for unit testing Java applications.
 * {spring-reference}testing.html#integration-testing[Spring Test] & Spring Boot Test:
 Utilities and integration test support for Spring Boot applications.
-* http://joel-costigliola.github.io/assertj/[AssertJ]: A fluent assertion library.
+* https://joel-costigliola.github.io/assertj/[AssertJ]: A fluent assertion library.
 * http://hamcrest.org/JavaHamcrest/[Hamcrest]: A library of matcher objects (also known
 as constraints or predicates).
-* http://mockito.org/[Mockito]: A Java mocking framework.
+* https://mockito.github.io[Mockito]: A Java mocking framework.
 * https://github.com/skyscreamer/JSONassert[JSONassert]: An assertion library for JSON.
 * https://github.com/jayway/JsonPath[JsonPath]: XPath for JSON.
 
@@ -7466,7 +7466,7 @@ the following example:
 		@Test
 		public void testRequest() throws Exception {
 			HttpHeaders headers = this.template.getForEntity(
-					"http://myhost.example.com/example", String.class).getHeaders();
+					"https://myhost.example.com/example", String.class).getHeaders();
 			assertThat(headers.getLocation()).hasHost("other.example.com");
 		}
 
@@ -7608,7 +7608,7 @@ annotations include:
 ==== Class Conditions
 The `@ConditionalOnClass` and `@ConditionalOnMissingClass` annotations let
 `@Configuration` classes be included based on the presence or absence of specific classes.
-Due to the fact that annotation metadata is parsed by using http://asm.ow2.org/[ASM], you
+Due to the fact that annotation metadata is parsed by using https://asm.ow2.org/[ASM], you
 can use the `value` attribute to refer to the real class, even though that class might not
 actually appear on the running application classpath. You can also use the `name`
 attribute if you prefer to specify the class name by using a `String` value.
@@ -7924,7 +7924,7 @@ The easiest way to start with Spring Boot and Kotlin is to follow
 https://spring.io/guides/tutorials/spring-boot-kotlin/[this comprehensive tutorial]. You
 can create new Kotlin projects via
 https://start.spring.io/#!language=kotlin[start.spring.io]. Feel free to join the #spring
-channel of http://slack.kotlinlang.org/[Kotlin Slack] or ask a question with the `spring`
+channel of https://slack.kotlinlang.org/[Kotlin Slack] or ask a question with the `spring`
 and `kotlin` tags on https://stackoverflow.com/questions/tagged/spring+kotlin[Stack
 Overflow] if you need support.
 
@@ -7959,7 +7959,7 @@ deals with `null` values at compile time rather than deferring the problem to ru
 encountering a `NullPointerException`. This helps to eliminate a common source of bugs
 without paying the cost of wrappers like `Optional`. Kotlin also allows using functional
 constructs with nullable values as described in this
-http://www.baeldung.com/kotlin-null-safety[comprehensive guide to null-safety in Kotlin].
+https://www.baeldung.com/kotlin-null-safety[comprehensive guide to null-safety in Kotlin].
 
 Although Java does not allow one to express null-safety in its type system, Spring
 Framework, Spring Data, and Reactor now provide null-safety of their API via
@@ -8111,7 +8111,7 @@ instance lifecycle to "per-class"].
 [[boot-features-kotlin-resources-further-reading]]
 ==== Further reading
 * {kotlin-documentation}[Kotlin language reference]
-* http://slack.kotlinlang.org/[Kotlin Slack] (with a dedicated #spring channel)
+* https://slack.kotlinlang.org/[Kotlin Slack] (with a dedicated #spring channel)
 * https://stackoverflow.com/questions/tagged/spring+kotlin[Stackoverflow with `spring` and `kotlin` tags]
 * https://try.kotlinlang.org/[Try Kotlin in your browser]
 * https://blog.jetbrains.com/kotlin/[Kotlin blog]
diff --git a/spring-boot-project/spring-boot-starters/README.adoc b/spring-boot-project/spring-boot-starters/README.adoc
index 94e5f537f6..1cc5dff17f 100644
--- a/spring-boot-project/spring-boot-starters/README.adoc
+++ b/spring-boot-project/spring-boot-starters/README.adoc
@@ -34,7 +34,7 @@ do as they were designed before this was clarified.
 | https://wicket.apache.org/[Apache Wicket]
 | https://github.com/MarcGiffing/wicket-spring-boot
 
-| http://www.axonframework.org/[Axon Framework]
+| https://axoniq.io[Axon Framework]
 | https://github.com/AxonFramework/AxonFramework
 
 | https://azure.microsoft.com/[Azure]
@@ -70,7 +70,7 @@ do as they were designed before this was clarified.
 | https://www.google.com/recaptcha[Google's reCAPTCHA]
 | https://github.com/mkopylec/recaptcha-spring-boot-starter
 
-| http://graphql.org/[GraphQL] and https://github.com/graphql/graphiql[GraphiQL] with https://github.com/graphql-java/[GraphQL Java]
+| https://graphql.org/[GraphQL] and https://github.com/graphql/graphiql[GraphiQL] with https://github.com/graphql-java/[GraphQL Java]
 | https://github.com/graphql-java/graphql-spring-boot
 
 | https://www.grpc.io/[gRPC]
@@ -100,7 +100,7 @@ do as they were designed before this was clarified.
 | JSF integration for various libraries
 | https://github.com/joinfaces/joinfaces
 
-| http://www.liquigraph.org/[Liquigraph]
+| https://www.liquigraph.org/[Liquigraph]
 | https://github.com/liquigraph/liquigraph
 
 | https://logback.qos.ch/access.html[Logback-access]
@@ -122,7 +122,7 @@ do as they were designed before this was clarified.
 | https://github.com/societe-generale/rabbitmq-advanced-spring-boot-starter
 
 | https://resteasy.jboss.org/[RESTEasy]
-| https://github.com/paypal/resteasy-spring-boot
+| https://github.com/resteasy/resteasy-spring-boot
 
 | https://github.com/rollbar/rollbar-java/[Rollbar]
 | https://github.com/olmero/rollbar-spring-boot-starter
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/src/main/xslt/post-process-flattened-pom.xsl b/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/src/main/xslt/post-process-flattened-pom.xsl
index 7b7cdc494e..ac9faabcda 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/src/main/xslt/post-process-flattened-pom.xsl
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/src/main/xslt/post-process-flattened-pom.xsl
@@ -3,7 +3,7 @@
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:m="http://maven.apache.org/POM/4.0.0"
 	exclude-result-prefixes="m">
 	
+		xslt:indent-amount="4" xmlns:xslt="https://xml.apache.org/xslt" />
 	
 	
 		
diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/LocalHostUriTemplateHandlerTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/LocalHostUriTemplateHandlerTests.java
index ce021e2758..a9525839c4 100644
--- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/LocalHostUriTemplateHandlerTests.java
+++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/LocalHostUriTemplateHandlerTests.java
@@ -104,7 +104,7 @@ public class LocalHostUriTemplateHandlerTests {
 		MockEnvironment environment = new MockEnvironment();
 		UriTemplateHandler uriTemplateHandler = mock(UriTemplateHandler.class);
 		Map uriVariables = new HashMap<>();
-		URI uri = URI.create("http://www.example.com");
+		URI uri = URI.create("https://www.example.com");
 		given(uriTemplateHandler.expand("https://localhost:8080/", uriVariables))
 				.willReturn(uri);
 		LocalHostUriTemplateHandler handler = new LocalHostUriTemplateHandler(environment,
diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java
index a19ef2ed30..e66c4116b0 100644
--- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java
+++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java
@@ -95,14 +95,14 @@ public class TestRestTemplateTests {
 
 	@Test
 	public void getRootUriRootUriSetViaRestTemplateBuilder() {
-		String rootUri = "http://example.com";
+		String rootUri = "https://example.com";
 		RestTemplateBuilder delegate = new RestTemplateBuilder().rootUri(rootUri);
 		assertThat(new TestRestTemplate(delegate).getRootUri()).isEqualTo(rootUri);
 	}
 
 	@Test
 	public void getRootUriRootUriSetViaLocalHostUriTemplateHandler() {
-		String rootUri = "http://example.com";
+		String rootUri = "https://example.com";
 		TestRestTemplate template = new TestRestTemplate();
 		LocalHostUriTemplateHandler templateHandler = mock(
 				LocalHostUriTemplateHandler.class);
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java
index f22e0b3397..946e68bed5 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java
@@ -99,7 +99,7 @@ public class OriginTrackedYamlLoaderTests {
 		OriginTrackedValue bar2 = getValue("example.foo[0].bar[1].bar2");
 		assertThat(name.toString()).isEqualTo("springboot");
 		assertThat(getLocation(name)).isEqualTo("22:15");
-		assertThat(url.toString()).isEqualTo("http://springboot.com");
+		assertThat(url.toString()).isEqualTo("http://www.springboot.com/");
 		assertThat(getLocation(url)).isEqualTo("23:14");
 		assertThat(bar1.toString()).isEqualTo("baz");
 		assertThat(getLocation(bar1)).isEqualTo("25:19");
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-yaml.yml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-yaml.yml
index ef4aeb09c9..e0217c13a2 100644
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-yaml.yml
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-yaml.yml
@@ -1,4 +1,4 @@
-# http://docs.ansible.com/ansible/YAMLSyntax.html
+# https://docs.ansible.com/ansible/YAMLSyntax.html
 
 name: Martin D'vloper
 job: Developer
@@ -20,7 +20,7 @@ education: |
 example:
     foo:
       - name: springboot
-        url: http://springboot.com
+        url: http://www.springboot.com/
         bar:
           - bar1: baz
           - bar2: bling
diff --git a/spring-boot-samples/spring-boot-sample-actuator-custom-security/src/main/resources/templates/error.ftl b/spring-boot-samples/spring-boot-sample-actuator-custom-security/src/main/resources/templates/error.ftl
index b16ae5895b..f1c4444f93 100644
--- a/spring-boot-samples/spring-boot-sample-actuator-custom-security/src/main/resources/templates/error.ftl
+++ b/spring-boot-samples/spring-boot-sample-actuator-custom-security/src/main/resources/templates/error.ftl
@@ -11,7 +11,7 @@
 	
                                      
 		
                                      
 			
                                      
-				 FreeMarker -
+				 FreeMarker -
 					Plain 
 				
                                        
 					
                                      •  Home 
                                        • 
diff --git a/spring-boot-samples/spring-boot-sample-actuator-custom-security/src/main/resources/templates/home.ftl b/spring-boot-samples/spring-boot-sample-actuator-custom-security/src/main/resources/templates/home.ftl
index 347990e049..9f3e89cbab 100644
--- a/spring-boot-samples/spring-boot-sample-actuator-custom-security/src/main/resources/templates/home.ftl
+++ b/spring-boot-samples/spring-boot-sample-actuator-custom-security/src/main/resources/templates/home.ftl
@@ -11,7 +11,7 @@
 	
                                        
 		
                                        
 			
                                        
-				 FreeMarker -
+				 FreeMarker -
 					Plain 
 				
                                          
 					
                                        •  Home 
                                          • 
diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/fragments.html b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/fragments.html
index 0d683155f7..23abbe2822 100644
--- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/fragments.html
+++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/fragments.html
@@ -1,5 +1,5 @@
 
-
+
 	
 		Fragments