From 189eeefbb161495e50d7343914973cea61530756 Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Tue, 26 Mar 2019 04:15:00 -0500 Subject: [PATCH] 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 f013d6f36ba..17783c7c066 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 48ebeef907d..c5550b1bc6f 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 0ddb2b23e81..1853ed0cfd6 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 ea9d2bfa1eb..ed797fbe20b 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 f9a77525768..912aebece01 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 5c454e5cbc8..f1c4444f933 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 ef97397c719..9f3e89cbab0 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 7bc450fb397..e445a30f11d 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 bad6cbd805a..acf74c31351 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 c1956abc04a..0be1f1380f7 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 2a9ec44f911..c7264377156 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 14d7670efa3..e8f535f968b 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 ad694671be6..db89b2afdc2 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 d428bab66ed..8f10139c02d 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 5c6c13bfc2d..d395bb5bcfc 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 feeda931596..381b3e74cfb 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 f2f398ae81c..a28ef2376cd 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 57277bff30c..e757afa19e4 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 df84c5bb436..33e781706cf 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 d443309ef2f..3e0fe7da1a1 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 2ae659507f0..8cca86acf09 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 000577ab4f9..611489b4f5b 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 c73461a960b..bd187d5fb8d 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 7560a920b41..08bc4ea8943 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 dbf66844e8d..b31914faf76 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 38015afcfa0..bba2488711a 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 292c0ee2112..1f76808a367 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 0767dc230d3..fc57d5ac1a3 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 48db830f6c7..b3342593000 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 3401a52a97f..2b37386c115 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 64f5b3aa131..be3ac18f6ca 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 0435414f948..523d1ba2760 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);
 	}