From a6bb48a2f41699ecbf22c00927d6b832c4acb321 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 31 Jan 2018 17:29:55 +0000 Subject: [PATCH] Remove remaining references to no longer supported container versions Closes gh-11504 --- .../spring-boot-docs/src/main/asciidoc/getting-started.adoc | 2 +- .../boot/web/embedded/jetty/JettyServletWebServerFactory.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc index c0b4424670a..8761ebaa0b3 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc @@ -57,7 +57,7 @@ Spring Boot supports the following embedded servlet containers: |Jetty 9.4 |3.1 -|Undertow 1.3 +|Undertow 1.4 |3.1 |=== diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java index b519f31082a..2f7d44fe367 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java @@ -273,8 +273,6 @@ public class JettyServletWebServerFactory extends AbstractServletWebServerFactor root == null ? rootResource : new LoaderHidingResource(rootResource)); for (URL resourceJarUrl : this.getUrlsOfJarsWithMetaInfResources()) { Resource resource = createResource(resourceJarUrl); - // Jetty 9.2 and earlier do not support nested jars. See - // https://github.com/eclipse/jetty.project/issues/518 if (resource.exists() && resource.isDirectory()) { resources.add(resource); }