diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index c2846598a6..adae60dcd4 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -47,7 +47,7 @@ 1.2.0.BUILD-SNAPSHOT 5.9.1 - 1.8.1 + 1.8.2 3.0.2 1.9.2 3.2.1 @@ -63,14 +63,14 @@ 2.3.6 1.3.176 1.3 - 4.3.5.Final + 4.3.6.Final ${hibernate.version} 1.0.1.Final 5.0.3.Final 1.4.0 - 4.3.4 - 4.0.1 - 2.4.1.Final + 4.3.5 + 4.0.2 + 2.4.3.Final 2.3.2 2.4.2 2.6.1 @@ -90,9 +90,10 @@ 1.2.17 1.1.2 1.9.5 - 2.12.2 - 5.1.31 - 1.1.2.RELEASE + 2.12.3 + 5.1.32 + 1.1.4.RELEASE + 1.1.3.RELEASE 3.0.1 1.7.7 1.13 @@ -104,21 +105,21 @@ 3.0.1.RELEASE Dijkstra-SR3 0.16.0.RELEASE - 4.0.2.RELEASE + 4.0.3.RELEASE 1.2.0.RELEASE 1.1.2.RELEASE 1.1.0.RELEASE 1.1.1.RELEASE 1.1.0.RELEASE 1.0.1.RELEASE - 3.2.4.RELEASE + 3.2.5.RELEASE 1.0.2.RELEASE 2.2.0.RELEASE 2.1.3.RELEASE 2.1.1.RELEASE 1.2.5 1.3 - 7.0.54 + 7.0.55 1.7 2.0 1.6.3 @@ -894,22 +895,22 @@ org.projectreactor.spring reactor-spring-core - ${reactor.version} + ${reactor-spring.version} org.projectreactor.spring reactor-spring-context - ${reactor.version} + ${reactor-spring.version} org.projectreactor.spring reactor-spring-messaging - ${reactor.version} + ${reactor-spring.version} org.projectreactor.spring reactor-spring-webmvc - ${reactor.version} + ${reactor-spring.version} org.mockito diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedContext.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedContext.java index 82c804540d..fb5c681f82 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedContext.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedContext.java @@ -34,7 +34,8 @@ class TomcatEmbeddedContext extends StandardContext { private ServletContextInitializerLifecycleListener starter; @Override - public void loadOnStartup(Container[] children) { + public boolean loadOnStartup(Container[] children) { + return true; } public void deferredLoadOnStartup() {