From 8feaf1e92c32e3f3c6c08e19793e96d9a69a3be5 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 9 Dec 2015 10:39:22 +0000
Subject: [PATCH 1/9] Upgrade to Undertow 1.1.9.Final

Closes gh-4713
---
 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 565847cd3f..89dad1d031 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -135,7 +135,7 @@
 		<thymeleaf-layout-dialect.version>1.2.9</thymeleaf-layout-dialect.version>
 		<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
 		<tomcat.version>8.0.28</tomcat.version>
-		<undertow.version>1.1.8.Final</undertow.version>
+		<undertow.version>1.1.9.Final</undertow.version>
 		<velocity.version>1.7</velocity.version>
 		<velocity-tools.version>2.0</velocity-tools.version>
 		<wsdl4j.version>1.6.3</wsdl4j.version>

From 349794f9cfa883111f0a1a7eb1334c1fab850181 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 9 Dec 2015 10:40:01 +0000
Subject: [PATCH 2/9] Upgrade to mysql-connector-java 5.1.38

Closes gh-4714
---
 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 89dad1d031..9067050be9 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -102,7 +102,7 @@
 		<logback.version>1.1.3</logback.version>
 		<mockito.version>1.10.19</mockito.version>
 		<mongodb.version>2.12.5</mongodb.version>
-		<mysql.version>5.1.36</mysql.version>
+		<mysql.version>5.1.38</mysql.version>
 		<reactor.version>1.1.6.RELEASE</reactor.version>
 		<reactor-spring.version>1.1.3.RELEASE</reactor-spring.version>
 		<servlet-api.version>3.1.0</servlet-api.version>

From 70ead7113d816d2ee37e31e1c92cc58a0cbb0a35 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 9 Dec 2015 10:41:23 +0000
Subject: [PATCH 3/9] Upgrade to Jetty 9.2.14.v20151106

Closes gh-4716
---
 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 9067050be9..985693c0c2 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -88,7 +88,7 @@
 		<jdom2.version>2.0.6</jdom2.version>
 		<jedis.version>2.5.2</jedis.version>
 		<jersey.version>2.14</jersey.version>
-		<jetty.version>9.2.13.v20150730</jetty.version>
+		<jetty.version>9.2.14.v20151106</jetty.version>
 		<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
 		<jmustache.version>1.10</jmustache.version>
 		<joda-time.version>2.5</joda-time.version>

From e54f9063a86931580fa40841f52078b9994cc330 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 9 Dec 2015 10:41:50 +0000
Subject: [PATCH 4/9] Upgrade to SLF4J 1.7.13

Closes gh-4717
---
 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 985693c0c2..9da7dbbddc 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -107,7 +107,7 @@
 		<reactor-spring.version>1.1.3.RELEASE</reactor-spring.version>
 		<servlet-api.version>3.1.0</servlet-api.version>
 		<simple-json.version>1.1.1</simple-json.version>
-		<slf4j.version>1.7.12</slf4j.version>
+		<slf4j.version>1.7.13</slf4j.version>
 		<snakeyaml.version>1.14</snakeyaml.version>
 		<solr.version>4.7.2</solr.version>
 		<spock.version>0.7-groovy-2.0</spock.version>

From e50357d9079fe7f68b3eb3834a4ee163835dfe91 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 9 Dec 2015 10:42:12 +0000
Subject: [PATCH 5/9] Upgrade to Spring Loaded 1.2.5.RELEASE

Closes gh-4718
---
 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 9da7dbbddc..a6f8a1e68b 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -118,7 +118,7 @@
 		<spring-data-releasetrain.version>Evans-SR4</spring-data-releasetrain.version>
 		<spring-hateoas.version>0.16.0.RELEASE</spring-hateoas.version>
 		<spring-integration.version>4.1.6.RELEASE</spring-integration.version>
-		<spring-loaded.version>1.2.4.RELEASE</spring-loaded.version>
+		<spring-loaded.version>1.2.5.RELEASE</spring-loaded.version>
 		<spring-mobile.version>1.1.5.RELEASE</spring-mobile.version>
 		<spring-plugin.version>1.1.0.RELEASE</spring-plugin.version>
 		<spring-security.version>3.2.8.RELEASE</spring-security.version>

From bb9e1be72cc238cf9ccaf25b0aa830fe9f76b789 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 9 Dec 2015 10:42:36 +0000
Subject: [PATCH 6/9] Upgrade to Spring Integration 4.1.7.RELEASE

Closes gh-4719
---
 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 a6f8a1e68b..ddcd20b976 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -117,7 +117,7 @@
 		<spring-batch.version>3.0.5.RELEASE</spring-batch.version>
 		<spring-data-releasetrain.version>Evans-SR4</spring-data-releasetrain.version>
 		<spring-hateoas.version>0.16.0.RELEASE</spring-hateoas.version>
-		<spring-integration.version>4.1.6.RELEASE</spring-integration.version>
+		<spring-integration.version>4.1.7.RELEASE</spring-integration.version>
 		<spring-loaded.version>1.2.5.RELEASE</spring-loaded.version>
 		<spring-mobile.version>1.1.5.RELEASE</spring-mobile.version>
 		<spring-plugin.version>1.1.0.RELEASE</spring-plugin.version>

From 85bb1780d8076ec2e2e9e18633bd68c336be3323 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 9 Dec 2015 10:42:57 +0000
Subject: [PATCH 7/9] Upgrade to Spring Web Services 2.2.3.RELEASE

Closes gh-4720
---
 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 ddcd20b976..e8cc2862d0 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -127,7 +127,7 @@
 		<spring-social-facebook.version>2.0.2.RELEASE</spring-social-facebook.version>
 		<spring-social-linkedin.version>1.0.2.RELEASE</spring-social-linkedin.version>
 		<spring-social-twitter.version>1.1.2.RELEASE</spring-social-twitter.version>
-		<spring-ws.version>2.2.2.RELEASE</spring-ws.version>
+		<spring-ws.version>2.2.3.RELEASE</spring-ws.version>
 		<sun-mail.version>${javax-mail.version}</sun-mail.version>
 		<thymeleaf.version>2.1.4.RELEASE</thymeleaf.version>
 		<thymeleaf-extras-springsecurity3.version>2.1.2.RELEASE</thymeleaf-extras-springsecurity3.version>

From b10b7a883df73e143c37a422599045a2884d4e2d Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 9 Dec 2015 10:43:32 +0000
Subject: [PATCH 8/9] Upgrade to Spring Security 3.2.9.RELEASE

Closes gh-4721
---
 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 e8cc2862d0..ac59fd58b8 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -121,7 +121,7 @@
 		<spring-loaded.version>1.2.5.RELEASE</spring-loaded.version>
 		<spring-mobile.version>1.1.5.RELEASE</spring-mobile.version>
 		<spring-plugin.version>1.1.0.RELEASE</spring-plugin.version>
-		<spring-security.version>3.2.8.RELEASE</spring-security.version>
+		<spring-security.version>3.2.9.RELEASE</spring-security.version>
 		<spring-security-jwt.version>1.0.3.RELEASE</spring-security-jwt.version>
 		<spring-social.version>1.1.4.RELEASE</spring-social.version>
 		<spring-social-facebook.version>2.0.2.RELEASE</spring-social-facebook.version>

From ae6971a61a9ac07c83d7670893d86006cff64613 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 9 Dec 2015 11:51:47 +0000
Subject: [PATCH 9/9] Upgrade to Tomcat 8.0.30 and continue to use absolute
 redirects

Tomcat 8.0.30 has changed to using relative URIs in its redirects
by default. To avoid any problems that this behaviour change may
causes we override the default and configure Tomcat to continue to
use absolute URIs.

Closes gh-4715
---
 spring-boot-dependencies/pom.xml                            | 2 +-
 .../tomcat/TomcatEmbeddedServletContainerFactory.java       | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index ac59fd58b8..265c7f7da4 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -134,7 +134,7 @@
 		<thymeleaf-extras-conditionalcomments.version>2.1.1.RELEASE</thymeleaf-extras-conditionalcomments.version>
 		<thymeleaf-layout-dialect.version>1.2.9</thymeleaf-layout-dialect.version>
 		<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
-		<tomcat.version>8.0.28</tomcat.version>
+		<tomcat.version>8.0.30</tomcat.version>
 		<undertow.version>1.1.9.Final</undertow.version>
 		<velocity.version>1.7</velocity.version>
 		<velocity-tools.version>2.0</velocity-tools.version>
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
index 97cf09c9d1..363f8b2aee 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
@@ -167,6 +167,12 @@ public class TomcatEmbeddedServletContainerFactory
 		context.setParentClassLoader(
 				this.resourceLoader != null ? this.resourceLoader.getClassLoader()
 						: ClassUtils.getDefaultClassLoader());
+		try {
+			context.setUseRelativeRedirects(false);
+		}
+		catch (NoSuchMethodError ex) {
+			// Tomcat is < 8.0.30. Continue
+		}
 		SkipPatternJarScanner.apply(context, this.tldSkip);
 		WebappLoader loader = new WebappLoader(context.getParentClassLoader());
 		loader.setLoaderClass(TomcatEmbeddedWebappClassLoader.class.getName());