diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/AutowireCapableBeanJobFactory.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/AutowireCapableBeanJobFactory.java index 2f8dc6896c..74dffa928d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/AutowireCapableBeanJobFactory.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/AutowireCapableBeanJobFactory.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. @@ -26,8 +26,6 @@ import org.springframework.util.Assert; * Subclass of {@link SpringBeanJobFactory} that supports auto-wiring job beans. * * @author Vedran Pavic - * @see Inject application - * context dependencies in Quartz job beans */ class AutowireCapableBeanJobFactory extends SpringBeanJobFactory { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java index f3f2b49ef2..b4f78bbe20 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java @@ -183,7 +183,8 @@ public class OAuth2WebSecurityConfigurationTests { @Bean public ClientRegistrationRepository clientRegistrationRepository() { List registrations = new ArrayList<>(); - registrations.add(getClientRegistration("first", "https://user-info-uri.com")); + registrations + .add(getClientRegistration("first", "https://user-info-uri.com")); registrations.add(getClientRegistration("second", "http://other-user-info")); return new InMemoryClientRegistrationRepository(registrations); } diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc index 4b63e68fe0..9c03f7aa2a 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc @@ -330,6 +330,6 @@ following alternatives: * 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] * https://imperceptiblethoughts.com/shadow/[Gradle Shadow Plugin] diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc index 9adde705ab..281860b5c5 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc @@ -372,8 +372,8 @@ example: 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-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 12630181a5..02c63aaaf2 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -2922,9 +2922,10 @@ JAX-RS resources are packaged as nested jars, you may need to do the same. [[boot-features-embedded-container]] === Embedded Servlet Container Support Spring Boot includes support for embedded https://tomcat.apache.org/[Tomcat], -https://www.eclipse.org/jetty/[Jetty], and http://undertow.io/[Undertow] servers. Most -developers use the appropriate "`Starter`" to obtain a fully configured instance. By -default, the embedded server listens for HTTP requests on port `8080`. +https://www.eclipse.org/jetty/[Jetty], and +https://github.com/undertow-io/undertow[Undertow] servers. Most developers use the +appropriate "`Starter`" to obtain a fully configured instance. By default, the embedded +server listens for HTTP requests on port `8080`. WARNING: If you choose to use Tomcat on https://www.centos.org/[CentOS], be aware that, by 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. [[boot-features-jta-narayana]] === Using a Narayana Transaction Manager -http://narayana.io/[Narayana] is a popular open source JTA transaction manager -implementation supported by JBoss. You can use the `spring-boot-starter-jta-narayana` -starter to add the appropriate Narayana dependencies to your project. As with Atomikos and -Bitronix, Spring Boot automatically configures Narayana and post-processes your beans to -ensure that startup and shutdown ordering is correct. +https://github.com/jbosstm/narayana[Narayana] is a popular open source JTA transaction +manager implementation supported by JBoss. You can use the +`spring-boot-starter-jta-narayana` starter to add the appropriate Narayana dependencies +to your project. As with Atomikos and Bitronix, Spring Boot automatically configures +Narayana and post-processes your beans to ensure that startup and shutdown ordering is +correct. By default, Narayana transaction logs are written to a `transaction-logs` directory in your application home directory (the directory in which your application jar file @@ -6150,8 +6152,8 @@ the following provided libraries: * {spring-reference}testing.html#integration-testing[Spring Test] & Spring Boot Test: Utilities and integration test support for Spring Boot applications. * https://joel-costigliola.github.io/assertj/[AssertJ]: A fluent assertion library. -* http://hamcrest.org/JavaHamcrest/[Hamcrest]: A library of matcher objects (also known -as constraints or predicates). +* https://github.com/hamcrest/JavaHamcrest[Hamcrest]: A library of matcher objects (also +known as constraints or predicates). * https://mockito.github.io[Mockito]: A Java mocking framework. * https://github.com/skyscreamer/JSONassert[JSONassert]: An assertion library for JSON. * https://github.com/jayway/JsonPath[JsonPath]: XPath for JSON. diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java index 946e68bed5..6e117e0d12 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java @@ -99,7 +99,7 @@ public class OriginTrackedYamlLoaderTests { OriginTrackedValue bar2 = getValue("example.foo[0].bar[1].bar2"); assertThat(name.toString()).isEqualTo("springboot"); assertThat(getLocation(name)).isEqualTo("22:15"); - assertThat(url.toString()).isEqualTo("http://www.springboot.com/"); + assertThat(url.toString()).isEqualTo("https://springboot.example.com/"); assertThat(getLocation(url)).isEqualTo("23:14"); assertThat(bar1.toString()).isEqualTo("baz"); assertThat(getLocation(bar1)).isEqualTo("25:19"); diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-yaml.yml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-yaml.yml index e0217c13a2..1def7c53c4 100644 --- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-yaml.yml +++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-yaml.yml @@ -20,7 +20,7 @@ education: | example: foo: - name: springboot - url: http://www.springboot.com/ + url: https://springboot.example.com/ bar: - bar1: baz - bar2: bling