This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 255f083e9b Exclude keys that are different between 10.1.x and 9.0.x
255f083e9b is described below
commit 255f083e9b79ea493718b5725753bebda79cedaf
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 4 15:22:21 2023 +0000
Exclude keys that are different between 10.1.x and 9.0.x
---
java/org/apache/tomcat/buildutil/translate/BackportEnglish.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index ec88b909da..d93885e203 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -38,6 +38,14 @@ public class BackportEnglish extends BackportBase {
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webfrg.header");
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webxml.header");
+ // Exclude keys known to be different between 10.1.x and 9.0.x
+ keysToExclude.add("java.javax.el.zzz.importHandler.invalidClass");
+ keysToExclude.add("java.javax.el.zzz.staticFieldELResolver.notFound");
+
keysToExclude.add("java.org.apache.catalina.connector.zzz.coyoteConnector.notAsciiSuperset");
+
keysToExclude.add("java.org.apache.catalina.loader.zzz.webappClassLoader.addExportsJavaIo");
+
keysToExclude.add("java.org.apache.catalina.loader.zzz.webappClassLoader.addExportsRmi");
+
keysToExclude.add("java.org.apache.catalina.loader.zzz.webappClassLoader.addExportsThreadLocal");
+
BackportEnglish backport = new BackportEnglish(args);
backport.execute();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
