From 88b15baf20b3e7d3d5eefd1f692cb4d7c436cafc Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@pivotal.io>
Date: Tue, 2 Jan 2018 16:06:45 +0100
Subject: [PATCH] Upgrade to Jetty 9.4.8.v20171121

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

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 19788d28b5..c72abe2c9f 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.7.v20170914</jetty.version>
+		<jetty.version>9.4.8.v20171121</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 76d9f98de8..8550433b2f 100644
--- a/spring-boot-starters/spring-boot-starter-jetty/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-jetty/pom.xml
@@ -63,6 +63,9 @@
 							<goal>check</goal>
 						</goals>
 						<configuration>
+							<ignoredClassPatterns>
+								<ignoredClassPattern>^module-info$</ignoredClassPattern>
+							</ignoredClassPatterns>
 							<ignoredResourcePatterns>
 								<ignoredResourcePattern>about.html</ignoredResourcePattern>
 							</ignoredResourcePatterns>
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
index 42407da616..1d8eabaeb4 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
@@ -382,6 +382,7 @@ public class JettyEmbeddedServletContainerFactoryTests
 			return null;
 		}
 		holder.start();
+		holder.initialize();
 		return (JspServlet) holder.getServlet();
 	}