From abb8183d82caac0939b9d19be743bcaffbb6961e Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Sun, 24 Sep 2017 09:20:13 +0100
Subject: [PATCH 1/6] Upgrade to Gson 2.8.2

Closes gh-10393
---
 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 28a746f04f..b56e2d9a2c 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -79,7 +79,7 @@
 		<glassfish-el.version>3.0.0</glassfish-el.version>
 		<gradle.version>2.9</gradle.version>
 		<groovy.version>2.4.12</groovy.version>
-		<gson.version>2.8.1</gson.version>
+		<gson.version>2.8.2</gson.version>
 		<h2.version>1.4.196</h2.version>
 		<hamcrest.version>1.3</hamcrest.version>
 		<hazelcast.version>3.7.8</hazelcast.version>

From 29c84dff4ade7d92e25adb11977877d24a9a4b7c Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Sun, 24 Sep 2017 09:20:13 +0100
Subject: [PATCH 2/6] Upgrade to Httpcore 4.4.7

Closes gh-10394
---
 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 b56e2d9a2c..c76a345f90 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -94,7 +94,7 @@
 		<htmlunit.version>2.21</htmlunit.version>
 		<httpasyncclient.version>4.1.3</httpasyncclient.version>
 		<httpclient.version>4.5.3</httpclient.version>
-		<httpcore.version>4.4.6</httpcore.version>
+		<httpcore.version>4.4.7</httpcore.version>
 		<infinispan.version>8.2.8.Final</infinispan.version>
 		<jackson.version>2.8.10</jackson.version>
 		<janino.version>2.7.8</janino.version>

From f9c44b46b63d5c4f30bcb7c7c280802ad727cc4f Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Sun, 24 Sep 2017 09:20:14 +0100
Subject: [PATCH 3/6] Upgrade to Tomcat 8.5.21

Closes gh-10395
---
 spring-boot-dependencies/pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index c76a345f90..173be2ebaa 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.20</tomcat.version>
+		<tomcat.version>8.5.21</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>
@@ -1284,6 +1284,11 @@
 				<artifactId>tomcat-embed-websocket</artifactId>
 				<version>${tomcat.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.tomcat</groupId>
+				<artifactId>tomcat-annotations-api</artifactId>
+				<version>${tomcat.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.apache.tomcat</groupId>
 				<artifactId>tomcat-jdbc</artifactId>

From 2136bea4912ef250751ab158f708637d75766aab Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Sun, 24 Sep 2017 09:20:14 +0100
Subject: [PATCH 4/6] Upgrade to Jetty 9.4.7.v20170914

Closes gh-10396
---
 spring-boot-dependencies/pom.xml                       | 2 +-
 spring-boot-starters/spring-boot-starter-jetty/pom.xml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 173be2ebaa..054ea5513b 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -111,7 +111,7 @@
 		<jedis.version>2.9.0</jedis.version>
 		<jersey.version>2.25.1</jersey.version>
 		<jest.version>2.0.4</jest.version>
-		<jetty.version>9.4.6.v20170531</jetty.version>
+		<jetty.version>9.4.7.v20170914</jetty.version>
 		<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
 		<jetty-el.version>8.0.33</jetty-el.version>
 		<jms-api.version>1.1-rev-1</jms-api.version>
diff --git a/spring-boot-starters/spring-boot-starter-jetty/pom.xml b/spring-boot-starters/spring-boot-starter-jetty/pom.xml
index 181ba2c96a..fc907fe787 100644
--- a/spring-boot-starters/spring-boot-starter-jetty/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-jetty/pom.xml
@@ -39,6 +39,10 @@
 					<groupId>org.eclipse.jetty</groupId>
 					<artifactId>jetty-jndi</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>javax.websocket</groupId>
+					<artifactId>javax.websocket-client-api</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>

From cf92e5515098314e14fb62c9c6f32eb3a5d56e6e Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Sun, 24 Sep 2017 09:20:15 +0100
Subject: [PATCH 5/6] Upgrade to Spring Kafka 1.1.7.RELEASE

Closes gh-10397
---
 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 054ea5513b..a685dbd240 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -159,7 +159,7 @@
 		<spring-hateoas.version>0.23.0.RELEASE</spring-hateoas.version>
 		<spring-integration.version>4.3.12.RELEASE</spring-integration.version>
 		<spring-integration-java-dsl.version>1.2.3.RELEASE</spring-integration-java-dsl.version>
-		<spring-kafka.version>1.1.6.RELEASE</spring-kafka.version>
+		<spring-kafka.version>1.1.7.RELEASE</spring-kafka.version>
 		<spring-ldap.version>2.3.1.RELEASE</spring-ldap.version>
 		<spring-loaded.version>1.2.8.RELEASE</spring-loaded.version>
 		<spring-mobile.version>1.1.5.RELEASE</spring-mobile.version>

From 681921fd872a45b49aa37b45ba77c54a007012b5 Mon Sep 17 00:00:00 2001
From: dreis2211 <christoph.dreis@freenet.de>
Date: Sun, 24 Sep 2017 13:41:46 +0200
Subject: [PATCH 6/6] Typo in external config documentation

Closes gh-10411
---
 spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
index e4eb731bf9..00b5fc8c7e 100644
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -980,7 +980,7 @@ does not inject other beans from the context. Having said that, The
 `@EnableConfigurationProperties` annotation is _also_ automatically applied to your project
 so that any _existing_ bean annotated with `@ConfigurationProperties` will be configured
 from the `Environment`. You could shortcut `MyConfiguration` above by making sure
-`FooProperties` is a already a bean:
+`FooProperties` is already a bean:
 
 [source,java,indent=0]
 ----