From 2668e152ffdfb75e1c8e4ff4b28058f0a4983655 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 19 Aug 2014 11:29:29 +0100
Subject: [PATCH 01/12] Upgrade to Hibernate 4.3.6

Closes #1389
---
 spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 403412f056..2312034c9e 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -63,7 +63,7 @@
 		<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>

From 28922474915cd6946c8573622ca5c8557512df43 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 19 Aug 2014 11:30:28 +0100
Subject: [PATCH 02/12] Upgrade to Spring Security 3.2.5

Closes #1398
---
 spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 2312034c9e..1152d66d15 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -109,7 +109,7 @@
 		<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>

From 58061bd852b10b7261e18faa5fefffe274aaba9a Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 19 Aug 2014 11:47:34 +0100
Subject: [PATCH 03/12] Upgrade to AspectJ 1.8.2

Closes #1399
---
 spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 1152d66d15..a4efcc7919 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -47,7 +47,7 @@
 		<spring-boot.version>1.1.6.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>

From 77147bfe5c37f1baf19e5daed15f6378c3b5ef95 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 19 Aug 2014 11:51:14 +0100
Subject: [PATCH 04/12] Upgrade to HornetQ 2.4.3.Final

Closes #1400
---
 spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index a4efcc7919..29db2c8752 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -70,7 +70,7 @@
 		<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>
+		<hornetq.version>2.4.3.Final</hornetq.version>
 		<hsqldb.version>2.3.2</hsqldb.version>
 		<jackson.version>2.3.3</jackson.version>
 		<janino.version>2.6.1</janino.version>

From e3769889f568f9a14b574ac57e366eb8fcf6cdc3 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 19 Aug 2014 11:52:04 +0100
Subject: [PATCH 05/12] Upgrade to mongo-java-driver 2.12.3

Closes #1401
---
 spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 29db2c8752..769b7d100f 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -89,7 +89,7 @@
 		<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>
+		<mongodb.version>2.12.3</mongodb.version>
 		<mysql.version>5.1.31</mysql.version>
 		<reactor.version>1.1.2.RELEASE</reactor.version>
 		<servlet-api.version>3.0.1</servlet-api.version>

From 0e3d49512f08dee2d476b1c8313299397bcce83f Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 19 Aug 2014 11:54:11 +0100
Subject: [PATCH 06/12] Upgrade to Reactor 1.1.4 and Reactor Spring 1.1.3

Closes #1402
Closes #1403
---
 spring-boot-dependencies/pom.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 769b7d100f..139bf32df8 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -91,7 +91,8 @@
 		<mockito.version>1.9.5</mockito.version>
 		<mongodb.version>2.12.3</mongodb.version>
 		<mysql.version>5.1.31</mysql.version>
-		<reactor.version>1.1.2.RELEASE</reactor.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>
@@ -881,22 +882,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>

From 601794c617e921f9d1fe0147643c54f5819abb8e Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 19 Aug 2014 11:55:09 +0100
Subject: [PATCH 07/12] Upgrade to Spring Integration 4.0.3

Closes #1404
---
 spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 139bf32df8..22bc952ec4 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -103,7 +103,7 @@
 		<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>

From c1d6e5e897484655de02435d4a4ad83a755f29c1 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 19 Aug 2014 11:55:32 +0100
Subject: [PATCH 08/12] Upgrade to Tomcat 7.0.55

Closes #1405
---
 spring-boot-dependencies/pom.xml                               | 2 +-
 .../boot/context/embedded/tomcat/TomcatEmbeddedContext.java    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 22bc952ec4..df03a76e3f 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -116,7 +116,7 @@
 		<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>
-		<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>
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() {

From 091776052252c6c11b7d8d89f00187733de48d9f Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 19 Aug 2014 11:56:36 +0100
Subject: [PATCH 09/12] Upgrade to Jackson 2.3.4

Closes #1406
---
 spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index df03a76e3f..f0e87ba302 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -72,7 +72,7 @@
 		<httpasyncclient.version>4.0.1</httpasyncclient.version>
 		<hornetq.version>2.4.3.Final</hornetq.version>
 		<hsqldb.version>2.3.2</hsqldb.version>
-		<jackson.version>2.3.3</jackson.version>
+		<jackson.version>2.3.4</jackson.version>
 		<janino.version>2.6.1</janino.version>
 		<javassist.version>3.18.1-GA</javassist.version> <!-- Same as Hibernate -->
 		<jedis.version>2.4.2</jedis.version>

From 0eaee3e83320839df018c307cfe789f9f93f7296 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 19 Aug 2014 11:57:12 +0100
Subject: [PATCH 10/12] Upgrade to mysql-connector-java 5.1.32

Closes #1407
---
 spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index f0e87ba302..dfa16ab9aa 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -90,7 +90,7 @@
 		<logback.version>1.1.2</logback.version>
 		<mockito.version>1.9.5</mockito.version>
 		<mongodb.version>2.12.3</mongodb.version>
-		<mysql.version>5.1.31</mysql.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>

From 7ea61f6d72048148ece1402b96afc3ab85363a13 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 19 Aug 2014 11:57:54 +0100
Subject: [PATCH 11/12] Upgrade to org.apache.httpcomponents:httpasyncclient
 4.0.2

Closes #1408
---
 spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index dfa16ab9aa..7d32c7a0a6 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -69,7 +69,7 @@
 		<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>
+		<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.3.4</jackson.version>

From fbd429c6c1743e105e27f59bb89a67d1cff2816e Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 19 Aug 2014 11:58:31 +0100
Subject: [PATCH 12/12] Upgrade to HTTP Client 4.3.5

Closes #1409
---
 spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 7d32c7a0a6..d766555356 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -68,7 +68,7 @@
 		<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>
+		<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>