Merge branch '1.5.x'

2017-06-16 09:13:42 +01:00
parent 573007166c 59122358d3
commit 991314c63d
36 changed files with 109 additions and 111 deletions
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java
@@ -150,8 +150,10 @@ public class SpringBootContextLoader extends AbstractContextLoader {

 	private void setActiveProfiles(ConfigurableEnvironment environment,
 			String[] profiles) {
-		TestPropertyValues.of("spring.profiles.active="
-				+ StringUtils.arrayToCommaDelimitedString(profiles)).applyTo(environment);
+		TestPropertyValues
+				.of("spring.profiles.active="
+						+ StringUtils.arrayToCommaDelimitedString(profiles))
+				.applyTo(environment);
 	}

 	protected String[] getInlinedProperties(MergedContextConfiguration config) {