Merge branch '1.1.x'

c9186c45 · Andy Wilkinson · c37633d8 · c346e996 · c9186c45
Commit c9186c45 authored Jan 29, 2015 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

SampleIntegrationParentApplicationTests.java ...ent/consumer/SampleIntegrationParentApplicationTests.java +1 -1

No files found.
--- a/spring-boot-samples/spring-boot-sample-parent-context/src/test/java/sample/parent/consumer/SampleIntegrationParentApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-parent-context/src/test/java/sample/parent/consumer/SampleIntegrationParentApplicationTests.java
@@ -87,7 +87,7 @@ public class SampleIntegrationParentApplicationTests {

 	private Resource[] findResources() throws IOException {
 		return ResourcePatternUtils.getResourcePatternResolver(
-				new DefaultResourceLoader()).getResources("file:target/output/**");
+				new DefaultResourceLoader()).getResources("file:target/output/**/*.msg");
 	}

 	private String readResources(Resource[] resources) throws IOException {