diff --git a/CODE_OF_CONDUCT.adoc b/CODE_OF_CONDUCT.adoc index f013d6f36b..17783c7c06 100644 --- a/CODE_OF_CONDUCT.adoc +++ b/CODE_OF_CONDUCT.adoc @@ -40,5 +40,5 @@ appropriate to the circumstances. Maintainers are obligated to maintain confiden with regard to the reporter of an incident. This Code of Conduct is adapted from the -http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at -http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/] +https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at +https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/] diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 7b85793b34..71b6844495 100755 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -66,7 +66,7 @@ added after the original pull request but before a merge. * A few unit tests would help a lot as well -- someone has to do it. * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). -* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], +* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where `XXXX` is the issue number). @@ -75,15 +75,15 @@ added after the original pull request but before a merge. == Working with the Code If you don't have an IDE preference we would recommend that you use https://spring.io/tools/sts[Spring Tools Suite] or -http://eclipse.org[Eclipse] when working with the code. We use the -http://eclipse.org/m2e/[M2Eclipse] eclipse plugin for maven support. Other IDEs and tools +https://eclipse.org[Eclipse] when working with the code. We use the +https://eclipse.org/m2e/[M2Eclipse] eclipse plugin for maven support. Other IDEs and tools should also work without issue. === Building from Source -Spring Boot source can be build from the command line using -http://maven.apache.org/run-maven/index.html[Apache Maven] on JDK 1.8 or above. +Spring Boot source can be built from the command line using +https://maven.apache.org/run-maven/index.html[Apache Maven] on JDK 1.8 or above. We include '`Maven Wrapper`' scripts (`./mvnw` or `mvnw.bat`) that you can run rather than needing to install Maven locally. @@ -148,7 +148,7 @@ Spring Boot includes a `.setup` files which can be used with the Eclipse Install provision a new environment. To use the installer: * Download and run the latest Eclipse Installer from - http://www.eclipse.org/downloads/[eclipse.org/downloads/] (under "Get Eclipse"). + https://www.eclipse.org/downloads/[eclipse.org/downloads/] (under "Get Eclipse"). * Switch to "Advanced Mode" using the drop down menu on the right. * Select "`Eclipse IDE for Java Developers`" under "`Eclipse.org`" as the product to install and click "`next`". @@ -170,7 +170,7 @@ easier to navigate. ==== Manual Installation with M2Eclipse If you prefer to install Eclipse yourself you should use the -http://eclipse.org/m2e/[M2Eclipse] eclipse plugin. If you don't already have m2eclipse +https://eclipse.org/m2e/[M2Eclipse] eclipse plugin. If you don't already have m2eclipse installed it is available from the "Eclipse marketplace". Spring Boot includes project specific source formatting settings, in order to have these diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundrySecurityServiceTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundrySecurityServiceTests.java index a7f97bd141..aa7e35cc12 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundrySecurityServiceTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundrySecurityServiceTests.java @@ -52,12 +52,12 @@ public class CloudFoundrySecurityServiceTests { @Rule public ExpectedException thrown = ExpectedException.none(); - private static final String CLOUD_CONTROLLER = "http://my-cloud-controller.com"; + private static final String CLOUD_CONTROLLER = "https://my-cloud-controller.com"; private static final String CLOUD_CONTROLLER_PERMISSIONS = CLOUD_CONTROLLER + "/v2/apps/my-app-id/permissions"; - private static final String UAA_URL = "http://my-uaa.com"; + private static final String UAA_URL = "https://my-uaa.com"; private CloudFoundrySecurityService securityService; @@ -151,7 +151,7 @@ public class CloudFoundrySecurityServiceTests { @Test public void fetchTokenKeysWhenSuccessfulShouldReturnListOfKeysFromUAA() { this.server.expect(requestTo(CLOUD_CONTROLLER + "/info")) - .andRespond(withSuccess("{\"token_endpoint\":\"http://my-uaa.com\"}", + .andRespond(withSuccess("{\"token_endpoint\":\"https://my-uaa.com\"}", MediaType.APPLICATION_JSON)); String tokenKeyValue = "-----BEGIN PUBLIC KEY-----\n" + "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0m59l2u9iDnMbrXHfqkO\n" diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/TokenValidatorTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/TokenValidatorTests.java index 5882b23d02..19465932e6 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/TokenValidatorTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/TokenValidatorTests.java @@ -181,7 +181,7 @@ public class TokenValidatorTests { @Test public void validateTokenWhenIssuerIsNotValidShouldThrowException() throws Exception { given(this.securityService.fetchTokenKeys()).willReturn(VALID_KEYS); - given(this.securityService.getUaaUrl()).willReturn("http://other-uaa.com"); + given(this.securityService.getUaaUrl()).willReturn("https://other-uaa.com"); String header = "{ \"alg\": \"RS256\", \"kid\": \"valid-key\", \"typ\": \"JWT\", \"scope\": [\"actuator.read\"]}"; String claims = "{ \"exp\": 2147483647, \"iss\": \"http://localhost:8080/uaa/oauth/token\"}"; this.thrown diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/AtomikosJtaConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/AtomikosJtaConfiguration.java index e50db6fc9a..8822d22ffc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/AtomikosJtaConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/AtomikosJtaConfiguration.java @@ -46,7 +46,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-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java index e76cf8db83..f6904a7e3e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ import org.springframework.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-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java index 33ee62f059..cd3df9ef30 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,7 +49,7 @@ import org.springframework.transaction.jta.JtaTransactionManager; import org.springframework.util.StringUtils; /** - * JTA Configuration for Narayana. + * JTA Configuration for Narayana. * * @author Gytis Trikleris * @author Kazuki Shimizu diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/layout.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/layout.html index b4be8f22a6..900c0de6bd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/layout.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/layout.html @@ -1,5 +1,5 @@ - + Layout diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/view.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/view.html index a56836e6b4..6f4deeb420 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/view.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/view.html @@ -1,4 +1,4 @@ - + Content diff --git a/spring-boot-project/spring-boot-cli/src/it/resources/jar-command/bad.groovy b/spring-boot-project/spring-boot-cli/src/it/resources/jar-command/bad.groovy index 6d4be26b8f..3118a10e0f 100644 --- a/spring-boot-project/spring-boot-cli/src/it/resources/jar-command/bad.groovy +++ b/spring-boot-project/spring-boot-cli/src/it/resources/jar-command/bad.groovy @@ -1,4 +1,4 @@ -@GrabResolver(name='clojars.org', root='http://clojars.org/repo') +@GrabResolver(name='clojars.org', root='https://clojars.org/repo') @Grab('redis.embedded:embedded-redis:0.2') @Component diff --git a/spring-boot-project/spring-boot-cli/src/main/content/legal/open_source_licenses.txt b/spring-boot-project/spring-boot-cli/src/main/content/legal/open_source_licenses.txt index 62e08e3fd4..82ae3dbe2a 100644 --- a/spring-boot-project/spring-boot-cli/src/main/content/legal/open_source_licenses.txt +++ b/spring-boot-project/spring-boot-cli/src/main/content/legal/open_source_licenses.txt @@ -205,7 +205,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. @@ -225,7 +225,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. @@ -235,7 +235,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-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java index 273a0bf8b7..13d1fcafc1 100644 --- a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java +++ b/spring-boot-project/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-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java index 1e2d4ecc9d..cfb8241353 100644 --- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java +++ b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 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. @@ -53,7 +53,7 @@ public class AetherGrapeEngineTests { RepositoryConfiguration... additionalRepositories) { List repositoryConfigurations = new ArrayList<>(); repositoryConfigurations.add(new RepositoryConfiguration("central", - URI.create("https://repo.maven.apache.org/maven2"), false)); + URI.create("https://repo1.maven.org/maven2"), false)); repositoryConfigurations.addAll(Arrays.asList(additionalRepositories)); DependencyResolutionContext dependencyResolutionContext = new DependencyResolutionContext(); dependencyResolutionContext.addDependencyManagement( @@ -142,7 +142,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-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporterTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporterTests.java index 7862af5929..befa574458 100644 --- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporterTests.java +++ b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 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-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java index a554875a8e..a39785e620 100644 --- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -96,7 +96,7 @@ public class SettingsXmlRepositorySystemSessionAutoConfigurationTests { return null; }); 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-project/spring-boot-cli/src/test/resources/foo.pom b/spring-boot-project/spring-boot-cli/src/test/resources/foo.pom index f88c9caa3f..955257c539 100644 --- a/spring-boot-project/spring-boot-cli/src/test/resources/foo.pom +++ b/spring-boot-project/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-project/spring-boot-cli/src/test/resources/templates/home.html b/spring-boot-project/spring-boot-cli/src/test/resources/templates/home.html index 3d314f4214..dfdd6c756b 100644 --- a/spring-boot-project/spring-boot-cli/src/test/resources/templates/home.html +++ b/spring-boot-project/spring-boot-cli/src/test/resources/templates/home.html @@ -1,5 +1,5 @@ - + Title