diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointAutoConfigurationTests.java index 9c0b97f91f..b78d91a030 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointAutoConfigurationTests.java @@ -63,7 +63,8 @@ public class AuditEventsEndpointAutoConfigurationTests { this.contextRunner.withPropertyValues("endpoints.auditevents.enabled:false") .run((context) -> assertThat(context) .doesNotHaveBean(AuditEventsEndpoint.class) - .doesNotHaveBean(AuditEventsJmxEndpointExtension.class)); + .doesNotHaveBean(AuditEventsJmxEndpointExtension.class) + .doesNotHaveBean(AuditEventsWebEndpointExtension.class)); } } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointAutoConfigurationTests.java index 598871a5b8..d2ccd47a0f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointAutoConfigurationTests.java @@ -56,8 +56,10 @@ public class SessionsEndpointAutoConfigurationTests { @Test public void runWhenEnabledPropertyIsFalseShouldNotHaveEndpointOrExtensionBean() throws Exception { - this.contextRunner.withPropertyValues("endpoints.sessions.enabled:false").run( - (context) -> assertThat(context).doesNotHaveBean(SessionsEndpoint.class)); + this.contextRunner.withPropertyValues("endpoints.sessions.enabled:false") + .run((context) -> assertThat(context) + .doesNotHaveBean(SessionsEndpoint.class) + .doesNotHaveBean(SessionsWebEndpointExtension.class)); } @Configuration diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java index adcfbe1926..611c2aac0d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java @@ -36,7 +36,7 @@ import org.springframework.context.annotation.DependsOn; import org.springframework.context.annotation.Primary; /** - * {@link EnableAutoConfiguration Auto-Configuration} for Couchbase. + * {@link EnableAutoConfiguration Auto-configuration} for Couchbase. * * @author Eddú Meléndez * @author Stephane Nicoll diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java index 3bdaaeaed6..10f4851757 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java @@ -75,8 +75,7 @@ class LettuceConnectionConfiguration extends RedisConnectionConfiguration { @ConditionalOnMissingBean(RedisConnectionFactory.class) public LettuceConnectionFactory redisConnectionFactory( ClientResources clientResources) throws UnknownHostException { - LettuceClientConfiguration clientConfig; - clientConfig = getLettuceClientConfiguration(clientResources, + LettuceClientConfiguration clientConfig = getLettuceClientConfiguration(clientResources, this.properties.getLettuce().getPool()); return createLettuceConnectionFactory(clientConfig); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java index dd3d304d54..f597758f5e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java @@ -241,7 +241,7 @@ public class HibernateJpaAutoConfigurationTests } @Test - public void providerDisablesAutoCommitIsNotConfiguredWihJta() { + public void providerDisablesAutoCommitIsNotConfiguredWithJta() { contextRunner() .withConfiguration(AutoConfigurations.of(JtaAutoConfiguration.class)) .withPropertyValues( diff --git a/spring-boot-project/spring-boot-cli/src/main/content/INSTALL.txt b/spring-boot-project/spring-boot-cli/src/main/content/INSTALL.txt index 27e84acb1d..c914bcd4ff 100644 --- a/spring-boot-project/spring-boot-cli/src/main/content/INSTALL.txt +++ b/spring-boot-project/spring-boot-cli/src/main/content/INSTALL.txt @@ -16,13 +16,13 @@ version you should run: java -version -Alternatively, you can set the JAVA_HOME environment variable to point an suitable JDK. +Alternatively, you can set the JAVA_HOME environment variable to point a suitable JDK. Environment Variables --------------------- No specific environment variables are required to run the CLI, however, you may want to -set SPRING_HOME to point to a specific installation. You should also add SPRING_HOME/bin +set SPRING_HOME to point to a specific installation. You should also add SPRING_HOME/bin to your PATH environment variable. @@ -37,7 +37,7 @@ location for your environment. For example, something like: Checking Your Installation -------------------------- -To test if you have successfully install the CLI you can run the following command: +To test if you have successfully installed the CLI you can run the following command: spring --version diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index a6f2187dc3..72c3ef2313 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -1230,8 +1230,8 @@ content into your application; rather pick only the properties that you need. management.endpoints.cors.exposed-headers= # Comma-separated list of headers to include in a response. management.endpoints.cors.max-age=1800 # How long, in seconds, the response from a pre-flight request can be cached by clients. - # ENDPOINTS JMX CONFIGURATION ({sc-spring-boot-actuator}/autoconfigure/endpoint/ManagementEndpointProperties.{sc-ext}[JmxEndpointExporterProperties]) - management.endpoints.web.base-path # Base path for Web endpoints. Relative to server.context-path or management.server.context-path if management.server.port is configured. + # ENDPOINTS WEB CONFIGURATION ({sc-spring-boot-actuator-autoconfigure}/endpoint/web/WebEndpointProperties.{sc-ext}[WebEndpointProperties]) + management.endpoints.web.base-path=/application # Base path for Web endpoints. Relative to server.context-path or management.server.context-path if management.server.port is configured. # ENDPOINTS JMX CONFIGURATION ({sc-spring-boot-actuator-autoconfigure}/endpoint/jmx/JmxEndpointExporterProperties.{sc-ext}[JmxEndpointExporterProperties]) management.endpoints.jmx.domain=org.springframework.boot # Endpoints JMX domain name. Fallback to 'spring.jmx.default-domain' if set. 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 254aa63f42..a9794ed16b 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 @@ -41,7 +41,7 @@ developed>> in the "`Getting Started`" section up and running in the Cloud. === Cloud Foundry Cloud Foundry provides default buildpacks that come into play if no other buildpack is specified. The Cloud Foundry https://github.com/cloudfoundry/java-buildpack[Java buildpack] -has excellent support for Spring applications, including Spring Boot. You can deploy +has excellent support for Spring applications, including Spring Boot. You can deploy stand-alone executable jar applications, as well as traditional `.war` packaged applications. diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc index e67052396d..a410f95c5a 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc @@ -439,10 +439,10 @@ support it. [TIP] ==== The http://spring.io[spring.io] web site contains many "`Getting Started`" guides -that use Spring Boot. If you're looking to solve a specific problem; check there first. +that use Spring Boot. If you're looking to solve a specific problem, check there first. You can shortcut the steps below by going to https://start.spring.io and choosing the -`web` starter from the dependencies searcher. This will automatically generate a new +"Web" starter from the dependencies searcher. This will automatically generate a new project structure so that you can <>. Check the https://github.com/spring-io/initializr[documentation for more details]. @@ -527,7 +527,7 @@ This should give you a working build, you can test it out by running `mvn packag can ignore the "`jar will be empty - no content was marked for inclusion!`" warning for now). -NOTE: At this point you could import the project into an IDE (most modern Java IDE's +NOTE: At this point you could import the project into an IDE (most modern Java IDEs include built-in support for Maven). For simplicity, we will continue to use a plain text editor for this example. @@ -584,7 +584,6 @@ file named `src/main/java/Example.java`: ---- import org.springframework.boot.*; import org.springframework.boot.autoconfigure.*; - import org.springframework.stereotype.*; import org.springframework.web.bind.annotation.*; @RestController diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc index 894910f928..c8fc317a51 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc @@ -1251,7 +1251,7 @@ added. Check out {sc-spring-boot-autoconfigure}/web/servlet/WebMvcAutoConfiguration.{sc-ext}[`WebMvcAutoConfiguration`], {sc-spring-boot-autoconfigure}/thymeleaf/ThymeleafAutoConfiguration.{sc-ext}[`ThymeleafAutoConfiguration`], {sc-spring-boot-autoconfigure}/freemarker/FreeMarkerAutoConfiguration.{sc-ext}[`FreeMarkerAutoConfiguration`] and -{sc-spring-boot-autoconfigure}/groovy/template/GroovyTemplateAutoConfiguration.{sc-ext}[`GroovyTemplateAutoConfiguration`] +{sc-spring-boot-autoconfigure}/groovy/template/GroovyTemplateAutoConfiguration.{sc-ext}[`GroovyTemplateAutoConfiguration`]. diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/index.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/index.adoc index 06516449f0..168c945453 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/index.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/index.adoc @@ -52,7 +52,7 @@ Phillip Webb; Dave Syer; Josh Long; Stéphane Nicoll; Rob Winch; Andy Wilkinson; :propdeps-plugin: https://github.com/spring-projects/gradle-plugins/tree/master/propdeps-plugin :ant-manual: http://ant.apache.org/manual :code-examples: ../java/org/springframework/boot -:gradle-user-guide: https://docs.gradle.org/4.0.2/userguide +:gradle-user-guide: https://docs.gradle.org/4.2.1/userguide :hibernate-documentation: http://docs.jboss.org/hibernate/orm/5.2/userguide/html_single/Hibernate_User_Guide.html :jetty-documentation: https://www.eclipse.org/jetty/documentation/9.4.x :tomcat-documentation: https://tomcat.apache.org/tomcat-8.5-doc diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc index 72eb68c18d..95b4725cff 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc @@ -825,7 +825,7 @@ If you are using Jolokia but you don't want Spring Boot to configure it, simply [[production-ready-loggers]] == Loggers Spring Boot Actuator includes the ability to view and configure the log levels of your -application at runtime. You can view either the entire list or an individual logger's +application at runtime. You can view either the entire list or an individual logger's configuration which is made up of both the explicitly configured logging level as well as the effective logging level given to it by the logging framework. These levels can be: