This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9d10586adf581eb33b84192d550c0f1d38869d1f Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon May 4 17:50:52 2020 +0100 Additional keys that change between 7.0.x and 8.5.x --- java/org/apache/tomcat/buildutil/translate/BackportEnglish.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java index 023aa3f..fb43d84 100644 --- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java +++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java @@ -36,7 +36,10 @@ public class BackportEnglish extends BackportBase { // Exclude keys known to be different between 9.0.x and 8.5.x keysToExclude.add("java.org.apache.catalina.manager.zzz.htmlManagerServlet.deployPath"); keysToExclude.add("java.org.apache.catalina.mbeans.zzz.jmxRemoteLifecycleListener.deprecated"); + keysToExclude.add("java.org.apache.catalina.session.zzz.managerBase.contextNull"); keysToExclude.add("java.org.apache.catalina.startup.zzz.catalina.stopServer.connectException"); + keysToExclude.add("java.org.apache.jasper.resources.zzz.jsp.error.jsproot.version.invalid"); + keysToExclude.add("java.org.apache.jasper.resources.zzz.jsp.tldCache.noTldInJar"); keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.usage"); keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webfrg.header"); keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webxml.header"); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org