Skip to content

S
spring-boot
Commit 8259c639 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '2.0.x'

parents 670aaf78 ca329d3d
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/WebApplicationType.java
View file @ 8259c639
...@@ -54,7 +54,7 @@ public enum WebApplicationType { ...@@ -54,7 +54,7 @@ public enum WebApplicationType {
private static final String WEBFLUX_INDICATOR_CLASS = "org." private static final String WEBFLUX_INDICATOR_CLASS = "org."
+ "springframework.web.reactive.DispatcherHandler"; + "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"; private static final String SERVLET_APPLICATION_CONTEXT_CLASS = "org.springframework.web.context.WebApplicationContext";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment