Merge branch '2.0.x'

8259c639 · Andy Wilkinson · 670aaf78 · ca329d3d · 8259c639
Commit 8259c639 authored Oct 06, 2018 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

WebApplicationType.java ...ain/java/org/springframework/boot/WebApplicationType.java +1 -1

No files found.
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/WebApplicationType.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/WebApplicationType.java
@@ -54,7 +54,7 @@ public enum WebApplicationType {
 	private static final String WEBFLUX_INDICATOR_CLASS = "org."
 			+ "springframework.web.reactive.DispatcherHandler";

-	private static final String JERSEY_INDICATOR_CLASS = "org.glassfish.jersey.server.ResourceConfig";
+	private static final String JERSEY_INDICATOR_CLASS = "org.glassfish.jersey.servlet.ServletContainer";

 	private static final String SERVLET_APPLICATION_CONTEXT_CLASS = "org.springframework.web.context.WebApplicationContext";