[tomcat] branch main updated: Exclude keys from the backport that differ between 11.0.x and 10.1.x

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new 61af113c52 Exclude keys from the backport that differ between 11.0.x and 10.1.x
61af113c52 is described below

commit 61af113c52b86c468602a88111402daaadebdbf7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Feb 2 16:34:46 2023 +0000

    Exclude keys from the backport that differ between 11.0.x and 10.1.x
---
 java/org/apache/tomcat/buildutil/translate/BackportEnglish.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index ec88b909da..d5b64d9534 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -38,6 +38,10 @@ 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 11.0.x and 10.1.x
+        keysToExclude.add("java.org.apache.jasper.resources.zzz.jsp.error.param.invalidUse");
+        keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.usage");
+
         BackportEnglish backport = new BackportEnglish(args);
         backport.execute();
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org