This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 18a133ba5f Add a couple of keys to back-port exclusion list
18a133ba5f is described below
commit 18a133ba5f8a6bd947fb50a9555b98f18c2d055f
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Jul 13 15:49:56 2022 +0100
Add a couple of keys to back-port exclusion list
---
java/org/apache/tomcat/buildutil/translate/BackportEnglish.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index 45faab3bb3..8548ae93ac 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -33,13 +33,15 @@ public class BackportEnglish extends BackportBase {
public static void main(String... args) throws IOException {
+ // Exclude keys known to be different between all versions
+
keysToExclude.add("java.org.apache.jasper.resources.zzz.jsp.error.jsproot.version.invalid");
+
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 9.0.x and 8.5.x
keysToExclude.add("java.org.apache.catalina.manager.zzz.htmlManagerServlet.deployPath");
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.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();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
