diff --git a/.editorconfig b/.editorconfig index 0679d88a..e65ee453 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,4 +1,4 @@ -# EditorConfig is awesome: http://EditorConfig.org +# EditorConfig is awesome: https://EditorConfig.org # top-most EditorConfig file root = true diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 8560ad2a..eb9a16ae 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -28,7 +28,7 @@ added after the original pull request but before a merge. you can import formatter settings using the `eclipse-code-formatter.xml` file from the [Spring Cloud Build](https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml) project. If using IntelliJ, you can use the - [Eclipse Code Formatter Plugin](http://plugins.jetbrains.com/plugin/6546) to import the same file. + [Eclipse Code Formatter Plugin](https://plugins.jetbrains.com/plugin/6546) 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 for. @@ -40,6 +40,6 @@ 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 [these conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html), +* When writing a commit message please follow [these conventions](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html), 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). diff --git a/README.adoc b/README.adoc index 60e73c49..d525e0f9 100644 --- a/README.adoc +++ b/README.adoc @@ -257,7 +257,7 @@ credentials and you already have those. The projects that require middleware generally include a `docker-compose.yml`, so consider using -http://compose.docker.io/[Docker Compose] to run the middeware servers +https://compose.docker.io/[Docker Compose] to run the middeware servers in Docker containers. See the README in the https://github.com/spring-cloud-samples/scripts[scripts demo repository] for specific instructions about the common cases of mongo, @@ -279,13 +279,13 @@ a modified file in the correct place. Just commit it and push the change. === Working with the code If you don't have an IDE preference we would recommend that you use -http://www.springsource.com/developer/sts[Spring Tools Suite] or -http://eclipse.org[Eclipse] when working with the code. We use the -http://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools +https://www.springsource.com/developer/sts[Spring Tools Suite] or +https://eclipse.org[Eclipse] when working with the code. We use the +https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools should also work without issue as long as they use Maven 3.3.3 or better. ==== Importing into eclipse with m2eclipse -We recommend the http://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with +We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with eclipse. If you don't already have m2eclipse installed it is available from the "eclipse marketplace". @@ -316,11 +316,11 @@ from the `file` menu. If you get an exception due to "Illegal key size" and you are using Sun’s JDK, you need to install the Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files. See the following links for more information: -http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html[Java 6 JCE] +https://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html[Java 6 JCE] -http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html[Java 7 JCE] +https://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html[Java 7 JCE] -http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html[Java 8 JCE] +https://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html[Java 8 JCE] Extract the JCE files into the `JDK/jre/lib/security` folder for whichever version of JRE/JDK x64/x86 you use. @@ -356,7 +356,7 @@ added after the original pull request but before a merge. `eclipse-code-formatter.xml` file from the https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring Cloud Build] project. If using IntelliJ, you can use the - http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter + 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 @@ -369,7 +369,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). @@ -440,7 +440,7 @@ If you need to suppress some rules (e.g. line length needs to be longer), then i + "https://www.puppycrawl.com/dtds/suppressions_1_1.dtd"> diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index cdb37db6..e38de84f 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -67,11 +67,11 @@ include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/maste If you get an exception due to "Illegal key size" and you are using Sun’s JDK, you need to install the Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files. See the following links for more information: -http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html[Java 6 JCE] +https://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html[Java 6 JCE] -http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html[Java 7 JCE] +https://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html[Java 7 JCE] -http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html[Java 8 JCE] +https://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html[Java 8 JCE] Extract the JCE files into the `JDK/jre/lib/security` folder for whichever version of JRE/JDK x64/x86 you use. diff --git a/docs/src/main/asciidoc/spring-cloud-config.adoc b/docs/src/main/asciidoc/spring-cloud-config.adoc index 5ba5a368..ac57725e 100644 --- a/docs/src/main/asciidoc/spring-cloud-config.adoc +++ b/docs/src/main/asciidoc/spring-cloud-config.adoc @@ -273,14 +273,14 @@ spring: team-a: pattern: team-a-* cloneOnStart: true - uri: http://git/team-a/config-repo.git + uri: https://git/team-a/config-repo.git team-b: pattern: team-b-* cloneOnStart: false - uri: http://git/team-b/config-repo.git + uri: https://git/team-b/config-repo.git team-c: pattern: team-c-* - uri: http://git/team-a/config-repo.git + uri: https://git/team-a/config-repo.git ---- @@ -320,16 +320,16 @@ TIP: If you do not know where your `~/.git` directory is, use `git config --glob ===== Authentication with AWS CodeCommit -Spring Cloud Config Server also supports http://docs.aws.amazon.com/codecommit/latest/userguide/welcome.html[AWS CodeCommit] authentication. +Spring Cloud Config Server also supports https://docs.aws.amazon.com/codecommit/latest/userguide/welcome.html[AWS CodeCommit] authentication. AWS CodeCommit uses an authentication helper when using Git from the command line. This helper is not used with the JGit library, so a JGit CredentialProvider for AWS CodeCommit is created if the Git URI matches the AWS CodeCommit pattern. AWS CodeCommit URIs follow this pattern://git-codecommit.${AWS_REGION}.amazonaws.com/${repopath}. -If you provide a username and password with an AWS CodeCommit URI, they must be the http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSGettingStartedGuide/AWSCredentials.html[AWS accessKeyId and secretAccessKey] that provide access to the repository. -If you do not specify a username and password, the accessKeyId and secretAccessKey are retrieved by using the http://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/credentials.html[AWS Default Credential Provider Chain]. +If you provide a username and password with an AWS CodeCommit URI, they must be the https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSGettingStartedGuide/AWSCredentials.html[AWS accessKeyId and secretAccessKey] that provide access to the repository. +If you do not specify a username and password, the accessKeyId and secretAccessKey are retrieved by using the https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/credentials.html[AWS Default Credential Provider Chain]. If your Git URI matches the CodeCommit URI pattern (shown earlier), you must provide valid AWS credentials in the username and password or in one of the locations supported by the default credential provider chain. -AWS EC2 instances may use http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html[IAM Roles for EC2 Instances]. +AWS EC2 instances may use https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html[IAM Roles for EC2 Instances]. NOTE: The `aws-java-sdk-core` jar is an optional dependency. If the `aws-java-sdk-core` jar is not on your classpath, the AWS Code Commit credential provider is not created, regardless of the git server URI. @@ -463,15 +463,15 @@ spring: repos: team-a: pattern: team-a-* - uri: http://git/team-a/config-repo.git + uri: https://git/team-a/config-repo.git force-pull: true team-b: pattern: team-b-* - uri: http://git/team-b/config-repo.git + uri: https://git/team-b/config-repo.git force-pull: true team-c: pattern: team-c-* - uri: http://git/team-a/config-repo.git + uri: https://git/team-a/config-repo.git ---- NOTE: The default value for `force-pull` property is `false`. @@ -516,7 +516,7 @@ is requested. WARNING: With VCS-based backends (git, svn), files are checked out or cloned to the local filesystem. By default, they are put in the system temporary directory with a prefix of `config-repo-`. On linux, for example, it could be `/tmp/config-repo-`. -Some operating systems http://serverfault.com/questions/377348/when-does-tmp-get-cleared/377349#377349[routinely clean out] temporary directories. +Some operating systems https://serverfault.com/questions/377348/when-does-tmp-get-cleared/377349#377349[routinely clean out] temporary directories. This can lead to unexpected behavior, such as missing properties. To avoid this problem, change the directory that Config Server uses by setting `spring.cloud.config.server.git.basedir` or `spring.cloud.config.server.svn.basedir` to a directory that does not reside in the system temp structure. diff --git a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GiteePropertyPathNotificationExtractorTests.java b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GiteePropertyPathNotificationExtractorTests.java index 32736ffe..9b5352e8 100644 --- a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GiteePropertyPathNotificationExtractorTests.java +++ b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GiteePropertyPathNotificationExtractorTests.java @@ -38,7 +38,7 @@ public class GiteePropertyPathNotificationExtractorTests { @Test public void giteeSample() throws Exception { - // See http://git.mydoc.io/?t=154711 + // See https://git.mydoc.io/?t=154711 Map value = new ObjectMapper().readValue( new ClassPathResource("pathsamples/gitee.json").getInputStream(), new TypeReference>() { diff --git a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GitlabPropertyPathNotificationExtractorTests.java b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GitlabPropertyPathNotificationExtractorTests.java index ddd7b9d7..c833631d 100644 --- a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GitlabPropertyPathNotificationExtractorTests.java +++ b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GitlabPropertyPathNotificationExtractorTests.java @@ -39,7 +39,7 @@ public class GitlabPropertyPathNotificationExtractorTests { @Test public void pushEvent() throws Exception { - // See http://doc.gitlab.com/ee/web_hooks/web_hooks.html#push-events + // See https://docs.gitlab.com/ee/web_hooks/web_hooks.html#push-events Map value = new ObjectMapper().readValue( new ClassPathResource("pathsamples/gitlab.json").getInputStream(), new TypeReference>() { @@ -54,7 +54,7 @@ public class GitlabPropertyPathNotificationExtractorTests { @Test public void nonPushEventNotDetected() throws Exception { - // See http://doc.gitlab.com/ee/web_hooks/web_hooks.html#push-events + // See https://docs.gitlab.com/ee/web_hooks/web_hooks.html#push-events Map value = new ObjectMapper().readValue( new ClassPathResource("pathsamples/gitlab.json").getInputStream(), new TypeReference>() { diff --git a/spring-cloud-config-monitor/src/test/resources/pathsamples/gitea.json b/spring-cloud-config-monitor/src/test/resources/pathsamples/gitea.json index ffeaa9fd..7f41b348 100755 --- a/spring-cloud-config-monitor/src/test/resources/pathsamples/gitea.json +++ b/spring-cloud-config-monitor/src/test/resources/pathsamples/gitea.json @@ -3,12 +3,12 @@ "ref": "refs/heads/master", "before": "70767b558d8f850eac3fead13dfc232d043646a0", "after": "78b77379c448caf024c73fa280ca571449224590", - "compare_url": "http://gitea.lawyers.corp/internal/lawsuits/compare/70767b558d8f850eac3fead13dfc232d043646a0...78b77379c448caf024c73fa280ca571449224590", + "compare_url": "https://gitea.lawyers.corp/internal/lawsuits/compare/70767b558d8f850eac3fead13dfc232d043646a0...78b77379c448caf024c73fa280ca571449224590", "commits": [ { "id": "78b77379c448caf024c73fa280ca571449224590", "message": "SUPPORT-4765: urlencode\n", - "url": "http://gitea.lawyers.corp/internal/lawsuits/commit/78b77379c448caf024c73fa280ca571449224590", + "url": "https://gitea.lawyers.corp/internal/lawsuits/commit/78b77379c448caf024c73fa280ca571449224590", "author": { "name": "Perry Mason", "email": "perrym@lawyers.corp", @@ -30,7 +30,7 @@ "login": "internal", "full_name": "", "email": "", - "avatar_url": "http://gitea.lawyers.corp/avatars/dbc87f99ecd29cb0eb4447807ad73f9f", + "avatar_url": "https://gitea.lawyers.corp/avatars/dbc87f99ecd29cb0eb4447807ad73f9f", "language": "", "username": "internal" }, @@ -43,9 +43,9 @@ "parent": null, "mirror": false, "size": 5516, - "html_url": "http://gitea.lawyers.corp/internal/lawsuits", + "html_url": "https://gitea.lawyers.corp/internal/lawsuits", "ssh_url": "git@localhost:internal/lawsuits.git", - "clone_url": "http://gitea.lawyers.corp/internal/lawsuits.git", + "clone_url": "https://gitea.lawyers.corp/internal/lawsuits.git", "website": "", "stars_count": 1, "forks_count": 20, @@ -65,7 +65,7 @@ "login": "perrym", "full_name": "Perry Mason", "email": "perrym@lawyers.corp", - "avatar_url": "http://gitea.lawyers.corp/avatars/5868737ae078a4441031bf550d16e967", + "avatar_url": "https://gitea.lawyers.corp/avatars/5868737ae078a4441031bf550d16e967", "language": "en-US", "username": "perrym" }, @@ -74,7 +74,7 @@ "login": "perrym", "full_name": "Perry Mason", "email": "perrym@lawyers.corp", - "avatar_url": "http://gitea.lawyers.corp/avatars/5868737ae078a4441031bf550d16e967", + "avatar_url": "https://gitea.lawyers.corp/avatars/5868737ae078a4441031bf550d16e967", "language": "en-US", "username": "perrym" } diff --git a/spring-cloud-config-monitor/src/test/resources/pathsamples/gitee.json b/spring-cloud-config-monitor/src/test/resources/pathsamples/gitee.json index 016f84a6..63d47c07 100644 --- a/spring-cloud-config-monitor/src/test/resources/pathsamples/gitee.json +++ b/spring-cloud-config-monitor/src/test/resources/pathsamples/gitee.json @@ -11,7 +11,7 @@ }, "repository": { "name": "webhook", - "url": "http://git.oschina.net/oschina/webhook", + "url": "https://git.oschina.net/oschina/webhook", "description": "", "homepage": "https://gitee.com/oschina/webhook" }, diff --git a/spring-cloud-config-monitor/src/test/resources/pathsamples/gitlab.json b/spring-cloud-config-monitor/src/test/resources/pathsamples/gitlab.json index 299258f3..35e42af9 100644 --- a/spring-cloud-config-monitor/src/test/resources/pathsamples/gitlab.json +++ b/spring-cloud-config-monitor/src/test/resources/pathsamples/gitlab.json @@ -11,25 +11,25 @@ "project": { "name": "Diaspora", "description": "", - "web_url": "http://example.com/mike/diaspora", + "web_url": "https://example.com/mike/diaspora", "avatar_url": null, "git_ssh_url": "git@example.com:mike/diaspora.git", - "git_http_url": "http://example.com/mike/diaspora.git", + "git_http_url": "https://example.com/mike/diaspora.git", "namespace": "Mike", "visibility_level": 0, "path_with_namespace": "mike/diaspora", "default_branch": "master", - "homepage": "http://example.com/mike/diaspora", + "homepage": "https://example.com/mike/diaspora", "url": "git@example.com:mike/diasporadiaspora.git", "ssh_url": "git@example.com:mike/diaspora.git", - "http_url": "http://example.com/mike/diaspora.git" + "http_url": "https://example.com/mike/diaspora.git" }, "repository": { "name": "Diaspora", "url": "git@example.com:mike/diasporadiaspora.git", "description": "", - "homepage": "http://example.com/mike/diaspora", - "git_http_url": "http://example.com/mike/diaspora.git", + "homepage": "https://example.com/mike/diaspora", + "git_http_url": "https://example.com/mike/diaspora.git", "git_ssh_url": "git@example.com:mike/diaspora.git", "visibility_level": 0 }, @@ -38,7 +38,7 @@ "id": "b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327", "message": "Update Catalan translation to e38cb41.", "timestamp": "2011-12-12T14:27:31+02:00", - "url": "http://example.com/mike/diaspora/commit/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327", + "url": "https://example.com/mike/diaspora/commit/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327", "author": { "name": "Jordi Mallach", "email": "jordi@softcatala.org" @@ -55,7 +55,7 @@ "id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7", "message": "fixed readme", "timestamp": "2012-01-03T23:36:29+02:00", - "url": "http://example.com/mike/diaspora/commit/da1560886d4f094c3e6c9ef40349f7d38b5d27d7", + "url": "https://example.com/mike/diaspora/commit/da1560886d4f094c3e6c9ef40349f7d38b5d27d7", "author": { "name": "GitLab dev user", "email": "gitlabdev@dv6700.(none)" diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/SvnKitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/SvnKitEnvironmentRepository.java index 7f069717..32dc0443 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/SvnKitEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/SvnKitEnvironmentRepository.java @@ -167,7 +167,7 @@ public class SvnKitEnvironmentRepository extends AbstractScmEnvironmentRepositor @Override public void afterPropertiesSet() throws Exception { Assert.state(getUri() != null, - "You need to configure a uri for the subversion repository (e.g. 'http://example.com/svn/')"); + "You need to configure a uri for the subversion repository (e.g. 'https://example.com/svn/')"); resolveRelativeFileUri(); } diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AwsCodeCommitCredentialProvider.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AwsCodeCommitCredentialProvider.java index cbefb36f..69502293 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AwsCodeCommitCredentialProvider.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/AwsCodeCommitCredentialProvider.java @@ -54,7 +54,7 @@ import static org.springframework.util.StringUtils.hasText; * secret key. These are used to calculate a signature for the git request. The AWS access * key is used as the codecommit username, and the calculated signature is used as the * password. The process for calculating this signature is documented very well at - * http://docs.aws.amazon.com/general/latest/gr/signature-version-4.html. + * https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html. * * @author Don Laidlaw */ @@ -91,7 +91,7 @@ public class AwsCodeCommitCredentialProvider extends CredentialsProvider { /** * Calculate the AWS CodeCommit password for the provided URI and AWS secret key. This * uses the algorithm published by AWS at - * http://docs.aws.amazon.com/general/latest/gr/signature-version-4.html + * https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html * @param uri the codecommit repository uri * @param awsSecretKey the aws secret key * @return the password to use in the git request diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/config/HttpClientVaultRestTemplateFactoryTest.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/config/HttpClientVaultRestTemplateFactoryTest.java index aa5d896e..3724a720 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/config/HttpClientVaultRestTemplateFactoryTest.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/config/HttpClientVaultRestTemplateFactoryTest.java @@ -49,26 +49,26 @@ public class HttpClientVaultRestTemplateFactoryTest { private static final ProxyHostProperties HTTPS_PROXY = new ProxyHostProperties(); static { - AUTHENTICATED_HTTP_PROXY.setHost("http://authenticated.http.proxy"); + AUTHENTICATED_HTTP_PROXY.setHost("https://authenticated.http.proxy"); AUTHENTICATED_HTTP_PROXY.setPort(8080); AUTHENTICATED_HTTP_PROXY.setUsername("username"); AUTHENTICATED_HTTP_PROXY.setPassword("password"); } static { - AUTHENTICATED_HTTPS_PROXY.setHost("http://authenticated.https.proxy"); + AUTHENTICATED_HTTPS_PROXY.setHost("https://authenticated.https.proxy"); AUTHENTICATED_HTTPS_PROXY.setPort(8081); AUTHENTICATED_HTTPS_PROXY.setUsername("username2"); AUTHENTICATED_HTTPS_PROXY.setPassword("password2"); } static { - HTTP_PROXY.setHost("http://http.proxy"); + HTTP_PROXY.setHost("https://http.proxy"); HTTP_PROXY.setPort(8080); } static { - HTTPS_PROXY.setHost("http://https.proxy"); + HTTPS_PROXY.setHost("https://https.proxy"); HTTPS_PROXY.setPort(8081); } diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/ConfigurableHttpConnectionFactoryIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/ConfigurableHttpConnectionFactoryIntegrationTests.java index bafdc489..9b0b3167 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/ConfigurableHttpConnectionFactoryIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/ConfigurableHttpConnectionFactoryIntegrationTests.java @@ -71,26 +71,26 @@ public class ConfigurableHttpConnectionFactoryIntegrationTests { private static final ProxyHostProperties HTTPS_PROXY = new ProxyHostProperties(); static { - AUTHENTICATED_HTTP_PROXY.setHost("http://authenticated.http.proxy"); + AUTHENTICATED_HTTP_PROXY.setHost("https://authenticated.http.proxy"); AUTHENTICATED_HTTP_PROXY.setPort(8080); AUTHENTICATED_HTTP_PROXY.setUsername("username"); AUTHENTICATED_HTTP_PROXY.setPassword("password"); } static { - AUTHENTICATED_HTTPS_PROXY.setHost("http://authenticated.https.proxy"); + AUTHENTICATED_HTTPS_PROXY.setHost("https://authenticated.https.proxy"); AUTHENTICATED_HTTPS_PROXY.setPort(8081); AUTHENTICATED_HTTPS_PROXY.setUsername("username2"); AUTHENTICATED_HTTPS_PROXY.setPassword("password2"); } static { - HTTP_PROXY.setHost("http://http.proxy"); + HTTP_PROXY.setHost("https://http.proxy"); HTTP_PROXY.setPort(8080); } static { - HTTPS_PROXY.setHost("http://https.proxy"); + HTTPS_PROXY.setHost("https://https.proxy"); HTTPS_PROXY.setPort(8081); } diff --git a/spring-cloud-config-server/src/test/resources/svn-config-repo/README.txt b/spring-cloud-config-server/src/test/resources/svn-config-repo/README.txt index 9935818a..26a33fea 100644 --- a/spring-cloud-config-server/src/test/resources/svn-config-repo/README.txt +++ b/spring-cloud-config-server/src/test/resources/svn-config-repo/README.txt @@ -2,4 +2,4 @@ This is a Subversion repository; use the 'svnadmin' and 'svnlook' tools to examine it. Do not add, delete, or modify files here unless you know how to avoid corrupting the repository. -Visit http://subversion.apache.org/ for more information. +Visit https://subversion.apache.org/ for more information. diff --git a/spring-cloud-config-server/src/test/resources/svn-config-repo/conf/svnserve.conf b/spring-cloud-config-server/src/test/resources/svn-config-repo/conf/svnserve.conf index a1eb6c8f..d79ce53d 100644 --- a/spring-cloud-config-server/src/test/resources/svn-config-repo/conf/svnserve.conf +++ b/spring-cloud-config-server/src/test/resources/svn-config-repo/conf/svnserve.conf @@ -3,7 +3,7 @@ ### access through http: and/or file: URLs, then this file is ### irrelevant.) -### Visit http://subversion.apache.org/ for more information. +### Visit https://subversion.apache.org/ for more information. [general] ### The anon-access and auth-access options control access to the diff --git a/spring-cloud-config-server/src/test/resources/svn-config-repo/db/fsfs.conf b/spring-cloud-config-server/src/test/resources/svn-config-repo/db/fsfs.conf index 7c0bf9f7..1dd9436e 100644 --- a/spring-cloud-config-server/src/test/resources/svn-config-repo/db/fsfs.conf +++ b/spring-cloud-config-server/src/test/resources/svn-config-repo/db/fsfs.conf @@ -2,7 +2,7 @@ [memcached-servers] ### These options name memcached servers used to cache internal FSFS -### data. See http://www.danga.com/memcached/ for more information on +### data. See https://www.danga.com/memcached/ for more information on ### memcached. To use memcached with FSFS, run one or more memcached ### servers, and specify each of them as an option like so: # first-server = 127.0.0.1:11211 diff --git a/spring-cloud-config-server/src/test/resources/svn-config-repo/hooks/post-commit.tmpl b/spring-cloud-config-server/src/test/resources/svn-config-repo/hooks/post-commit.tmpl index ce646560..c01fc207 100644 --- a/spring-cloud-config-server/src/test/resources/svn-config-repo/hooks/post-commit.tmpl +++ b/spring-cloud-config-server/src/test/resources/svn-config-repo/hooks/post-commit.tmpl @@ -41,8 +41,8 @@ # Here is an example hook script, for a Unix /bin/sh interpreter. # For more examples and pre-written hooks, see those in # the Subversion repository at -# http://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and -# http://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/ +# https://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and +# https://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/ REPOS="$1" diff --git a/spring-cloud-config-server/src/test/resources/svn-config-repo/hooks/post-revprop-change.tmpl b/spring-cloud-config-server/src/test/resources/svn-config-repo/hooks/post-revprop-change.tmpl index 3254f5e6..c3e0977e 100644 --- a/spring-cloud-config-server/src/test/resources/svn-config-repo/hooks/post-revprop-change.tmpl +++ b/spring-cloud-config-server/src/test/resources/svn-config-repo/hooks/post-revprop-change.tmpl @@ -43,8 +43,8 @@ # Here is an example hook script, for a Unix /bin/sh interpreter. # For more examples and pre-written hooks, see those in # the Subversion repository at -# http://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and -# http://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/ +# https://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and +# https://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/ REPOS="$1" diff --git a/spring-cloud-config-server/src/test/resources/svn-config-repo/hooks/pre-commit.tmpl b/spring-cloud-config-server/src/test/resources/svn-config-repo/hooks/pre-commit.tmpl index c478262e..64051751 100644 --- a/spring-cloud-config-server/src/test/resources/svn-config-repo/hooks/pre-commit.tmpl +++ b/spring-cloud-config-server/src/test/resources/svn-config-repo/hooks/pre-commit.tmpl @@ -61,8 +61,8 @@ # Here is an example hook script, for a Unix /bin/sh interpreter. # For more examples and pre-written hooks, see those in # the Subversion repository at -# http://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and -# http://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/ +# https://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and +# https://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/ REPOS="$1" diff --git a/spring-cloud-config-server/src/test/resources/svn-config-repo/hooks/pre-revprop-change.tmpl b/spring-cloud-config-server/src/test/resources/svn-config-repo/hooks/pre-revprop-change.tmpl index af127ad6..6ffcaf40 100644 --- a/spring-cloud-config-server/src/test/resources/svn-config-repo/hooks/pre-revprop-change.tmpl +++ b/spring-cloud-config-server/src/test/resources/svn-config-repo/hooks/pre-revprop-change.tmpl @@ -50,8 +50,8 @@ # Here is an example hook script, for a Unix /bin/sh interpreter. # For more examples and pre-written hooks, see those in # the Subversion repository at -# http://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and -# http://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/ +# https://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and +# https://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/ REPOS="$1" diff --git a/spring-cloud-config-server/src/test/resources/svn-config-repo/hooks/start-commit.tmpl b/spring-cloud-config-server/src/test/resources/svn-config-repo/hooks/start-commit.tmpl index 194c3412..1de8cea9 100644 --- a/spring-cloud-config-server/src/test/resources/svn-config-repo/hooks/start-commit.tmpl +++ b/spring-cloud-config-server/src/test/resources/svn-config-repo/hooks/start-commit.tmpl @@ -57,8 +57,8 @@ # Here is an example hook script, for a Unix /bin/sh interpreter. # For more examples and pre-written hooks, see those in # the Subversion repository at -# http://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and -# http://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/ +# https://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and +# https://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/ REPOS="$1"