Merge branch '1.5.x'

2016-12-13 13:02:59 +00:00
parent cea00f22b1 595679bed4
commit 5a4a7409c9
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointIntegrationTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointIntegrationTests.java
@@ -53,7 +53,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 * @author Dave Syer
 */
@RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(properties = "management.security.enabled=false")
 public class JolokiaMvcEndpointIntegrationTests {

 	@Autowired