Skip to content

Commit 14b2102

Browse files
committed
Polish "Use HTTPS for external links wherever possible"
See gh-16319
1 parent 1a4c6f2 commit 14b2102

File tree

7 files changed

+20
-19
lines changed

7 files changed

+20
-19
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/AutowireCapableBeanJobFactory.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -26,8 +26,6 @@
2626
* Subclass of {@link SpringBeanJobFactory} that supports auto-wiring job beans.
2727
*
2828
* @author Vedran Pavic
29-
* @see <a href="http://blog.btmatthews.com/?p=40#comment-33797">Inject application
30-
* context dependencies in Quartz job beans</a>
3129
*/
3230
class AutowireCapableBeanJobFactory extends SpringBeanJobFactory {
3331

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,8 @@ static class ClientRegistrationRepositoryConfiguration {
183183
@Bean
184184
public ClientRegistrationRepository clientRegistrationRepository() {
185185
List<ClientRegistration> registrations = new ArrayList<>();
186-
registrations.add(getClientRegistration("first", "https://user-info-uri.com"));
186+
registrations
187+
.add(getClientRegistration("first", "https://user-info-uri.com"));
187188
registrations.add(getClientRegistration("second", "http://other-user-info"));
188189
return new InMemoryClientRegistrationRepository(registrations);
189190
}

spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,6 @@ following alternatives:
330330

331331
* https://maven.apache.org/plugins/maven-shade-plugin/[Maven Shade Plugin]
332332
* http://www.jdotsoft.com/JarClassLoader.php[JarClassLoader]
333-
* http://one-jar.sourceforge.net[OneJar]
333+
* https://sourceforge.net/projects/one-jar/[OneJar]
334334
* https://imperceptiblethoughts.com/shadow/[Gradle Shadow Plugin]
335335

spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,8 @@ example:
372372
Creating security group boxfuse-sg_axelfontaine/myapp:1.0 ...
373373
Launching t2.micro instance of axelfontaine/myapp:1.0 (ami-d23f38cf) in eu-central-1 ...
374374
Instance launched in 00:30.306s -> i-92ef9f53
375-
Waiting for AWS to boot Instance i-92ef9f53 and Payload to start at http://52.28.235.61/ ...
376-
Payload started in 00:29.266s -> http://52.28.235.61/
375+
Waiting for AWS to boot Instance i-92ef9f53 and Payload to start at https://52.28.235.61/ ...
376+
Payload started in 00:29.266s -> https://52.28.235.61/
377377
Remapping Elastic IP 52.28.233.167 to i-92ef9f53 ...
378378
Waiting 15s for AWS to complete Elastic IP Zero Downtime transition ...
379379
Deployment completed successfully. axelfontaine/myapp:1.0 is up and running at https://myapp-axelfontaine.boxfuse.io/

spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2922,9 +2922,10 @@ JAX-RS resources are packaged as nested jars, you may need to do the same.
29222922
[[boot-features-embedded-container]]
29232923
=== Embedded Servlet Container Support
29242924
Spring Boot includes support for embedded https://tomcat.apache.org/[Tomcat],
2925-
https://www.eclipse.org/jetty/[Jetty], and http://undertow.io/[Undertow] servers. Most
2926-
developers use the appropriate "`Starter`" to obtain a fully configured instance. By
2927-
default, the embedded server listens for HTTP requests on port `8080`.
2925+
https://www.eclipse.org/jetty/[Jetty], and
2926+
https://github.com/undertow-io/undertow[Undertow] servers. Most developers use the
2927+
appropriate "`Starter`" to obtain a fully configured instance. By default, the embedded
2928+
server listens for HTTP requests on port `8080`.
29282929

29292930
WARNING: If you choose to use Tomcat on https://www.centos.org/[CentOS], be aware that, by
29302931
default, a temporary directory is used to store compiled JSPs, file uploads, and so on.
@@ -5838,11 +5839,12 @@ property with a different value for each instance of your application.
58385839

58395840
[[boot-features-jta-narayana]]
58405841
=== Using a Narayana Transaction Manager
5841-
http://narayana.io/[Narayana] is a popular open source JTA transaction manager
5842-
implementation supported by JBoss. You can use the `spring-boot-starter-jta-narayana`
5843-
starter to add the appropriate Narayana dependencies to your project. As with Atomikos and
5844-
Bitronix, Spring Boot automatically configures Narayana and post-processes your beans to
5845-
ensure that startup and shutdown ordering is correct.
5842+
https://github.com/jbosstm/narayana[Narayana] is a popular open source JTA transaction
5843+
manager implementation supported by JBoss. You can use the
5844+
`spring-boot-starter-jta-narayana` starter to add the appropriate Narayana dependencies
5845+
to your project. As with Atomikos and Bitronix, Spring Boot automatically configures
5846+
Narayana and post-processes your beans to ensure that startup and shutdown ordering is
5847+
correct.
58465848

58475849
By default, Narayana transaction logs are written to a `transaction-logs` directory in
58485850
your application home directory (the directory in which your application jar file
@@ -6150,8 +6152,8 @@ the following provided libraries:
61506152
* {spring-reference}testing.html#integration-testing[Spring Test] & Spring Boot Test:
61516153
Utilities and integration test support for Spring Boot applications.
61526154
* https://joel-costigliola.github.io/assertj/[AssertJ]: A fluent assertion library.
6153-
* http://hamcrest.org/JavaHamcrest/[Hamcrest]: A library of matcher objects (also known
6154-
as constraints or predicates).
6155+
* https://github.com/hamcrest/JavaHamcrest[Hamcrest]: A library of matcher objects (also
6156+
known as constraints or predicates).
61556157
* https://mockito.github.io[Mockito]: A Java mocking framework.
61566158
* https://github.com/skyscreamer/JSONassert[JSONassert]: An assertion library for JSON.
61576159
* https://github.com/jayway/JsonPath[JsonPath]: XPath for JSON.

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void processListOfMaps() {
9999
OriginTrackedValue bar2 = getValue("example.foo[0].bar[1].bar2");
100100
assertThat(name.toString()).isEqualTo("springboot");
101101
assertThat(getLocation(name)).isEqualTo("22:15");
102-
assertThat(url.toString()).isEqualTo("http://www.springboot.com/");
102+
assertThat(url.toString()).isEqualTo("https://springboot.example.com/");
103103
assertThat(getLocation(url)).isEqualTo("23:14");
104104
assertThat(bar1.toString()).isEqualTo("baz");
105105
assertThat(getLocation(bar1)).isEqualTo("25:19");

spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-yaml.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ education: |
2020
example:
2121
foo:
2222
- name: springboot
23-
url: http://www.springboot.com/
23+
url: https://springboot.example.com/
2424
bar:
2525
- bar1: baz
2626
- bar2: bling

0 commit comments

Comments
 (0)