From ffe21175ca720e40f33d9e02681b2d339dad17f3 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 5 Apr 2016 12:17:49 +0100
Subject: [PATCH 01/13] Upgrade to Logback 1.1.7

Closes gh-5568
---
 .../BackgroundPreinitializer.java             | 37 +++----------------
 spring-boot-dependencies/pom.xml              |  2 +-
 2 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java
index 0b8bbab11a1..b9c5462ca8f 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java
@@ -20,11 +20,9 @@ import javax.validation.Validation;
 
 import org.apache.catalina.mbeans.MBeanFactory;
 
-import org.springframework.boot.context.event.ApplicationStartedEvent;
+import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
 import org.springframework.boot.logging.LoggingApplicationListener;
-import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
-import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
 
@@ -37,21 +35,11 @@ import org.springframework.http.converter.support.AllEncompassingFormHttpMessage
  * @since 1.3.0
  */
 @Order(LoggingApplicationListener.DEFAULT_ORDER + 1)
-public class BackgroundPreinitializer implements ApplicationListener<ApplicationEvent> {
-
-	private volatile Thread initializationThread;
+public class BackgroundPreinitializer
+		implements ApplicationListener<ApplicationEnvironmentPreparedEvent> {
 
 	@Override
-	public void onApplicationEvent(ApplicationEvent event) {
-		if (event instanceof ApplicationStartedEvent) {
-			performInitialization();
-		}
-		else if (event instanceof ContextRefreshedEvent) {
-			awaitInitialization();
-		}
-	}
-
-	private void performInitialization() {
+	public void onApplicationEvent(ApplicationEnvironmentPreparedEvent event) {
 		try {
 			Thread thread = new Thread(new Runnable() {
 
@@ -73,7 +61,6 @@ public class BackgroundPreinitializer implements ApplicationListener<Application
 
 			}, "background-preinit");
 			thread.start();
-			this.initializationThread = thread;
 		}
 		catch (Exception ex) {
 			// This will fail on GAE where creating threads is prohibited. We can safely
@@ -82,21 +69,6 @@ public class BackgroundPreinitializer implements ApplicationListener<Application
 		}
 	}
 
-	private void awaitInitialization() {
-		Thread thread = this.initializationThread;
-		if (thread != null) {
-			try {
-				thread.join();
-			}
-			catch (InterruptedException ex) {
-				Thread.currentThread().interrupt();
-			}
-			finally {
-				this.initializationThread = null;
-			}
-		}
-	}
-
 	/**
 	 * Early initializer for Spring MessageConverters.
 	 */
@@ -132,4 +104,5 @@ public class BackgroundPreinitializer implements ApplicationListener<Application
 		}
 
 	}
+
 }
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index bab5e03f6db..87d8bce1614 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -112,7 +112,7 @@
 		<liquibase.version>3.4.2</liquibase.version>
 		<log4j.version>1.2.17</log4j.version>
 		<log4j2.version>2.4.1</log4j2.version>
-		<logback.version>1.1.6</logback.version>
+		<logback.version>1.1.7</logback.version>
 		<mariadb.version>1.2.3</mariadb.version>
 		<mockito.version>1.10.19</mockito.version>
 		<mongodb.version>2.13.3</mongodb.version>

From 810ce0ed5a9f19145ec974e367d160b1f63a4c54 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 5 Apr 2016 12:19:49 +0100
Subject: [PATCH 02/13] Upgrade to Jackson 2.6.6

Closes gh-5577
---
 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 87d8bce1614..e134e1cf084 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -86,7 +86,7 @@
 		<httpclient.version>4.5.1</httpclient.version>
 		<httpcore.version>4.4.4</httpcore.version>
 		<infinispan.version>8.0.2.Final</infinispan.version>
-		<jackson.version>2.6.5</jackson.version>
+		<jackson.version>2.6.6</jackson.version>
 		<janino.version>2.7.8</janino.version>
 		<javassist.version>3.18.1-GA</javassist.version> <!-- Same as Hibernate -->
 		<javax-cache.version>1.0.0</javax-cache.version>

From 20ba452eb213db15e3975d95eec0d441dd111e13 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 5 Apr 2016 12:20:19 +0100
Subject: [PATCH 03/13] Upgrade to HikariCP 2.4.5

Closes gh-5578
---
 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 e134e1cf084..f78e6deeb47 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -78,7 +78,7 @@
 		<hazelcast.version>3.5.5</hazelcast.version>
 		<hibernate.version>4.3.11.Final</hibernate.version>
 		<hibernate-validator.version>5.2.4.Final</hibernate-validator.version>
-		<hikaricp.version>2.4.3</hikaricp.version>
+		<hikaricp.version>2.4.5</hikaricp.version>
 		<hikaricp-java6.version>2.3.13</hikaricp-java6.version>
 		<hornetq.version>2.4.7.Final</hornetq.version>
 		<hsqldb.version>2.3.3</hsqldb.version>

From 36c572918ee2292b56d5fb52f910424c64a39c43 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 5 Apr 2016 12:20:49 +0100
Subject: [PATCH 04/13] Upgrade to Undertow 1.3.20.Final

Closes gh-5579
---
 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 f78e6deeb47..7a99d5745b5 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -157,7 +157,7 @@
 		<thymeleaf-layout-dialect.version>1.3.3</thymeleaf-layout-dialect.version>
 		<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
 		<tomcat.version>8.0.32</tomcat.version>
-		<undertow.version>1.3.19.Final</undertow.version>
+		<undertow.version>1.3.20.Final</undertow.version>
 		<velocity.version>1.7</velocity.version>
 		<velocity-tools.version>2.0</velocity-tools.version>
 		<webjars-hal-browser.version>9f96c74</webjars-hal-browser.version>

From f3b70e4641084ac58a7730a6d6ffa7d2158d45a2 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 5 Apr 2016 12:21:26 +0100
Subject: [PATCH 05/13] Upgrade to HTTP Client 4.5.2

Closes gh-5580
---
 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 7a99d5745b5..5d56ec020b0 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -83,7 +83,7 @@
 		<hornetq.version>2.4.7.Final</hornetq.version>
 		<hsqldb.version>2.3.3</hsqldb.version>
 		<httpasyncclient.version>4.1.1</httpasyncclient.version>
-		<httpclient.version>4.5.1</httpclient.version>
+		<httpclient.version>4.5.2</httpclient.version>
 		<httpcore.version>4.4.4</httpcore.version>
 		<infinispan.version>8.0.2.Final</infinispan.version>
 		<jackson.version>2.6.6</jackson.version>

From 1d8ff34eb03904e91dc64974d4822fc27b682b0e Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 5 Apr 2016 12:21:50 +0100
Subject: [PATCH 06/13] Upgrade to Tomcat 8.0.33

Closes gh-5581
---
 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 5d56ec020b0..c2088b7928b 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -156,7 +156,7 @@
 		<thymeleaf-extras-conditionalcomments.version>2.1.1.RELEASE</thymeleaf-extras-conditionalcomments.version>
 		<thymeleaf-layout-dialect.version>1.3.3</thymeleaf-layout-dialect.version>
 		<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
-		<tomcat.version>8.0.32</tomcat.version>
+		<tomcat.version>8.0.33</tomcat.version>
 		<undertow.version>1.3.20.Final</undertow.version>
 		<velocity.version>1.7</velocity.version>
 		<velocity-tools.version>2.0</velocity-tools.version>

From 41c1b290677cf5bff7d22b832f0dacf4cc7c0831 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 5 Apr 2016 12:22:11 +0100
Subject: [PATCH 07/13] Upgrade to AspectJ 1.8.9

Closes gh-5582
---
 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 c2088b7928b..dd0832c11c0 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -49,7 +49,7 @@
 		<activemq.version>5.12.3</activemq.version>
 		<antlr2.version>2.7.7</antlr2.version>
 		<artemis.version>1.1.0</artemis.version>
-		<aspectj.version>1.8.8</aspectj.version>
+		<aspectj.version>1.8.9</aspectj.version>
 		<atomikos.version>3.9.3</atomikos.version>
 		<bitronix.version>2.1.4</bitronix.version>
 		<cassandra-driver.version>2.1.9</cassandra-driver.version>

From a0420f5f7cb61e7142f08ced7fe70bc4c77ad909 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 5 Apr 2016 12:22:33 +0100
Subject: [PATCH 08/13] Upgrade to Jaybird 2.2.10

Closes gh-5583
---
 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 dd0832c11c0..f02fc330a38 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -93,7 +93,7 @@
 		<javax-mail.version>1.5.5</javax-mail.version>
 		<javax-transaction.version>1.2</javax-transaction.version>
 		<jaxen.version>1.1.6</jaxen.version>
-		<jaybird.version>2.2.9</jaybird.version>
+		<jaybird.version>2.2.10</jaybird.version>
 		<jboss-logging.version>3.3.0.Final</jboss-logging.version>
 		<jdom2.version>2.0.6</jdom2.version>
 		<jedis.version>2.7.3</jedis.version>

From c77659c2163b3c6b3764e6917f680b5be675e5fc Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 5 Apr 2016 12:22:57 +0100
Subject: [PATCH 09/13] Upgrade to jOOQ 3.7.3

Closes gh-5584
---
 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 f02fc330a38..9555d131756 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -103,7 +103,7 @@
 		<jmustache.version>1.11</jmustache.version>
 		<joda-time.version>2.8.2</joda-time.version>
 		<jolokia.version>1.3.3</jolokia.version>
-		<jooq.version>3.7.2</jooq.version>
+		<jooq.version>3.7.3</jooq.version>
 		<json.version>20140107</json.version>
 		<jsonassert.version>1.2.3</jsonassert.version>
 		<json-path.version>2.0.0</json-path.version>

From ada3155a80f8da6e1b61a84b382fbcf252245d33 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 5 Apr 2016 12:23:19 +0100
Subject: [PATCH 10/13] Upgrade to SLF4J 1.7.21

Closes gh-5585
---
 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 9555d131756..00f820125d8 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -124,7 +124,7 @@
 		<sendgrid.version>2.2.2</sendgrid.version>
 		<servlet-api.version>3.1.0</servlet-api.version>
 		<simple-json.version>1.1.1</simple-json.version>
-		<slf4j.version>1.7.20</slf4j.version>
+		<slf4j.version>1.7.21</slf4j.version>
 		<snakeyaml.version>1.16</snakeyaml.version>
 		<solr.version>4.10.4</solr.version>
 		<spock.version>1.0-groovy-2.4</spock.version>

From 52e876a996b3d73332f7fa52ed101459d906ed53 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 5 Apr 2016 12:23:46 +0100
Subject: [PATCH 11/13] Upgrade to Spring Cloud Connectors 1.2.2.RELEASE

Closes gh-5586
---
 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 00f820125d8..250430eb763 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -130,7 +130,7 @@
 		<spock.version>1.0-groovy-2.4</spock.version>
 		<spring.version>4.2.5.RELEASE</spring.version>
 		<spring-amqp.version>1.5.5.RELEASE</spring-amqp.version>
-		<spring-cloud-connectors.version>1.2.1.RELEASE</spring-cloud-connectors.version>
+		<spring-cloud-connectors.version>1.2.2.RELEASE</spring-cloud-connectors.version>
 		<spring-batch.version>3.0.6.RELEASE</spring-batch.version>
 		<spring-data-releasetrain.version>Gosling-SR4</spring-data-releasetrain.version>
 		<spring-hateoas.version>0.19.0.RELEASE</spring-hateoas.version>

From 17aadc72ecee74e488b5d87cd6e171bcda5ca13c Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 5 Apr 2016 12:24:19 +0100
Subject: [PATCH 12/13] Upgrade to Spring Security JWT 1.0.4.RELEASE

Closes gh-5587
---
 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 250430eb763..d9ddd14a6df 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -141,7 +141,7 @@
 		<spring-restdocs.version>1.0.1.RELEASE</spring-restdocs.version>
 		<spring-retry.version>1.1.2.RELEASE</spring-retry.version>
 		<spring-security.version>4.0.3.RELEASE</spring-security.version>
-		<spring-security-jwt.version>1.0.3.RELEASE</spring-security-jwt.version>
+		<spring-security-jwt.version>1.0.4.RELEASE</spring-security-jwt.version>
 		<spring-security-oauth.version>2.0.9.RELEASE</spring-security-oauth.version>
 		<spring-session.version>1.0.2.RELEASE</spring-session.version>
 		<spring-social.version>1.1.4.RELEASE</spring-social.version>

From d138c1a61f584c0d5d7bc573c482b8ffb6be4fac Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 5 Apr 2016 12:24:40 +0100
Subject: [PATCH 13/13] Upgrade to Spring Security 4.0.4.RELEASE

Closes gh-5588
---
 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 d9ddd14a6df..4cb17ad934d 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -140,7 +140,7 @@
 		<spring-plugin.version>1.2.0.RELEASE</spring-plugin.version>
 		<spring-restdocs.version>1.0.1.RELEASE</spring-restdocs.version>
 		<spring-retry.version>1.1.2.RELEASE</spring-retry.version>
-		<spring-security.version>4.0.3.RELEASE</spring-security.version>
+		<spring-security.version>4.0.4.RELEASE</spring-security.version>
 		<spring-security-jwt.version>1.0.4.RELEASE</spring-security-jwt.version>
 		<spring-security-oauth.version>2.0.9.RELEASE</spring-security-oauth.version>
 		<spring-session.version>1.0.2.RELEASE</spring-session.version>