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 0b8bbab11a..b9c5462ca8 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 1b5c41cb6f..c84dd0c52c 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -47,7 +47,7 @@
 		<antlr2.version>2.7.7</antlr2.version>
 		<appengine.version>1.9.32</appengine.version>
 		<artemis.version>1.1.0</artemis.version>
-		<aspectj.version>1.8.8</aspectj.version>
+		<aspectj.version>1.8.9</aspectj.version>
 		<assertj.version>2.3.0</assertj.version>
 		<atomikos.version>3.9.3</atomikos.version>
 		<bitronix.version>2.1.4</bitronix.version>
@@ -80,13 +80,13 @@
 		<hazelcast.version>3.6</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>
 		<htmlunit.version>2.19</htmlunit.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.1.2.Final</infinispan.version>
 		<jackson.version>2.7.2</jackson.version>
@@ -96,7 +96,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.8.1</jedis.version>
@@ -107,7 +107,7 @@
 		<jna.version>4.2.2</jna.version>
 		<joda-time.version>2.9.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.3.0</jsonassert.version>
 		<json-path.version>2.1.0</json-path.version>
@@ -116,7 +116,7 @@
 		<junit.version>4.12</junit.version>
 		<liquibase.version>3.4.2</liquibase.version>
 		<log4j2.version>2.5</log4j2.version>
-		<logback.version>1.1.6</logback.version>
+		<logback.version>1.1.7</logback.version>
 		<lombok.version>1.16.8</lombok.version>
 		<mariadb.version>1.3.6</mariadb.version>
 		<mockito.version>1.10.19</mockito.version>
@@ -131,13 +131,13 @@
 		<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.17</snakeyaml.version>
 		<solr.version>5.5.0</solr.version>
 		<spock.version>1.0-groovy-2.4</spock.version>
 		<spring.version>4.3.0.BUILD-SNAPSHOT</spring.version>
 		<spring-amqp.version>1.6.0.M2</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>Hopper-RC1</spring-data-releasetrain.version>
 		<spring-hateoas.version>0.19.0.RELEASE</spring-hateoas.version>
@@ -147,8 +147,8 @@
 		<spring-plugin.version>1.2.0.RELEASE</spring-plugin.version>
 		<spring-restdocs.version>1.1.0.M1</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.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.1.0.RELEASE</spring-session.version>
 		<spring-shell.version>1.1.0.RELEASE</spring-shell.version>
@@ -166,8 +166,8 @@
 		<thymeleaf-layout-dialect.version>1.3.3</thymeleaf-layout-dialect.version>
 		<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
 		<thymeleaf-extras-java8time.version>2.1.0.RELEASE</thymeleaf-extras-java8time.version>
-		<tomcat.version>8.0.32</tomcat.version>
-		<undertow.version>1.3.19.Final</undertow.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>
 		<webjars-hal-browser.version>9f96c74</webjars-hal-browser.version>