Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

Browse Source 
Conflicts:
	spring-boot-samples/spring-boot-sample-tomcat-ssl/pom.xml
	spring-boot-samples/spring-boot-sample-tomcat-ssl/src/test/java/sample/tomcat/SampleTomcatSslApplicationTests.java
	spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java
	spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java
This commit is contained in:
Phillip Webb
2014-09-17 10:11:30 -07:00
parent 5946ade199 62a5ce52d0
commit 4f610fa5a1
6 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementSecurityAutoConfigurationTests.java
View File

@@ -74,7 +74,7 @@ public class ManagementSecurityAutoConfigurationTests {
this.context.refresh();
assertNotNull(this.context.getBean(AuthenticationManagerBuilder.class));
// 6 for static resources, one for management endpoints and one for the rest
assertEquals(9, this.context.getBean(FilterChainProxy.class).getFilterChains()
assertEquals(8, this.context.getBean(FilterChainProxy.class).getFilterChains()
.size());
}
@@ -144,7 +144,7 @@ public class ManagementSecurityAutoConfigurationTests {
this.context.refresh();
// Just the management endpoints (one filter) and ignores now plus the backup
// filter on app endpoints
assertEquals(9, this.context.getBean(FilterChainProxy.class).getFilterChains()
assertEquals(8, this.context.getBean(FilterChainProxy.class).getFilterChains()
.size());
}