Merge pull request #130 from spring-operator/polish-urls-remaining-master

URL Cleanup
2019-03-21 15:57:17 -04:00
parent a60a76e0ae af98edff54
commit ad811b5774
42 changed files with 201 additions and 201 deletions
--- a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/docs/TestDocumentationUpdater.java
+++ b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/docs/TestDocumentationUpdater.java
@@ -66,13 +66,13 @@ public class TestDocumentationUpdater extends DocumentationUpdater {

 		private String response() {
 			return "<!DOCTYPE HTML>\n" + "\n" + "<meta charset=\"UTF-8\">\n"
-					+ "<meta http-equiv=\"refresh\" content=\"1; url=http://cloud.spring.io/spring-cloud-static/"
+					+ "<meta http-equiv=\"refresh\" content=\"1; url=https://cloud.spring.io/spring-cloud-static/"
 					+ this.version + "/\">\n" + "\n" + "<script>\n"
-					+ "  window.location.href = \"http://cloud.spring.io/spring-cloud-static/"
+					+ "  window.location.href = \"https://cloud.spring.io/spring-cloud-static/"
 					+ this.version + "/\"\n" + "</script>\n" + "\n"
 					+ "<title>Page Redirection</title>\n" + "\n"
 					+ "<!-- Note: don't tell people to `click` the link, just tell them that it is a link. -->\n"
-					+ "If you are not redirected automatically, follow the <a href='http://cloud.spring.io/spring-cloud-static/"
+					+ "If you are not redirected automatically, follow the <a href='https://cloud.spring.io/spring-cloud-static/"
 					+ this.version + "/'>link to latest release</a>\n";
 		}

--- a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/AcceptanceTests.java
+++ b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/AcceptanceTests.java
@@ -222,9 +222,9 @@ public class AcceptanceTests {
 				.contains("I am pleased to announce that the Service Release 5 (SR5)");
 		then(releaseNotesTemplate()).exists();
 		then(releaseNotesTemplateContents()).contains("Camden.SR5").contains(
-				"- Spring Cloud Config `1.2.2.RELEASE` ([issues](http://foo.bar.com/1.2.2.RELEASE))")
+				"- Spring Cloud Config `1.2.2.RELEASE` ([issues](https://foo.bar.com/1.2.2.RELEASE))")
 				.contains(
-						"- Spring Cloud Aws `1.1.3.RELEASE` ([issues](http://foo.bar.com/1.1.3.RELEASE))");
+						"- Spring Cloud Aws `1.1.3.RELEASE` ([issues](https://foo.bar.com/1.1.3.RELEASE))");
 		// once for updating GA
 		// second time to update SNAPSHOT
 		BDDMockito.then(this.saganClient).should(BDDMockito.times(2)).updateRelease(
@@ -500,9 +500,9 @@ public class AcceptanceTests {
 				.contains("The Dalston.RC1 version of @springcloud has been released!");
 		then(releaseNotesTemplate()).exists();
 		then(releaseNotesTemplateContents()).contains("Dalston.RC1").contains(
-				"- Spring Cloud Build `1.3.1.RELEASE` ([issues](http://foo.bar.com/1.3.1.RELEASE))")
+				"- Spring Cloud Build `1.3.1.RELEASE` ([issues](https://foo.bar.com/1.3.1.RELEASE))")
 				.contains(
-						"- Spring Cloud Bus `1.3.0.M1` ([issues](http://foo.bar.com/1.3.0.M1))");
+						"- Spring Cloud Bus `1.3.0.M1` ([issues](https://foo.bar.com/1.3.0.M1))");
 		BDDMockito.then(this.saganClient).should().updateRelease(
 				BDDMockito.eq("spring-cloud-consul"), BDDMockito.anyList());
 		BDDMockito.then(this.saganClient).should().deleteRelease("spring-cloud-consul",
@@ -541,9 +541,9 @@ public class AcceptanceTests {
 				.contains("The Dalston.RC1 version of @springcloud has been released!");
 		then(releaseNotesTemplate()).exists();
 		then(releaseNotesTemplateContents()).contains("Dalston.RC1").contains(
-				"- Spring Cloud Build `1.3.1.RELEASE` ([issues](http://foo.bar.com/1.3.1.RELEASE))")
+				"- Spring Cloud Build `1.3.1.RELEASE` ([issues](https://foo.bar.com/1.3.1.RELEASE))")
 				.contains(
-						"- Spring Cloud Bus `1.3.0.M1` ([issues](http://foo.bar.com/1.3.0.M1)");
+						"- Spring Cloud Bus `1.3.0.M1` ([issues](https://foo.bar.com/1.3.0.M1)");
 		BDDMockito.then(this.saganClient).should(BDDMockito.never())
 				.updateRelease(BDDMockito.anyString(), BDDMockito.anyList());
 		then(this.gitHandler.issueCreatedInSpringGuides).isFalse();
@@ -868,7 +868,7 @@ public class AcceptanceTests {

 		@Override
 		public String milestoneUrl(ProjectVersion releaseVersion) {
-			return "http://foo.bar.com/" + releaseVersion.toString();
+			return "https://foo.bar.com/" + releaseVersion.toString();
 		}

 	}
@@ -897,7 +897,7 @@ public class AcceptanceTests {

 		@Override
 		public String milestoneUrl(ProjectVersion releaseVersion) {
-			return "http://foo.bar.com/" + releaseVersion.toString();
+			return "https://foo.bar.com/" + releaseVersion.toString();
 		}

 		@Override
--- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/README.adoc
+++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/README.adoc
@@ -70,7 +70,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
@@ -83,7 +83,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).

--- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building-base.adoc
+++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building-base.adoc
@@ -31,7 +31,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,
@@ -53,13 +53,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".

--- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building-lombok.adoc
+++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/building-lombok.adoc
@@ -1,6 +1,6 @@
 ==== Adding Project Lombok Agent

-Spring Cloud uses http://projectlombok.org/features/index.html[Project Lombok]
+Spring Cloud uses https://projectlombok.org/features/index.html[Project Lombok]
 to generate getters and setters etc. Compiling from the command line this
 shouldn't cause any problems, but in an IDE you need to add an agent
 to the JVM. Full instructions can be found in the Lombok website. The
--- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/code-of-conduct.adoc
+++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/code-of-conduct.adoc
@@ -41,5 +41,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/]
--- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/contributing.adoc
+++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/asciidoc/contributing.adoc
@@ -26,7 +26,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
@@ -39,6 +39,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 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).
--- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/common.xsl
+++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/common.xsl
@@ -20,7 +20,7 @@
 -->

 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-				xmlns:xslthl="http://xslthl.sf.net"
+				xmlns:xslthl="http://xslthl.sourceforge.net/"
 				xmlns:d="http://docbook.org/ns/docbook"
 				exclude-result-prefixes="xslthl d"
 				version='1.0'>
--- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/epub.xsl
+++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/epub.xsl
@@ -20,7 +20,7 @@ under the License.
 -->

 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-				xmlns:xslthl="http://xslthl.sf.net"
+				xmlns:xslthl="http://xslthl.sourceforge.net/"
 				xmlns:d="http://docbook.org/ns/docbook"
 				exclude-result-prefixes="xslthl d"
 				version='1.0'>
--- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/html.xsl
+++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/html.xsl
@@ -20,7 +20,7 @@ under the License.
 -->

 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-				xmlns:xslthl="http://xslthl.sf.net"
+				xmlns:xslthl="http://xslthl.sourceforge.net/"
 				xmlns:d="http://docbook.org/ns/docbook"
 				exclude-result-prefixes="xslthl"
 				version='1.0'>
--- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/pdf.xsl
+++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-build/docs/src/main/docbook/xsl/pdf.xsl
@@ -22,7 +22,7 @@ under the License.
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 				xmlns:d="http://docbook.org/ns/docbook"
 				xmlns:fo="http://www.w3.org/1999/XSL/Format"
-				xmlns:xslthl="http://xslthl.sf.net"
+				xmlns:xslthl="http://xslthl.sourceforge.net/"
 				xmlns:xlink='http://www.w3.org/1999/xlink'
 				xmlns:exsl="http://exslt.org/common"
 				exclude-result-prefixes="exsl xslthl d xlink"
--- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/README.adoc
+++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release-with-snapshot/README.adoc
@@ -38,7 +38,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
@@ -51,7 +51,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).

--- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/README.adoc
+++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/README.adoc
@@ -38,7 +38,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
@@ -51,7 +51,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).

--- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/current/index.html
+++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static-angel/current/index.html
@@ -1,14 +1,14 @@
 <!DOCTYPE HTML>

 <meta charset="UTF-8">
-<meta http-equiv="refresh" content="1; url=http://cloud.spring.io/spring-cloud-static/Dalston.SR3/">
+<meta http-equiv="refresh" content="1; url=https://cloud.spring.io/spring-cloud-static/Dalston.SR3/">

 <script>
-    window.location.href = "http://cloud.spring.io/spring-cloud-static/Dalston.SR3/"
+    window.location.href = "https://cloud.spring.io/spring-cloud-static/Dalston.SR3/"
 </script>

 <title>Page Redirection</title>

 <!-- Note: don't tell people to `click` the link, just tell them that it is a link. -->
-If you are not redirected automatically, follow the <a href='http://cloud.spring.io/spring-cloud-static/Dalston.SR3/'>link
+If you are not redirected automatically, follow the <a href='https://cloud.spring.io/spring-cloud-static/Dalston.SR3/'>link
    to latest release</a>
--- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static/current/index.html
+++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-static/current/index.html
@@ -1,14 +1,14 @@
 <!DOCTYPE HTML>

 <meta charset="UTF-8">
-<meta http-equiv="refresh" content="1; url=http://cloud.spring.io/spring-cloud-static/Dalston.SR3/">
+<meta http-equiv="refresh" content="1; url=https://cloud.spring.io/spring-cloud-static/Dalston.SR3/">

 <script>
-    window.location.href = "http://cloud.spring.io/spring-cloud-static/Dalston.SR3/"
+    window.location.href = "https://cloud.spring.io/spring-cloud-static/Dalston.SR3/"
 </script>

 <title>Page Redirection</title>

 <!-- Note: don't tell people to `click` the link, just tell them that it is a link. -->
-If you are not redirected automatically, follow the <a href='http://cloud.spring.io/spring-cloud-static/Dalston.SR3/'>link
+If you are not redirected automatically, follow the <a href='https://cloud.spring.io/spring-cloud-static/Dalston.SR3/'>link
    to latest release</a>
--- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-wiki/Spring-Cloud-Brixton-Release-Notes.asciidoc
+++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-wiki/Spring-Cloud-Brixton-Release-Notes.asciidoc
@@ -35,7 +35,7 @@ Some of the highlights of the Brixton release train are:
 * Hashicorp Consul support for service registration/discovery & configuration via Spring Cloud Consul
 * Apache Zookeeper support for service registration/discovery, configuration via Spring Cloud Zookeeper and leader election in Spring Cloud Cluster
 * Distributed tracing through the Spring Cloud Sleuth abstraction with two out of the box implementations: one supporting logging (ideal for log collectors and multiplexers like Logstash and Loggregator) and one supporting Twitter's Zipkin
-* Netflix http://techblog.netflix.com/2014/12/introducing-atlas-netflixs-primary.html[Atlas Telemetry System], the next generation https://github.com/Netflix/spectator/wiki[Spectator Metrics library] and recent versions of Eureka, Ribbon, Hystrix and Feign are available in Spring Cloud Netflix
+* Netflix https://medium.com/netflix-techblog/introducing-atlas-netflixs-primary-telemetry-platform-bd31f4d8ed9a[Atlas Telemetry System], the next generation https://github.com/Netflix/spectator/wiki[Spectator Metrics library] and recent versions of Eureka, Ribbon, Hystrix and Feign are available in Spring Cloud Netflix
 * Spring Cloud Bus is now powered by the recently released https://spring.io/blog/2016/05/10/spring-cloud-stream-1-0-0-release-is-available[Spring Cloud Stream]
 * Cluster Leadership election and locks via Spring Cloud Cluster
 * Export of Spring Boot metrics to Amazon Cloudwatch, and native support for Amazon RDS
@@ -43,9 +43,9 @@ Some of the highlights of the Brixton release train are:

 == Notes:

-Starting with Brixton, Zuul will no longer automatically send all headers to downstream services. By default `Cookie`, `Set-Cookie` and `Authorization` *are not* sent to downstream services. To return to the Angel behaviour, set `zuul.sensitiveHeaders=""` in the Zuul configuration. See http://cloud.spring.io/spring-cloud-static/Brixton.SR6/#_cookies_and_sensitive_headers[the documentation] for more information.
+Starting with Brixton, Zuul will no longer automatically send all headers to downstream services. By default `Cookie`, `Set-Cookie` and `Authorization` *are not* sent to downstream services. To return to the Angel behaviour, set `zuul.sensitiveHeaders=""` in the Zuul configuration. See https://cloud.spring.io/spring-cloud-static/Brixton.SR6/#_cookies_and_sensitive_headers[the documentation] for more information.

-A `@LoadBalanced` `RestTemplate` is no longer created by default. See the http://cloud.spring.io/spring-cloud-static/spring-cloud.html=_spring_resttemplate_as_a_load_balancer_client[updated documentation for details]. You need to create it in your application’s configuration. For example:
+A `@LoadBalanced` `RestTemplate` is no longer created by default. See the https://cloud.spring.io/spring-cloud-static/spring-cloud.html=_spring_resttemplate_as_a_load_balancer_client[updated documentation for details]. You need to create it in your application’s configuration. For example:

 ```java
@Configuration
--- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud/README.md
+++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud/README.md
@@ -1,5 +1,5 @@
 This project is an umbrella and the git repository is used only for
-documentation (see gh-pages branch). Home page: http://projects.spring.io/spring-cloud.
+documentation (see gh-pages branch). Home page: https://projects.spring.io/spring-cloud.

 The sub-projects of Spring Cloud live in a different Github
 organization: https://github.com/spring-cloud. Please use the