Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Phillip Webb
2016-12-19 12:36:57 -08:00
330 changed files with 554 additions and 47 deletions

View File

@@ -118,6 +118,7 @@ public class DevToolPropertiesIntegrationTests {
public MyBean myBean() {
return new MyBean();
}
}
static class MyBean {
@@ -132,4 +133,5 @@ public class DevToolPropertiesIntegrationTests {
}
}
}

View File

@@ -79,6 +79,7 @@ public class DevToolsHomePropertiesPostProcessorTests {
protected File getHomeFolder() {
return DevToolsHomePropertiesPostProcessorTests.this.home;
}
}
}