Merge branch '1.5.x'

spring-boot-project/spring-boot-dependencies/pom.xml

@@ -88,7 +88,7 @@
 		<jedis.version>2.9.0</jedis.version>
 		<jersey.version>2.26</jersey.version>
 		<jest.version>5.3.3</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.5.23</jetty-el.version>
 		<jmustache.version>1.13</jmustache.version>

spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/pom.xml

@@ -59,6 +59,9 @@
 							<goal>check</goal>
 						</goals>
 						<configuration>
+							<ignoredClassPatterns>
+								<ignoredClassPattern>^module-info$</ignoredClassPattern>
+							</ignoredClassPatterns>
 							<ignoredResourcePatterns>
 								<ignoredResourcePattern>about.html</ignoredResourcePattern>
 							</ignoredResourcePatterns>

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java

@@ -282,6 +282,7 @@ public class JettyServletWebServerFactoryTests
 			return null;
 		}
 		holder.start();
+		holder.initialize();
 		return (JspServlet) holder.getServlet();
 	}