diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 839925c55a..eb1df936fe 100755 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -14,8 +14,8 @@ unacceptable behavior to spring-code-of-conduct@pivotal.io. == 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 @@ -43,7 +43,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 @@ -56,7 +56,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). @@ -65,15 +65,15 @@ added after the original pull request but before a merge. == Working with the code If you don't have an IDE preference we would recommend that you use https://spring.io/tools/sts[Spring Tools Suite] or -http://eclipse.org[Eclipse] when working with the code. We use the -http://eclipse.org/m2e/[M2Eclipse] eclipse plugin for maven support. Other IDEs and tools +https://eclipse.org[Eclipse] when working with the code. We use the +https://eclipse.org/m2e/[M2Eclipse] eclipse plugin for maven support. Other IDEs and tools should also work without issue. === Building from source 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. @@ -153,7 +153,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`". @@ -175,7 +175,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 ff8a50ae56..e2f73ec37d 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 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[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,11 @@ Boot applications can run on Java 1.6). ---- If you want to build with the regular `mvn` command, you will need +<<<<<<< HEAD http://maven.apache.org/run-maven/index.html[Maven v3.2.1 or above]. +======= +https://maven.apache.org/run-maven/index.html[Maven v3.0.5 or above]. +>>>>>>> 1.3.x 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 @@ -223,16 +227,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-docs/src/main/asciidoc/index.adoc b/spring-boot-actuator-docs/src/main/asciidoc/index.adoc index cec828cf48..acbb8d4ee9 100644 --- a/spring-boot-actuator-docs/src/main/asciidoc/index.adoc +++ b/spring-boot-actuator-docs/src/main/asciidoc/index.adoc @@ -60,12 +60,12 @@ HAL browser is not active). If `endpoints.hypermedia.enabled` is set to `true` and 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 Actuator endpoint +https://projects.spring.io/spring-data-rest[Spring Data REST]) 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 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. +responses is 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. Example enhanced "/metrics" endpoint with additional "_links": diff --git a/spring-boot-actuator/README.adoc b/spring-boot-actuator/README.adoc index 7629c27dae..2959fd7818 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 87a80ba2da..08b6fc47d7 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 @@ -107,7 +107,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 management.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 a7fefb28c3..110a49d46b 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 9bcfdeda84..cbde17e606 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 @@ -551,7 +551,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 4474af2591..b46dc6ea33 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 @@ -44,7 +44,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 00d763d023..f8cc162a8d 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-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. @@ -41,7 +41,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 1f00c11b31..072f544c61 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 @@ -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. @@ -37,7 +37,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); @@ -47,16 +47,16 @@ public class ResourceServerPropertiesTests { @Test public void tokenKeyDerivedFromUserInfoUri() throws Exception { - this.properties.setUserInfoUri("http://example.com/userinfo"); + this.properties.setUserInfoUri("https://example.com/userinfo"); assertThat(this.properties.getJwt().getKeyUri()) - .isEqualTo("http://example.com/token_key"); + .isEqualTo("https://example.com/token_key"); } @Test public void tokenKeyDerivedFromTokenInfoUri() throws Exception { - this.properties.setTokenInfoUri("http://example.com/check_token"); + this.properties.setTokenInfoUri("https://example.com/check_token"); assertThat(this.properties.getJwt().getKeyUri()) - .isEqualTo("http://example.com/token_key"); + .isEqualTo("https://example.com/token_key"); } } 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 5c362a34da..48ebeef907 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 @@ -93,7 +93,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(); @@ -104,7 +104,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 @@ -115,7 +115,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 @@ -142,7 +142,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(); @@ -154,8 +154,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(); @@ -167,8 +167,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(); @@ -200,7 +200,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 c63d77a6b2..c3888a47f9 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 @@ -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. @@ -61,7 +61,7 @@ import static org.assertj.core.api.Assertions.assertThat; */ @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { - "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 49305e2118..45e9a3cd2e 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 2e290969da..a6b1afe796 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 @@ -50,8 +50,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @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 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 e0853096f8..fb3b29aa28 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 @@ -56,8 +56,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @SpringBootTest @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 683a18f240..208163fd22 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 @@ -58,8 +58,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @SpringBootTest @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 9106b5eeb5..d023692605 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 c034df6782..26f09dabe1 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 @@ -52,7 +52,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()); @@ -160,7 +160,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")); assertThat(this.groovyClassLoader.getURLs().length).isEqualTo(1); } 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 3cad058d29..befa574458 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-2016 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; */ public final class DetailedProgressReporterTests { - private static final String REPOSITORY = "http://my.repository.com/"; + private static final String REPOSITORY = "https://repo.example.com/"; private static final String ARTIFACT = "org/alpha/bravo/charlie/1.2.3/charlie-1.2.3.jar"; 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 12dc40f866..9dcca0a20d 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -116,7 +116,7 @@ public class SettingsXmlRepositorySystemSessionAutoConfigurationTests { }, "user.home:" + userHome); RemoteRepository repository = new RemoteRepository.Builder("my-server", "default", - "http://maven.example.com").build(); + "https://maven.example.com").build(); assertMirrorSelectorConfiguration(session, repository); assertProxySelectorConfiguration(session, repository); assertAuthenticationSelectorConfiguration(session, repository); 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