From 9be96c49e26f00d11b719f69f04c312af6737c9a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 Mar 2019 11:36:27 +0000 Subject: [PATCH] Polish "Use HTTPS for external links wherever possible" See gh-16316 --- .../src/main/asciidoc/index.adoc | 2 +- .../jta/BitronixJtaConfiguration.java | 4 ++-- .../grape/DetailedProgressReporterTests.java | 4 ++-- .../asciidoc/appendix-executable-jar-format.adoc | 2 +- .../src/main/asciidoc/deployment.adoc | 4 ++-- .../src/main/asciidoc/getting-started.adoc | 6 +++--- .../main/asciidoc/production-ready-features.adoc | 4 ++-- .../src/main/asciidoc/spring-boot-features.adoc | 16 ++++++++-------- .../main/java/sample/ws/WebServiceConfig.java | 2 +- .../java/sample/ws/endpoint/HolidayEndpoint.java | 2 +- .../src/main/resources/META-INF/schemas/hr.xsd | 4 ++-- .../java/sample/ws/SampleWsApplicationTests.java | 2 +- spring-boot-starters/README.adoc | 6 +++--- .../loader/jar/CentralDirectoryEndRecord.java | 2 +- .../boot/loader/jar/JarEntryData.java | 6 +++--- .../src/site/apt/examples/it-random-port.apt.vm | 2 +- 16 files changed, 34 insertions(+), 34 deletions(-) diff --git a/spring-boot-actuator-docs/src/main/asciidoc/index.adoc b/spring-boot-actuator-docs/src/main/asciidoc/index.adoc index 9f15bdb7ff..a3a6ce6f67 100644 --- a/spring-boot-actuator-docs/src/main/asciidoc/index.adoc +++ b/spring-boot-actuator-docs/src/main/asciidoc/index.adoc @@ -60,7 +60,7 @@ HAL browser is not active). If https://projects.spring.io/spring-hateoas[Spring HATEOAS] is enabled (i.e. if it is on the classpath by default) then the Actuator endpoint responses are enhanced with hypermedia in the form of "links". The default media type for responses is -http://stateless.co/hal_specification.html[HAL], resulting in each resource having an +https://github.com/mikekelly/hal_specification[HAL], resulting in each resource having an extra property called "_links". You can change the media type to another one supported by Spring HATEOAS by providing your own `@EnableHypermedia` annotation and custom providers as necessary. diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java index e478bec450..4a69e75e45 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 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. @@ -42,7 +42,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-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporterTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporterTests.java index a6fe6b955c..bb55ae6a8f 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporterTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2013 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. @@ -39,7 +39,7 @@ import static org.junit.Assert.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-docs/src/main/asciidoc/appendix-executable-jar-format.adoc b/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc index deb97126a1..33eb9e62da 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc @@ -279,6 +279,6 @@ alternatives could be considered: * https://maven.apache.org/plugins/maven-shade-plugin/[Maven Shade Plugin] * http://www.jdotsoft.com/JarClassLoader.php[JarClassLoader] -* http://one-jar.sourceforge.net[OneJar] +* https://sourceforge.net/projects/one-jar/[OneJar] diff --git a/spring-boot-docs/src/main/asciidoc/deployment.adoc b/spring-boot-docs/src/main/asciidoc/deployment.adoc index c20b1fde30..2530d0a84c 100644 --- a/spring-boot-docs/src/main/asciidoc/deployment.adoc +++ b/spring-boot-docs/src/main/asciidoc/deployment.adoc @@ -340,8 +340,8 @@ and then configure and start the necessary resources on AWS: Creating security group boxfuse-sg_axelfontaine/myapp:1.0 ... Launching t2.micro instance of axelfontaine/myapp:1.0 (ami-d23f38cf) in eu-central-1 ... Instance launched in 00:30.306s -> i-92ef9f53 - Waiting for AWS to boot Instance i-92ef9f53 and Payload to start at http://52.28.235.61/ ... - Payload started in 00:29.266s -> http://52.28.235.61/ + Waiting for AWS to boot Instance i-92ef9f53 and Payload to start at https://52.28.235.61/ ... + Payload started in 00:29.266s -> https://52.28.235.61/ Remapping Elastic IP 52.28.233.167 to i-92ef9f53 ... Waiting 15s for AWS to complete Elastic IP Zero Downtime transition ... Deployment completed successfully. axelfontaine/myapp:1.0 is up and running at https://myapp-axelfontaine.boxfuse.io/ diff --git a/spring-boot-docs/src/main/asciidoc/getting-started.adoc b/spring-boot-docs/src/main/asciidoc/getting-started.adoc index a484b5498b..1f71753348 100644 --- a/spring-boot-docs/src/main/asciidoc/getting-started.adoc +++ b/spring-boot-docs/src/main/asciidoc/getting-started.adoc @@ -262,8 +262,8 @@ endif::release[] [[getting-started-installing-the-cli]] === Installing the Spring Boot CLI The Spring Boot CLI is a command line tool that can be used if you want to quickly -prototype with Spring. It allows you to run https://groovy.codehaus.org/[Groovy] scripts, -which means that you have a familiar Java-like syntax, without so much boilerplate code. +prototype with Spring. It allows you to run http://groovy-lang.org[Groovy] scripts, which +means that you have a familiar Java-like syntax, without so much boilerplate code. You don't need to use the CLI to work with Spring Boot but it's definitely the quickest way to get a Spring application off the ground. @@ -370,7 +370,7 @@ install the Spring Boot CLI is: [[getting-started-cli-command-line-completion]] ==== Command-line completion Spring Boot CLI ships with scripts that provide command completion for -https://en.wikipedia.org/wiki/Bash_%2528Unix_shell%2529[BASH] and +https://en.wikipedia.org/wiki/Bash_%28Unix_shell%29[BASH] and https://en.wikipedia.org/wiki/Zsh[zsh] shells. You can `source` the script (also named `spring`) in any shell, or put it in your personal or system-wide bash completion initialization. On a Debian system the system-wide scripts are in `/shell-completion/bash` diff --git a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc index 293e4e139b..b75b4cec32 100644 --- a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc @@ -1191,8 +1191,8 @@ recommendations. [[production-ready-metric-writers-export-to-open-tsdb]] ==== Example: Export to Open TSDB If you provide a `@Bean` of type `OpenTsdbGaugeWriter` and mark it -`@ExportMetricWriter` metrics are exported to http://opentsdb.net/[Open TSDB] for -aggregation. The `OpenTsdbGaugeWriter` has a `url` property that you need to set +`@ExportMetricWriter` metrics are exported to https://github.com/OpenTSDB/opentsdb[Open +TSDB] for aggregation. The `OpenTsdbGaugeWriter` has a `url` property that you need to set to the Open TSDB "`/put`" endpoint, e.g. `http://localhost:4242/api/put`). It also has a `namingStrategy` that you can customize or configure to make the metrics match the data structure you need on the server. By default it just passes through the metric name as an diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 096ab287f8..12cf3f8595 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -558,10 +558,10 @@ For example, the following YAML document: ---- environments: dev: - url: https://dev.bar.com + url: http://dev.example.com name: Developer Setup prod: - url: https://foo.bar.com + url: http://another.example.com name: My Cool App ---- @@ -569,9 +569,9 @@ Would be transformed into these properties: [source,properties,indent=0] ---- - environments.dev.url=https://dev.bar.com + environments.dev.url=http://dev.example.com environments.dev.name=Developer Setup - environments.prod.url=https://foo.bar.com + environments.prod.url=http://another.example.com environments.prod.name=My Cool App ---- @@ -582,16 +582,16 @@ for example this YAML: ---- my: servers: - - dev.bar.com - - foo.bar.com + - dev.example.com + - another.example.com ---- Would be transformed into these properties: [source,properties,indent=0] ---- - my.servers[0]=dev.bar.com - my.servers[1]=foo.bar.com + my.servers[0]=dev.example.com + my.servers[1]=another.example.com ---- To bind to properties like that using the Spring `DataBinder` utilities (which is what diff --git a/spring-boot-samples/spring-boot-sample-ws/src/main/java/sample/ws/WebServiceConfig.java b/spring-boot-samples/spring-boot-sample-ws/src/main/java/sample/ws/WebServiceConfig.java index 2f4fd1e9fa..b041ab8ecf 100644 --- a/spring-boot-samples/spring-boot-sample-ws/src/main/java/sample/ws/WebServiceConfig.java +++ b/spring-boot-samples/spring-boot-sample-ws/src/main/java/sample/ws/WebServiceConfig.java @@ -45,7 +45,7 @@ public class WebServiceConfig extends WsConfigurerAdapter { DefaultWsdl11Definition wsdl11Definition = new DefaultWsdl11Definition(); wsdl11Definition.setPortTypeName("HumanResource"); wsdl11Definition.setLocationUri("/holidayService/"); - wsdl11Definition.setTargetNamespace("http://mycompany.com/hr/definitions"); + wsdl11Definition.setTargetNamespace("https://company.example.com/hr/definitions"); wsdl11Definition.setSchema(countriesSchema); return wsdl11Definition; } diff --git a/spring-boot-samples/spring-boot-sample-ws/src/main/java/sample/ws/endpoint/HolidayEndpoint.java b/spring-boot-samples/spring-boot-sample-ws/src/main/java/sample/ws/endpoint/HolidayEndpoint.java index 3575a638a0..32b1255b31 100644 --- a/spring-boot-samples/spring-boot-sample-ws/src/main/java/sample/ws/endpoint/HolidayEndpoint.java +++ b/spring-boot-samples/spring-boot-sample-ws/src/main/java/sample/ws/endpoint/HolidayEndpoint.java @@ -38,7 +38,7 @@ import org.springframework.ws.server.endpoint.annotation.RequestPayload; @Endpoint public class HolidayEndpoint { - private static final String NAMESPACE_URI = "http://mycompany.com/hr/schemas"; + private static final String NAMESPACE_URI = "https://company.example.com/hr/schemas"; private XPathExpression startDateExpression; private XPathExpression endDateExpression; diff --git a/spring-boot-samples/spring-boot-sample-ws/src/main/resources/META-INF/schemas/hr.xsd b/spring-boot-samples/spring-boot-sample-ws/src/main/resources/META-INF/schemas/hr.xsd index 860ba4e59b..2c32e433c4 100644 --- a/spring-boot-samples/spring-boot-sample-ws/src/main/resources/META-INF/schemas/hr.xsd +++ b/spring-boot-samples/spring-boot-sample-ws/src/main/resources/META-INF/schemas/hr.xsd @@ -1,7 +1,7 @@ + targetNamespace="https://company.example.com/hr/schemas"> diff --git a/spring-boot-samples/spring-boot-sample-ws/src/test/java/sample/ws/SampleWsApplicationTests.java b/spring-boot-samples/spring-boot-sample-ws/src/test/java/sample/ws/SampleWsApplicationTests.java index 465f4ab4de..84dfd4288b 100644 --- a/spring-boot-samples/spring-boot-sample-ws/src/test/java/sample/ws/SampleWsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-ws/src/test/java/sample/ws/SampleWsApplicationTests.java @@ -56,7 +56,7 @@ public class SampleWsApplicationTests { @Test public void testSendingHolidayRequest() { - final String request = "" + final String request = "" + " " + " 2013-10-20" + " 2013-11-22" + " " + " " + " 1" diff --git a/spring-boot-starters/README.adoc b/spring-boot-starters/README.adoc index 8e9a9e00aa..677d705ff5 100644 --- a/spring-boot-starters/README.adoc +++ b/spring-boot-starters/README.adoc @@ -25,10 +25,10 @@ do as they were designed before this was clarified. | Central Authentication Service (CAS) client | https://github.com/Unicon/cas-client-autoconfig-support -| http://modelmapper.org/[ModelMapper] +| https://github.com/modelmapper/modelmapper/[ModelMapper] | https://github.com/jmnarloch/modelmapper-spring-boot-starter -| https://secondmarket.github.io/mongeez/[Mongeez] +| https://github.com/mongeez/mongeez[Mongeez] | https://github.com/hzpz/mongeez-spring-boot-starter/ | https://ha-jdbc.github.io/[HA JDBC] @@ -58,7 +58,7 @@ do as they were designed before this was clarified. | https://www.google.com/recaptcha[Google's reCAPTCHA] | https://github.com/mkopylec/recaptcha-spring-boot-starter -| http://www.mybatis.org/mybatis-3/[Mybatis] +| https://github.com/mybatis/mybatis-3[MyBatis] | https://github.com/mybatis/mybatis-spring-boot | https://wicket.apache.org/[Apache Wicket] diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryEndRecord.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryEndRecord.java index ad15fb06e6..67dcdac07c 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryEndRecord.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryEndRecord.java @@ -24,7 +24,7 @@ import org.springframework.boot.loader.data.RandomAccessData; * A ZIP File "End of central directory record" (EOCD). * * @author Phillip Webb - * @see Zip File Format + * @see Zip File Format */ class CentralDirectoryEndRecord { diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryData.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryData.java index a0abd87cb7..e9ec874b22 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryData.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarEntryData.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 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. @@ -156,8 +156,8 @@ public final class JarEntryData { /** * Decode MS-DOS Date Time details. See - * mindprod.com/jgloss/zip.html for - * more details of the format. + * + * Microsoft's documentation for more details of the format. * @param date the date part * @param time the time part * @return a {@link Calendar} containing the decoded date. diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/it-random-port.apt.vm b/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/it-random-port.apt.vm index 54beaa7a59..8635e87c3b 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/it-random-port.apt.vm +++ b/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/it-random-port.apt.vm @@ -12,7 +12,7 @@ port to the integration test itself. The example below showcases how you could achieve the same feature using the - {{{https://mojo.codehaus.org/build-helper-maven-plugin/}build-helper-plugin}}: + {{{https://www.mojohaus.org/build-helper-maven-plugin/}build-helper-plugin}}: ---