Merge branch '1.5.x' into 2.0.x

This commit is contained in:
Andy Wilkinson
2018-11-23 20:15:26 +00:00

View File

@@ -570,18 +570,4 @@ public class ServletWebServerApplicationContextTests {
}
protected static class WithAutowiredServletContext {
private final ServletContext context;
public WithAutowiredServletContext(ServletContext context) {
this.context = context;
}
public ServletContext getContext() {
return this.context;
}
}
}