Merge branch '1.5.x'

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/NoSpringSecurityHealthMvcEndpointIntegrationTests.java

@@ -67,7 +67,7 @@ public class NoSpringSecurityHealthMvcEndpointIntegrationTests {
 	}
 
 	@Test
-	public void healthWhenRightRoleNotPresentShouldExposeHealthDetails()
+	public void healthWhenRightRoleNotPresentShouldNotExposeHealthDetails()
 			throws Exception {
 		this.context = new AnnotationConfigWebApplicationContext();
 		this.context.setServletContext(new MockServletContext());
@@ -76,7 +76,7 @@ public class NoSpringSecurityHealthMvcEndpointIntegrationTests {
 		MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(this.context).build();
 		mockMvc.perform(get("/health").with(getRequestPostProcessor()))
 				.andExpect(status().isOk())
-				.andExpect(content().string(containsString("\"status\":\"UP\"")));
+				.andExpect(content().string("{\"status\":\"UP\"}"));
 	}
 
 	@Test

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/NoSpringSecurityMvcEndpointSecurityInterceptorTests.java

@@ -23,14 +23,12 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
 import org.springframework.boot.junit.runner.classpath.ClassPathExclusions;
 import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner;
-import org.springframework.boot.test.rule.OutputCapture;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.web.method.HandlerMethod;
@@ -47,9 +45,6 @@ import static org.mockito.Mockito.mock;
 @ClassPathExclusions("spring-security-*.jar")
 public class NoSpringSecurityMvcEndpointSecurityInterceptorTests {
 
-	@Rule
-	public OutputCapture output = new OutputCapture();
-
 	private MvcEndpointSecurityInterceptor securityInterceptor;
 
 	private TestMvcEndpoint mvcEndpoint;

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

@@ -217,7 +217,7 @@ NOTE: `PropertiesLauncher` supports loading properties from
 |`loader.home`
 |Used to resolve relative paths in `loader.path`. E.g. `loader.path=lib` then
  `${loader.home}/lib` is a classpath location (along with all jar files in that
- directory). Also used to locate a `loader.properties file`. Example `file:///opt/app`
+ directory). Also used to locate a `loader.properties` file. Example `file:///opt/app`
  (defaults to `${user.dir}`).
 
 |`loader.args`

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

@@ -565,8 +565,8 @@ specified by the `spring.profiles.active` property are added after those configu
 the `SpringApplication` API and therefore take precedence.
 
 NOTE: If you have specified any files in `spring.config.location`, profile-specific
-variants of those files will not be considered. Use directories in`spring.config.location`
+variants of those files will not be considered. Use directories in
-if you also want to also use profile-specific properties.
+`spring.config.location` if you also want to also use profile-specific properties.
 
 
 
@@ -4117,7 +4117,7 @@ NOTE: Since a cache library may offer both a native implementation and JSR-107 s
 Spring Boot will prefer the JSR-107 support so that the same features are available if
 you switch to a different JSR-107 implementation.
 
-TIP: Spring Boot has a <<boot-features-hazelcast,general support for Hazelcast>>t. If
+TIP: Spring Boot has a <<boot-features-hazelcast,general support for Hazelcast>>. If
 a single `HazelcastInstance` is available, it is automatically reused for the
 `CacheManager` as well unless the `spring.cache.jcache.config` property is specified.