You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/05/04 16:10:43 UTC
[tomcat] branch master updated: Skip backport of keys known to be
different
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new ca781b9 Skip backport of keys known to be different
ca781b9 is described below
commit ca781b943cff7d0a61820841145256db7d137d3b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon May 4 17:10:16 2020 +0100
Skip backport of keys known to be different
This list will expand once the new schemas are available
---
.../org/apache/tomcat/buildutil/translate/BackportEnglish.java | 10 +++++++++-
1 file changed, 9 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..739db0e 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,13 @@ 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 10.0.x and 9.0.x
+ keysToExclude.add("java.org.apache.catalina.connector.zzz.coyoteConnector.notAsciiSuperset");
+
BackportEnglish backport = new BackportEnglish(args);
backport.execute();
}
@@ -41,7 +49,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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org