Merge branch '1.1.x'

Conflicts:
	spring-boot-dependencies/pom.xml

spring-boot-dependencies/pom.xml

@@ -47,7 +47,7 @@
 		<spring-boot.version>1.2.0.BUILD-SNAPSHOT</spring-boot.version>
 		<!-- Third Party -->
 		<activemq.version>5.9.1</activemq.version>
-		<aspectj.version>1.8.1</aspectj.version>
+		<aspectj.version>1.8.2</aspectj.version>
 		<codahale-metrics.version>3.0.2</codahale-metrics.version>
 		<commons-beanutils.version>1.9.2</commons-beanutils.version>
 		<commons-collections.version>3.2.1</commons-collections.version>
@@ -63,14 +63,14 @@
 		<groovy.version>2.3.6</groovy.version>
 		<h2.version>1.3.176</h2.version>
 		<hamcrest.version>1.3</hamcrest.version>
-		<hibernate.version>4.3.5.Final</hibernate.version>
+		<hibernate.version>4.3.6.Final</hibernate.version>
 		<hibernate-entitymanager.version>${hibernate.version}</hibernate-entitymanager.version>
 		<hibernate-jpa-api.version>1.0.1.Final</hibernate-jpa-api.version>
 		<hibernate-validator.version>5.0.3.Final</hibernate-validator.version>
 		<hikaricp.version>1.4.0</hikaricp.version>
-		<httpclient.version>4.3.4</httpclient.version>
-		<httpasyncclient.version>4.0.1</httpasyncclient.version>
-		<hornetq.version>2.4.1.Final</hornetq.version>
+		<httpclient.version>4.3.5</httpclient.version>
+		<httpasyncclient.version>4.0.2</httpasyncclient.version>
+		<hornetq.version>2.4.3.Final</hornetq.version>
 		<hsqldb.version>2.3.2</hsqldb.version>
 		<jackson.version>2.4.2</jackson.version>
 		<janino.version>2.6.1</janino.version>
@@ -90,9 +90,10 @@
 		<log4j.version>1.2.17</log4j.version>
 		<logback.version>1.1.2</logback.version>
 		<mockito.version>1.9.5</mockito.version>
-		<mongodb.version>2.12.2</mongodb.version>
-		<mysql.version>5.1.31</mysql.version>
-		<reactor.version>1.1.2.RELEASE</reactor.version>
+		<mongodb.version>2.12.3</mongodb.version>
+		<mysql.version>5.1.32</mysql.version>
+		<reactor.version>1.1.4.RELEASE</reactor.version>
+		<reactor-spring.version>1.1.3.RELEASE</reactor-spring.version>
 		<servlet-api.version>3.0.1</servlet-api.version>
 		<slf4j.version>1.7.7</slf4j.version>
 		<snakeyaml.version>1.13</snakeyaml.version>
@@ -104,21 +105,21 @@
 		<spring-batch.version>3.0.1.RELEASE</spring-batch.version>
 		<spring-data-releasetrain.version>Dijkstra-SR3</spring-data-releasetrain.version>
 		<spring-hateoas.version>0.16.0.RELEASE</spring-hateoas.version>
-		<spring-integration.version>4.0.2.RELEASE</spring-integration.version>
+		<spring-integration.version>4.0.3.RELEASE</spring-integration.version>
 		<spring-loaded.version>1.2.0.RELEASE</spring-loaded.version>
 		<spring-mobile.version>1.1.2.RELEASE</spring-mobile.version>
 		<spring-social.version>1.1.0.RELEASE</spring-social.version>
 		<spring-social-facebook.version>1.1.1.RELEASE</spring-social-facebook.version>
 		<spring-social-twitter.version>1.1.0.RELEASE</spring-social-twitter.version>
 		<spring-social-linkedin.version>1.0.1.RELEASE</spring-social-linkedin.version>
-		<spring-security.version>3.2.4.RELEASE</spring-security.version>
+		<spring-security.version>3.2.5.RELEASE</spring-security.version>
 		<spring-security-jwt.version>1.0.2.RELEASE</spring-security-jwt.version>
 		<spring-ws.version>2.2.0.RELEASE</spring-ws.version>
 		<thymeleaf.version>2.1.3.RELEASE</thymeleaf.version>
 		<thymeleaf-extras-springsecurity3.version>2.1.1.RELEASE</thymeleaf-extras-springsecurity3.version>
 		<thymeleaf-layout-dialect.version>1.2.5</thymeleaf-layout-dialect.version>
 		<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
-		<tomcat.version>7.0.54</tomcat.version>
+		<tomcat.version>7.0.55</tomcat.version>
 		<velocity.version>1.7</velocity.version>
 		<velocity-tools.version>2.0</velocity-tools.version>
 		<wsdl4j.version>1.6.3</wsdl4j.version>
@@ -894,22 +895,22 @@
 			<dependency>
 				<groupId>org.projectreactor.spring</groupId>
 				<artifactId>reactor-spring-core</artifactId>
-				<version>${reactor.version}</version>
+				<version>${reactor-spring.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.projectreactor.spring</groupId>
 				<artifactId>reactor-spring-context</artifactId>
-				<version>${reactor.version}</version>
+				<version>${reactor-spring.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.projectreactor.spring</groupId>
 				<artifactId>reactor-spring-messaging</artifactId>
-				<version>${reactor.version}</version>
+				<version>${reactor-spring.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.projectreactor.spring</groupId>
 				<artifactId>reactor-spring-webmvc</artifactId>
-				<version>${reactor.version}</version>
+				<version>${reactor-spring.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.mockito</groupId>

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() {