From 3b0b65cafcdb36689d91f8544e62a5bc1b5fed2d Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 18 Jul 2016 13:05:19 -0700 Subject: [PATCH] Fix deprecation warning --- .../tomcat/TomcatEmbeddedServletContainerFactory.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java index 0ee888b4dd8..4c09b544b21 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java @@ -725,11 +725,12 @@ public class TomcatEmbeddedServletContainerFactory /** * {@link LifecycleListener} that stores an empty merged web.xml. This is critical for - * Jasper to prevent warnings about missing web.xml files and to enable EL. + * Jasper on Tomcat 7 to prevent warnings about missing web.xml files and to enable + * EL. */ private static class StoreMergedWebXmlListener implements LifecycleListener { - private final String MERGED_WEB_XML = org.apache.tomcat.util.scan.Constants.MERGED_WEB_XML; + private final String MERGED_WEB_XML = "org.apache.tomcat.util.scan.MergedWebXml"; @Override public void lifecycleEvent(LifecycleEvent event) {