diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfigurationTests.java index 74040e7873f..d8a77bcd1ed 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfigurationTests.java @@ -125,7 +125,7 @@ public class ReactiveManagementWebSecurityAutoConfigurationTests { .withConfiguration(AutoConfigurations .of(ReactiveOAuth2ResourceServerAutoConfiguration.class)) .withPropertyValues( - "spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://authserver") + "spring.security.oauth2.resourceserver.jwt.jwk-set-uri=https://authserver") .run((context) -> assertThat(context).doesNotHaveBean( ReactiveManagementWebSecurityAutoConfiguration.class)); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java index 552d65648f7..ce08d0f6b16 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java @@ -113,7 +113,7 @@ public class ManagementWebSecurityAutoConfigurationTests { .withConfiguration(AutoConfigurations .of(OAuth2ResourceServerAutoConfiguration.class)) .withPropertyValues( - "spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://authserver") + "spring.security.oauth2.resourceserver.jwt.jwk-set-uri=https://authserver") .run((context) -> assertThat(context) .doesNotHaveBean(ManagementWebSecurityConfigurerAdapter.class)); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java index 620e65d52f6..4bafc9fe7c6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java @@ -110,9 +110,9 @@ public class Neo4jPropertiesTests { @Test public void credentialsAreSetFromUri() { Neo4jProperties properties = load(true, - "spring.data.neo4j.uri=http://user:secret@my-server:7474"); + "spring.data.neo4j.uri=https://user:secret@my-server:7474"); Configuration configuration = properties.createConfiguration(); - assertDriver(configuration, Neo4jProperties.HTTP_DRIVER, "http://my-server:7474"); + assertDriver(configuration, Neo4jProperties.HTTP_DRIVER, "https://my-server:7474"); assertCredentials(configuration, "user", "secret"); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfigurationTests.java index ebaba72f529..21b3f013b80 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientAutoConfigurationTests.java @@ -170,7 +170,7 @@ public class ReactiveOAuth2ClientAutoConfigurationTests { List registrations = new ArrayList<>(); registrations .add(getClientRegistration("first", "https://user-info-uri.com")); - registrations.add(getClientRegistration("second", "http://other-user-info")); + registrations.add(getClientRegistration("second", "https://other-user-info")); return new InMemoryReactiveClientRegistrationRepository(registrations); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java index f904d761584..da34a504c9d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java @@ -220,7 +220,7 @@ public class OAuth2WebSecurityConfigurationTests { List registrations = new ArrayList<>(); registrations .add(getClientRegistration("first", "https://user-info-uri.com")); - registrations.add(getClientRegistration("second", "http://other-user-info")); + registrations.add(getClientRegistration("second", "https://other-user-info")); return new InMemoryClientRegistrationRepository(registrations); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java index 2c7d2a946f9..132bd97c40e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java @@ -87,7 +87,7 @@ public class OAuth2ResourceServerAutoConfigurationTests { @Test public void autoConfigurationShouldMatchDefaultJwsAlgorithm() { this.contextRunner.withPropertyValues( - "spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://jwk-set-uri.com") + "spring.security.oauth2.resourceserver.jwt.jwk-set-uri=https://jwk-set-uri.com") .run((context) -> { JwtDecoder jwtDecoder = context.getBean(JwtDecoder.class); assertThat(jwtDecoder).hasFieldOrPropertyWithValue("jwsAlgorithm", @@ -98,7 +98,7 @@ public class OAuth2ResourceServerAutoConfigurationTests { @Test public void autoConfigurationShouldConfigureResourceServerWithJwsAlgorithm() { this.contextRunner.withPropertyValues( - "spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://jwk-set-uri.com", + "spring.security.oauth2.resourceserver.jwt.jwk-set-uri=https://jwk-set-uri.com", "spring.security.oauth2.resourceserver.jwt.jws-algorithm=HS512") .run((context) -> { JwtDecoder jwtDecoder = context.getBean(JwtDecoder.class); diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java index 360d7b0d357..eeb434de823 100644 --- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java +++ b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java @@ -72,19 +72,19 @@ public class InitCommandTests extends AbstractHttpClientMockTests { @Test public void listServiceCapabilitiesText() throws Exception { mockSuccessfulMetadataTextGet(); - this.command.run("--list", "--target=http://fake-service"); + this.command.run("--list", "--target=https://fake-service"); } @Test public void listServiceCapabilities() throws Exception { mockSuccessfulMetadataGet(true); - this.command.run("--list", "--target=http://fake-service"); + this.command.run("--list", "--target=https://fake-service"); } @Test public void listServiceCapabilitiesV2() throws Exception { mockSuccessfulMetadataGetV2(true); - this.command.run("--list", "--target=http://fake-service"); + this.command.run("--list", "--target=https://fake-service"); } @Test @@ -357,7 +357,7 @@ public class InitCommandTests extends AbstractHttpClientMockTests { @Test public void userAgent() throws Exception { - this.command.run("--list", "--target=http://fake-service"); + this.command.run("--list", "--target=https://fake-service"); verify(this.http).execute(this.requestCaptor.capture()); Header agent = this.requestCaptor.getValue().getHeaders("User-Agent")[0]; assertThat(agent.getValue()).startsWith("SpringBootCli/"); diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitializrServiceTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitializrServiceTests.java index 94dae1d8f9d..0f96a0b377a 100644 --- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitializrServiceTests.java +++ b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitializrServiceTests.java @@ -38,7 +38,7 @@ public class InitializrServiceTests extends AbstractHttpClientMockTests { @Test public void loadMetadata() throws Exception { mockSuccessfulMetadataGet(false); - InitializrServiceMetadata metadata = this.invoker.loadMetadata("http://foo/bar"); + InitializrServiceMetadata metadata = this.invoker.loadMetadata("https://foo/bar"); assertThat(metadata).isNotNull(); } diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ProjectGenerationRequestTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ProjectGenerationRequestTests.java index 6ebb90cc8b5..6917a9dbbf5 100644 --- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ProjectGenerationRequestTests.java +++ b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ProjectGenerationRequestTests.java @@ -54,7 +54,7 @@ public class ProjectGenerationRequestTests { @Test public void customServer() throws URISyntaxException { - String customServerUrl = "http://foo:8080/initializr"; + String customServerUrl = "https://foo:8080/initializr"; this.request.setServiceUrl(customServerUrl); this.request.getDependencies().add("security"); assertThat(this.request.generateUrl(createDefaultMetadata())).isEqualTo(new URI( diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/attributes.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/attributes.adoc index 90b29df0c39..36ce38a68ab 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/attributes.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/attributes.adoc @@ -50,9 +50,9 @@ :spring-rest-docs: https://projects.spring.io/spring-restdocs/ :spring-integration: https://projects.spring.io/spring-integration/ :spring-session: https://projects.spring.io/spring-session/ -:spring-framework: http://projects.spring.io/spring-framework/ -:spring-security: http://projects.spring.io/spring-security/ -:spring-data-jpa: http://projects.spring.io/spring-data-jpa/ +:spring-framework: https://projects.spring.io/spring-framework/ +:spring-security: https://projects.spring.io/spring-security/ +:spring-data-jpa: https://projects.spring.io/spring-data-jpa/ :spring-security-reference: https://docs.spring.io/spring-security/site/docs/{spring-security-docs-version}/reference/htmlsingle :spring-security-oauth2-reference: https://projects.spring.io/spring-security-oauth/docs/oauth2.html :spring-webservices-reference: https://docs.spring.io/spring-ws/docs/{spring-webservices-docs-version}/reference/ @@ -66,7 +66,7 @@ :spring-data: https://projects.spring.io/spring-data/ :spring-data-rest-javadoc: https://docs.spring.io/spring-data/rest/docs/current/api/org/springframework/data/rest :gradle-userguide: https://www.gradle.org/docs/current/userguide -:ant-manual: http://ant.apache.org/manual +:ant-manual: https://ant.apache.org/manual :code-examples: {sources-root}/main/java/org/springframework/boot/docs :test-examples: {sources-root}/test/java/org/springframework/boot/docs :gradle-user-guide: https://docs.gradle.org/4.2.1/userguide @@ -74,7 +74,7 @@ :jetty-documentation: https://www.eclipse.org/jetty/documentation/9.4.x :jooq-manual: https://www.jooq.org/doc/{jooq-version}/manual-single-page :micrometer-concepts-documentation: https://micrometer.io/docs/concepts -:micrometer-registry-documentation: http://micrometer.io/docs/registry +:micrometer-registry-documentation: https://micrometer.io/docs/registry :tomcat-documentation: https://tomcat.apache.org/tomcat-8.5-doc :kotlin-documentation: https://kotlinlang.org/docs/reference/ :junit5-documentation: https://junit.org/junit5/docs/current/user-guide @@ -116,9 +116,9 @@ :spring-rest-docs: https://projects.spring.io/spring-restdocs/ :spring-integration: https://projects.spring.io/spring-integration/ :spring-session: https://projects.spring.io/spring-session/ -:spring-framework: http://projects.spring.io/spring-framework/ -:spring-security: http://projects.spring.io/spring-security/ -:spring-data-jpa: http://projects.spring.io/spring-data-jpa/ +:spring-framework: https://projects.spring.io/spring-framework/ +:spring-security: https://projects.spring.io/spring-security/ +:spring-data-jpa: https://projects.spring.io/spring-data-jpa/ :spring-security-reference: https://docs.spring.io/spring-security/site/docs/{spring-security-docs-version}/reference/htmlsingle :spring-security-oauth2-reference: https://projects.spring.io/spring-security-oauth/docs/oauth2.html :spring-webservices-reference: https://docs.spring.io/spring-ws/docs/{spring-webservices-docs-version}/reference/ @@ -132,12 +132,12 @@ :spring-data: https://projects.spring.io/spring-data/ :spring-data-rest-javadoc: https://docs.spring.io/spring-data/rest/docs/current/api/org/springframework/data/rest :gradle-userguide: https://www.gradle.org/docs/current/userguide -:ant-manual: http://ant.apache.org/manual +:ant-manual: https://ant.apache.org/manual :gradle-user-guide: https://docs.gradle.org/4.2.1/userguide :hibernate-documentation: https://docs.jboss.org/hibernate/orm/5.2/userguide/html_single/Hibernate_User_Guide.html :jetty-documentation: https://www.eclipse.org/jetty/documentation/9.4.x :micrometer-concepts-documentation: https://micrometer.io/docs/concepts -:micrometer-registry-documentation: http://micrometer.io/docs/registry +:micrometer-registry-documentation: https://micrometer.io/docs/registry :tomcat-documentation: https://tomcat.apache.org/tomcat-8.5-doc :kotlin-documentation: https://kotlinlang.org/docs/reference/ :junit5-documentation: https://junit.org/junit5/docs/current/user-guide diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 6864ab304c4..3fef32d1ca7 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -3572,11 +3572,11 @@ You can register multiple OAuth2 clients and providers under the spring.security.oauth2.client.registration.my-client-2.client-authentication-method=basic spring.security.oauth2.client.registration.my-client-2.authorization-grant-type=authorization_code - spring.security.oauth2.client.provider.my-oauth-provider.authorization-uri=http://my-auth-server/oauth/authorize - spring.security.oauth2.client.provider.my-oauth-provider.token-uri=http://my-auth-server/oauth/token - spring.security.oauth2.client.provider.my-oauth-provider.user-info-uri=http://my-auth-server/userinfo + spring.security.oauth2.client.provider.my-oauth-provider.authorization-uri=https://my-auth-server/oauth/authorize + spring.security.oauth2.client.provider.my-oauth-provider.token-uri=https://my-auth-server/oauth/token + spring.security.oauth2.client.provider.my-oauth-provider.user-info-uri=https://my-auth-server/userinfo spring.security.oauth2.client.provider.my-oauth-provider.user-info-authentication-method=header - spring.security.oauth2.client.provider.my-oauth-provider.jwk-set-uri=http://my-auth-server/token_keys + spring.security.oauth2.client.provider.my-oauth-provider.jwk-set-uri=https://my-auth-server/token_keys spring.security.oauth2.client.provider.my-oauth-provider.user-name-attribute=name ---- diff --git a/spring-boot-project/spring-boot-starters/README.adoc b/spring-boot-project/spring-boot-starters/README.adoc index 01578d917ed..96d4c095918 100644 --- a/spring-boot-project/spring-boot-starters/README.adoc +++ b/spring-boot-project/spring-boot-starters/README.adoc @@ -184,7 +184,7 @@ do as they were designed before this was clarified. | https://github.com/tomakehurst/wiremock[WireMock] and Spring REST Docs | https://github.com/ePages-de/restdocs-wiremock -| https://alexo.github.io/wro4j/[Wro4j] (Advanced usage) +| https://alexo.github.io/wro4j/[Wro4j] | https://github.com/michael-simons/wro4j-spring-boot-starter |=== diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONTokener.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONTokener.java index 0e97632abe9..6bc692e71ef 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONTokener.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONTokener.java @@ -151,7 +151,7 @@ public class JSONTokener { /* * Skip a # hash end-of-line comment. The JSON RFC doesn't specify this * behavior, but it's required to parse existing documents. See - * http://b/2571423. + * https://b/2571423. */ skipToEndOfLine(); continue; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/repository/org/springframework/boot/spring-boot-dependencies/TEST-SNAPSHOT/spring-boot-dependencies-TEST-SNAPSHOT.pom b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/repository/org/springframework/boot/spring-boot-dependencies/TEST-SNAPSHOT/spring-boot-dependencies-TEST-SNAPSHOT.pom index 8d4fc766d31..e3b617e510b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/repository/org/springframework/boot/spring-boot-dependencies/TEST-SNAPSHOT/spring-boot-dependencies-TEST-SNAPSHOT.pom +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/repository/org/springframework/boot/spring-boot-dependencies/TEST-SNAPSHOT/spring-boot-dependencies-TEST-SNAPSHOT.pom @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.boot spring-boot-dependencies