Merge branch '2.0.x'

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerYamlProfileNegationTests.java

@@ -94,7 +94,7 @@ public class ConfigFileApplicationListenerYamlProfileNegationTests {
 		application.setWebApplicationType(WebApplicationType.NONE);
 		String configName = "--spring.config.name=cascadingprofiles";
 		this.context = application.run(configName);
-		assertVersionProperty(this.context, "E", "D", "C", "E", "A", "B");
+		assertVersionProperty(this.context, "E", "A", "B", "C", "E", "D");
 		assertThat(this.context.getEnvironment().getProperty("not-a")).isNull();
 		assertThat(this.context.getEnvironment().getProperty("not-b")).isNull();
 		assertThat(this.context.getEnvironment().getProperty("not-c")).isNull();
@@ -108,7 +108,7 @@ public class ConfigFileApplicationListenerYamlProfileNegationTests {
 		application.setWebApplicationType(WebApplicationType.NONE);
 		String configName = "--spring.config.name=cascadingprofiles";
 		this.context = application.run(configName, "--spring.profiles.active=A");
-		assertVersionProperty(this.context, "E", "C", "E", "A");
+		assertVersionProperty(this.context, "E", "A", "C", "E");
 		assertThat(this.context.getEnvironment().getProperty("not-a")).isNull();
 		assertThat(this.context.getEnvironment().getProperty("not-b")).isEqualTo("true");
 		assertThat(this.context.getEnvironment().getProperty("not-c")).isNull();
@@ -122,7 +122,7 @@ public class ConfigFileApplicationListenerYamlProfileNegationTests {
 		application.setWebApplicationType(WebApplicationType.NONE);
 		String configName = "--spring.config.name=cascadingprofiles";
 		this.context = application.run(configName, "--spring.profiles.active=B");
-		assertVersionProperty(this.context, "E", "D", "E", "B");
+		assertVersionProperty(this.context, "E", "B", "D", "E");
 		assertThat(this.context.getEnvironment().getProperty("not-a")).isEqualTo("true");
 		assertThat(this.context.getEnvironment().getProperty("not-b")).isNull();
 		assertThat(this.context.getEnvironment().getProperty("not-c")).isEqualTo("true");