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 69801e6f17546911060f69076b4f2fdbc15bdd2e Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon May 4 17:10:16 2020 +0100 Skip backport of keys known to be different --- .../tomcat/buildutil/translate/BackportEnglish.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java index c6f9608..023aa3f 100644 --- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java +++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java @@ -17,6 +17,8 @@ package org.apache.tomcat.buildutil.translate; import java.io.IOException; +import java.util.HashSet; +import java.util.Set; /** * Generates a set of English property files to back-port updates to a previous @@ -27,7 +29,18 @@ import java.io.IOException; */ public class BackportEnglish extends BackportBase { + private static Set<String> keysToExclude = new HashSet<>(); + + public static void main(String... args) throws IOException { + // 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.startup.zzz.catalina.stopServer.connectException"); + 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"); + BackportEnglish backport = new BackportEnglish(args); backport.execute(); } @@ -41,7 +54,7 @@ public class BackportEnglish extends BackportBase { @Override protected void execute() throws IOException { for (Object key : sourceEnglish.keySet()) { - if (targetEnglish.containsKey(key)) { + if (targetEnglish.containsKey(key) && !keysToExclude.contains(key)) { targetEnglish.put(key, sourceEnglish.get(key)); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org