From 5c0ce4e514cb403690863fd00c652cc625d6af87 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Mon, 2 Oct 2017 15:31:04 +0100
Subject: [PATCH 1/5] Remove dependency management for non-existent
 dependencies

See gh-10475
See gh-10473
---
 spring-boot-dependencies/pom.xml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 7c3f568ce4..7273b5375c 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -1675,11 +1675,6 @@
 				<artifactId>jetty-deploy</artifactId>
 				<version>${jetty.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-home</artifactId>
-				<version>${jetty.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-hazelcast</artifactId>
@@ -1815,11 +1810,6 @@
 				<artifactId>cdi-core</artifactId>
 				<version>${jetty.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty.cdi</groupId>
-				<artifactId>cdi-full-servlet</artifactId>
-				<version>${jetty.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.eclipse.jetty.cdi</groupId>
 				<artifactId>cdi-servlet</artifactId>
@@ -2383,11 +2373,6 @@
 				<artifactId>slf4j-log4j12</artifactId>
 				<version>${slf4j.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-log4j13</artifactId>
-				<version>${slf4j.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-nop</artifactId>

From f32531b4e4485591b84b2f38ded33d12404ae6cf Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Mon, 2 Oct 2017 15:36:11 +0100
Subject: [PATCH 2/5] Upgrade to Appengine Sdk 1.9.57

Closes gh-10481
---
 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 7273b5375c..2dac8380bf 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -46,7 +46,7 @@
 		<!-- Dependency versions -->
 		<activemq.version>5.14.5</activemq.version>
 		<antlr2.version>2.7.7</antlr2.version>
-		<appengine-sdk.version>1.9.56</appengine-sdk.version>
+		<appengine-sdk.version>1.9.57</appengine-sdk.version>
 		<artemis.version>1.5.5</artemis.version>
 		<aspectj.version>1.8.10</aspectj.version>
 		<assertj.version>2.6.0</assertj.version>

From a0fa7822370b704448aae9af82708c545db9b8e6 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Mon, 2 Oct 2017 15:36:12 +0100
Subject: [PATCH 3/5] Upgrade to Tomcat 8.5.23

Closes gh-10482
---
 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 2dac8380bf..c471a673c0 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -184,7 +184,7 @@
 		<thymeleaf-layout-dialect.version>1.4.0</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.5.21</tomcat.version>
+		<tomcat.version>8.5.23</tomcat.version>
 		<undertow.version>1.4.20.Final</undertow.version>
 		<unboundid-ldapsdk.version>3.2.1</unboundid-ldapsdk.version>
 		<webjars-hal-browser.version>9f96c74</webjars-hal-browser.version>

From e9749765abe07ac60a53667efb8a564d3135f431 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Mon, 2 Oct 2017 15:36:13 +0100
Subject: [PATCH 4/5] Upgrade to Aspectj 1.8.11

Closes gh-10483
---
 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 c471a673c0..b1e9aced8a 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -48,7 +48,7 @@
 		<antlr2.version>2.7.7</antlr2.version>
 		<appengine-sdk.version>1.9.57</appengine-sdk.version>
 		<artemis.version>1.5.5</artemis.version>
-		<aspectj.version>1.8.10</aspectj.version>
+		<aspectj.version>1.8.11</aspectj.version>
 		<assertj.version>2.6.0</assertj.version>
 		<atomikos.version>3.9.3</atomikos.version>
 		<bitronix.version>2.1.4</bitronix.version>

From c1092f77f5e25c069b421077a8383b2298ca3a36 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Mon, 2 Oct 2017 15:36:13 +0100
Subject: [PATCH 5/5] Upgrade to Jooq 3.9.6

Closes gh-10484
---
 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 b1e9aced8a..1bf3ebe3bc 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -119,7 +119,7 @@
 		<jna.version>4.2.2</jna.version>
 		<joda-time.version>2.9.9</joda-time.version>
 		<jolokia.version>1.3.7</jolokia.version>
-		<jooq.version>3.9.5</jooq.version>
+		<jooq.version>3.9.6</jooq.version>
 		<json.version>20140107</json.version>
 		<jsonassert.version>1.4.0</jsonassert.version>
 		<json-path.version>2.2.0</json-path.version>