PR#167: Update in-tree tzdata to 2022e with JDK-8294357 & JDK-8295173 - rpms/java-11-openjdk

rpms / java-11-openjdk

#167 Update in-tree tzdata to 2022e with JDK-8294357 & JDK-8295173

Merged 2 years ago by ahughes. Opened 2 years ago by ahughes.

rpms/ ahughes/java-11-openjdk tzdata into rawhide

Update in-tree tzdata to 2022e with JDK-8294357 & JDK-8295173

Andrew Hughes • 2 years ago

749f2ea

TestTranslations.java

file modified

+114 -9

		`@@ -15,20 +15,125 @@`
		`along with this program. If not, see <http://www.gnu.org/licenses/>.`
		`*/`

		`+ import java.text.DateFormatSymbols;`
		`+`
		`+ import java.time.ZoneId;`
		`+ import java.time.format.TextStyle;`
		`+`
		`import java.util.Arrays;`
		`+ import java.util.Collections;`
		`+ import java.util.HashMap;`
		`+ import java.util.Map;`
		`import java.util.Locale;`
		`- import java.util.ResourceBundle;`
		`-`
		`- import sun.util.resources.LocaleData;`
		`- import sun.util.locale.provider.LocaleProviderAdapter;`
		`+ import java.util.Objects;`
		`+ import java.util.TimeZone;`

		`public class TestTranslations {`
		`+`
		`+ private static Map<Locale,String[]> KYIV;`
		`+`
		`+ static {`
		`+ Map<Locale,String[]> map = new HashMap<Locale,String[]>();`
		`+ map.put(Locale.US, new String[] { "Eastern European Standard Time", "GMT+02:00", "EET",`
		`+ "Eastern European Summer Time", "GMT+03:00", "EEST",`
		`+ "Eastern European Time", "GMT+02:00", "EET"});`
		`+ map.put(Locale.FRANCE, new String[] { "heure normale d\u2019Europe de l\u2019Est", "UTC+02:00", "EET",`
		`+ "heure d\u2019\u00e9t\u00e9 d\u2019Europe de l\u2019Est", "UTC+03:00", "EEST",`
		`+ "heure d\u2019Europe de l\u2019Est", "UTC+02:00", "EET"});`
		`+ map.put(Locale.GERMANY, new String[] { "Osteurop\u00e4ische Normalzeit", "OEZ", "OEZ",`
		`+ "Osteurop\u00e4ische Sommerzeit", "OESZ", "OESZ",`
		`+ "Osteurop\u00e4ische Zeit", "OEZ", "OEZ"});`
		`+ KYIV = Collections.unmodifiableMap(map);`
		`+ }`
		`+`
		`+`
		`public static void main(String[] args) {`
		`- for (String zone : args) {`
		`- System.out.printf("Translations for %s\n", zone);`
		`- for (Locale l : Locale.getAvailableLocales()) {`
		`- ResourceBundle bundle = new LocaleData(LocaleProviderAdapter.Type.JRE).getTimeZoneNames(l);`
		`- System.out.printf("Locale: %s, language: %s, translations: %s\n", l, l.getDisplayLanguage(), Arrays.toString(bundle.getStringArray(zone)));`
		`+ if (args.length < 1) {`
		`+ System.err.println("Test must be started with the name of the locale provider.");`
		`+ System.exit(1);`
		`+ }`
		`+`
		`+ String localeProvider = args[0];`
		`+ System.out.println("Checking sanity of full zone string set...");`
		`+ boolean invalid = Arrays.stream(Locale.getAvailableLocales())`
		`+ .peek(l -> System.out.println("Locale: " + l))`
		`+ .map(l -> DateFormatSymbols.getInstance(l).getZoneStrings())`
		`+ .flatMap(zs -> Arrays.stream(zs))`
		`+ .flatMap(names -> Arrays.stream(names))`
		`+ .filter(name -> Objects.isNull(name) \|\| name.isEmpty())`
		`+ .findAny()`
		`+ .isPresent();`
		`+ if (invalid) {`
		`+ System.err.println("Zone string for a locale returned null or empty string");`
		`+ System.exit(2);`
		`+ }`
		`+`
		`+ for (Locale l : KYIV.keySet()) {`
		`+ String[] expected = KYIV.get(l);`
		`+ for (String id : new String[] { "Europe/Kiev", "Europe/Kyiv", "Europe/Uzhgorod", "Europe/Zaporozhye" }) {`
		`+ String expectedShortStd = null;`
		`+ String expectedShortDST = null;`
		`+ String expectedShortGen = null;`
		`+`
		`+ System.out.printf("Checking locale %s for %s...\n", l, id);`
		`+`
		`+ if ("JRE".equals(localeProvider)) {`
		`+ expectedShortStd = expected[2];`
		`+ expectedShortDST = expected[5];`
		`+ expectedShortGen = expected[8];`
		`+ } else if ("CLDR".equals(localeProvider)) {`
		`+ expectedShortStd = expected[1];`
		`+ expectedShortDST = expected[4];`
		`+ expectedShortGen = expected[7];`
		`+ } else {`
		`+ System.err.printf("Invalid locale provider %s\n", localeProvider);`
		`+ System.exit(3);`
		`+ }`
		`+ System.out.printf("Locale Provider is %s, using short values %s, %s and %s\n",`
		`+ localeProvider, expectedShortStd, expectedShortDST, expectedShortGen);`
		`+`
		`+ String longStd = TimeZone.getTimeZone(id).getDisplayName(false, TimeZone.LONG, l);`
		`+ String shortStd = TimeZone.getTimeZone(id).getDisplayName(false, TimeZone.SHORT, l);`
		`+ String longDST = TimeZone.getTimeZone(id).getDisplayName(true, TimeZone.LONG, l);`
		`+ String shortDST = TimeZone.getTimeZone(id).getDisplayName(true, TimeZone.SHORT, l);`
		`+ String longGen = ZoneId.of(id).getDisplayName(TextStyle.FULL, l);`
		`+ String shortGen = ZoneId.of(id).getDisplayName(TextStyle.SHORT, l);`
		`+`
		`+ if (!expected[0].equals(longStd)) {`
		`+ System.err.printf("Long standard display name for %s in %s was %s, expected %s\n",`
		`+ id, l, longStd, expected[0]);`
		`+ System.exit(4);`
		`+ }`
		`+`
		`+ if (!expectedShortStd.equals(shortStd)) {`
		`+ System.err.printf("Short standard display name for %s in %s was %s, expected %s\n",`
		`+ id, l, shortStd, expectedShortStd);`
		`+ System.exit(5);`
		`+ }`
		`+`
		`+ if (!expected[3].equals(longDST)) {`
		`+ System.err.printf("Long DST display name for %s in %s was %s, expected %s\n",`
		`+ id, l, longDST, expected[3]);`
		`+ System.exit(6);`
		`+ }`
		`+`
		`+ if (!expectedShortDST.equals(shortDST)) {`
		`+ System.err.printf("Short DST display name for %s in %s was %s, expected %s\n",`
		`+ id, l, shortDST, expectedShortDST);`
		`+ System.exit(7);`
		`+ }`
		`+`
		`+ if (!expected[6].equals(longGen)) {`
		`+ System.err.printf("Long standard display name for %s in %s was %s, expected %s\n",`
		`+ id, l, longGen, expected[6]);`
		`+ System.exit(8);`
		`+ }`
		`+`
		`+ if (!expectedShortGen.equals(shortGen)) {`
		`+ System.err.printf("Short generic display name for %s in %s was %s, expected %s\n",`
		`+ id, l, shortGen, expectedShortGen);`
		`+ System.exit(9);`
		`+ }`
		`}`
		`}`
		`}`

java-11-openjdk.spec

file modified

+27 -16

		`@@ -378,7 +378,7 @@`
		`%global top_level_dir_name %{origin}`
		`%global top_level_dir_name_backup %{top_level_dir_name}-backup`
		`%global buildver 7`
		`- %global rpmrelease 1`
		`+ %global rpmrelease 2`
		`#%%global tagsuffix %%{nil}`
		`# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit`
		`%if %is_system_jdk`
		`@@ -1182,9 +1182,9 @@`
		`Requires: ca-certificates`
		`# Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros`
		`Requires: javapackages-filesystem`
		`- # Require zone-info data provided by tzdata-java sub-package`
		`- # 2022a required as of JDK-8283350 in 11.0.16`
		`- Requires: tzdata-java >= 2022a`
		`+ # 2022d required as of JDK-8294357`
		`+ # Should be bumped to 2022e once available (JDK-8295173)`
		`+ Requires: tzdata-java >= 2022d`
		`# for support of kernel stream control`
		# libsctp.so.1 is being `dlopen`ed on demand
		`Requires: lksctp-tools%{?_isa}`
		`@@ -1397,8 +1397,6 @@`
		`Patch600: rh1750419-redhat_alt_java.patch`
		`# RH1582504: Use RSA as default for keytool, as DSA is disabled in all crypto policies except LEGACY`
		`Patch1003: rh1842572-rsa_default_for_keytool.patch`
		`- # Add translations for Europe/Kyiv locally until upstream is fully updated for tzdata2022b`
		`- Patch4: jdk8292223-tzdata2022b-kyiv.patch`

		`# Crypto policy and FIPS support patches`
		`# Patch is generated from the fips tree at https://github.com/rh-openjdk/jdk11u/tree/fips`
		`@@ -1454,13 +1452,19 @@`

		`#############################################`
		`#`
		`- # Patches appearing in 11.0.15`
		`+ # Patches appearing in 11.0.18`
		`#`
		`# This section includes patches which are present`
		`# in the listed OpenJDK 11u release and should be`
		`# able to be removed once that release is out`
		`# and used by this RPM.`
		`#############################################`
		`+ # JDK-8293834: Update CLDR data following tzdata 2022c update`
		`+ Patch2001: jdk8293834-kyiv_cldr_update.patch`
		`+ # JDK-8294357: (tz) Update Timezone Data to 2022d`
		`+ Patch2002: jdk8294357-tzdata2022d.patch`
		`+ # JDK-8295173: (tz) Update Timezone Data to 2022e`
		`+ Patch2003: jdk8295173-tzdata2022e.patch`

		`BuildRequires: autoconf`
		`BuildRequires: automake`
		`@@ -1495,8 +1499,9 @@`
		`%ifarch %{zero_arches}`
		`BuildRequires: libffi-devel`
		`%endif`
		`- # 2022a required as of JDK-8283350 in 11.0.16`
		`- BuildRequires: tzdata-java >= 2022a`
		`+ # 2022d required as of JDK-8294357`
		`+ # Should be bumped to 2022e once available (JDK-8295173)`
		`+ BuildRequires: tzdata-java >= 2022d`
		`# Earlier versions have a bug in tree vectorization on PPC`
		`BuildRequires: gcc >= 4.8.3-8`

		`@@ -1875,11 +1880,14 @@`
		`%patch1 -p1`
		`%patch2 -p1`
		`%patch3 -p1`
		`- %patch4 -p1`
		`# Add crypto policy and FIPS support`
		`%patch1001 -p1`
		`# nss.cfg PKCS11 support; must come last as it also alters java.security`
		`%patch1000 -p1`
		`+ # tzdata updates targetted for 17.0.6`
		`+ %patch2001 -p1`
		`+ %patch2002 -p1`
		`+ %patch2003 -p1`
		`popd # openjdk`

		`%patch600`
		`@@ -2232,12 +2240,9 @@`
		`$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})\|sed "s\|\.java\|\|") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"`

		`# Check translations are available for new timezones`
		`- $JAVA_HOME/bin/javac --add-exports java.base/sun.util.resources=ALL-UNNAMED \`
		`- --add-exports java.base/sun.util.locale.provider=ALL-UNNAMED \`
		`- -d . %{SOURCE18}`
		`- $JAVA_HOME/bin/java --add-exports java.base/sun.util.resources=ALL-UNNAMED \`
		`- --add-exports java.base/sun.util.locale.provider=ALL-UNNAMED \`
		`- $(echo $(basename %{SOURCE18})\|sed "s\|\.java\|\|") "Europe/Kiev" "Europe/Kyiv"`
		`+ $JAVA_HOME/bin/javac -d . %{SOURCE18}`
		`+ $JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})\|sed "s\|\.java\|\|") JRE`
		`+ $JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})\|sed "s\|\.java\|\|") CLDR`

		`%if %{include_staticlibs}`
		`# Check debug symbols in static libraries (smoke test)`
		`@@ -2716,6 +2721,12 @@`
		`%endif`

		`%changelog`
		`+ * Sat Oct 15 2022 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.17.0.7-0.2.ea`
		`+ - Update in-tree tzdata to 2022e with JDK-8294357 & JDK-8295173`
		`+ - Update CLDR data with Europe/Kyiv (JDK-8293834)`
		`+ - Drop JDK-8292223 patch which we found to be unnecessary`
		`+ - Update TestTranslations.java to use public API based on TimeZoneNamesTest upstream`
		`+`
		`* Wed Oct 05 2022 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.17.0.7-0.1.ea`
		`- Update to jdk-11.0.17+7`
		`- Update release notes to 11.0.17+7`

jdk8292223-tzdata2022b-kyiv.patch

file removed

-132

		`@@ -1,132 +0,0 @@`
		`- diff --git a/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java b/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java`
		`- index 8759aab3995..11ccbf73839 100644`
		`- --- a/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java`
		`- +++ b/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java`
		`- @@ -847,6 +847,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {`
		`- {"Europe/Kirov", new String[] {"Kirov Standard Time", "GMT+03:00",`
		`- "Kirov Daylight Time", "GMT+03:00",`
		`- "Kirov Time", "GMT+03:00"}},`
		`- + {"Europe/Kyiv", EET},`
		`- {"Europe/Lisbon", WET},`
		`- {"Europe/Ljubljana", CET},`
		`- {"Europe/London", GMTBST},`
		`- diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java`
		`- index f007c1a8d3b..617268e4cf3 100644`
		`- --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java`
		`- +++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java`
		`- @@ -825,6 +825,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {`
		`- {"Europe/Jersey", GMTBST},`
		`- {"Europe/Kaliningrad", EET},`
		`- {"Europe/Kiev", EET},`
		`- + {"Europe/Kyiv", EET},`
		`- {"Europe/Lisbon", WET},`
		`- {"Europe/Ljubljana", CET},`
		`- {"Europe/London", GMTBST},`
		`- diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java`
		`- index 386414e16e6..14c5d89b9c5 100644`
		`- --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java`
		`- +++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java`
		`- @@ -825,6 +825,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {`
		`- {"Europe/Jersey", GMTBST},`
		`- {"Europe/Kaliningrad", EET},`
		`- {"Europe/Kiev", EET},`
		`- + {"Europe/Kyiv", EET},`
		`- {"Europe/Lisbon", WET},`
		`- {"Europe/Ljubljana", CET},`
		`- {"Europe/London", GMTBST},`
		`- diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java`
		`- index d23f5fd49e6..44117125619 100644`
		`- --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java`
		`- +++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java`
		`- @@ -825,6 +825,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {`
		`- {"Europe/Jersey", GMTBST},`
		`- {"Europe/Kaliningrad", EET},`
		`- {"Europe/Kiev", EET},`
		`- + {"Europe/Kyiv", EET},`
		`- {"Europe/Lisbon", WET},`
		`- {"Europe/Ljubljana", CET},`
		`- {"Europe/London", GMTBST},`
		`- diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java`
		`- index b4f57d4568c..efa818f3865 100644`
		`- --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java`
		`- +++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java`
		`- @@ -825,6 +825,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {`
		`- {"Europe/Jersey", GMTBST},`
		`- {"Europe/Kaliningrad", EET},`
		`- {"Europe/Kiev", EET},`
		`- + {"Europe/Kyiv", EET},`
		`- {"Europe/Lisbon", WET},`
		`- {"Europe/Ljubljana", CET},`
		`- {"Europe/London", GMTBST},`
		`- diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java`
		`- index 1a10a9f96dc..7c0565461ad 100644`
		`- --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java`
		`- +++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java`
		`- @@ -825,6 +825,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {`
		`- {"Europe/Jersey", GMTBST},`
		`- {"Europe/Kaliningrad", EET},`
		`- {"Europe/Kiev", EET},`
		`- + {"Europe/Kyiv", EET},`
		`- {"Europe/Lisbon", WET},`
		`- {"Europe/Ljubljana", CET},`
		`- {"Europe/London", GMTBST},`
		`- diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java`
		`- index 9a2d9e5c57c..8a2c805997f 100644`
		`- --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java`
		`- +++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java`
		`- @@ -825,6 +825,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {`
		`- {"Europe/Jersey", GMTBST},`
		`- {"Europe/Kaliningrad", EET},`
		`- {"Europe/Kiev", EET},`
		`- + {"Europe/Kyiv", EET},`
		`- {"Europe/Lisbon", WET},`
		`- {"Europe/Ljubljana", CET},`
		`- {"Europe/London", GMTBST},`
		`- diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java`
		`- index de5e5c82daa..e3c06417f09 100644`
		`- --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java`
		`- +++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java`
		`- @@ -825,6 +825,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {`
		`- {"Europe/Jersey", GMTBST},`
		`- {"Europe/Kaliningrad", EET},`
		`- {"Europe/Kiev", EET},`
		`- + {"Europe/Kyiv", EET},`
		`- {"Europe/Lisbon", WET},`
		`- {"Europe/Ljubljana", CET},`
		`- {"Europe/London", GMTBST},`
		`- diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java`
		`- index b53de4d8c89..3e46b6a063e 100644`
		`- --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java`
		`- +++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java`
		`- @@ -825,6 +825,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {`
		`- {"Europe/Jersey", GMTBST},`
		`- {"Europe/Kaliningrad", EET},`
		`- {"Europe/Kiev", EET},`
		`- + {"Europe/Kyiv", EET},`
		`- {"Europe/Lisbon", WET},`
		`- {"Europe/Ljubljana", CET},`
		`- {"Europe/London", GMTBST},`
		`- diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java`
		`- index 7797cda19d5..590908409a8 100644`
		`- --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java`
		`- +++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java`
		`- @@ -825,6 +825,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {`
		`- {"Europe/Jersey", GMTBST},`
		`- {"Europe/Kaliningrad", EET},`
		`- {"Europe/Kiev", EET},`
		`- + {"Europe/Kyiv", EET},`
		`- {"Europe/Lisbon", WET},`
		`- {"Europe/Ljubljana", CET},`
		`- {"Europe/London", GMTBST},`
		`- diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java`
		`- index 2cd10554853..23c5f180b6d 100644`
		`- --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java`
		`- +++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java`
		`- @@ -827,6 +827,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {`
		`- {"Europe/Jersey", GMTBST},`
		`- {"Europe/Kaliningrad", EET},`
		`- {"Europe/Kiev", EET},`
		`- + {"Europe/Kyiv", EET},`
		`- {"Europe/Lisbon", WET},`
		`- {"Europe/Ljubljana", CET},`
		`- {"Europe/London", GMTBST},`

jdk8293834-kyiv_cldr_update.patch

file added

+57

		`@@ -0,0 +1,57 @@`
		`+ commit 58ba3b61d276423cef1e1f52bd73c9706cc073fc`
		`+ Author: Andrew Hughes <gnu.andrew@redhat.com>`
		`+ Date: Sat Oct 15 05:37:36 2022 +0100`
		`+`
		`+ Backport e10231248fc100f9dfa08468ac897f60b843857f`
		`+`
		`+ diff --git a/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/bcp47/timezone.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/bcp47/timezone.xml`
		`+ index 35f8fc86efa..a9b635b4fa4 100644`
		`+ --- a/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/bcp47/timezone.xml`
		`+ +++ b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/bcp47/timezone.xml`
		`+ @@ -392,7 +392,7 @@ For terms of use, see http://www.unicode.org/copyright.html`
		`+ <type name="tvfun" description="Funafuti, Tuvalu" alias="Pacific/Funafuti"/>`
		`+ <type name="twtpe" description="Taipei, Taiwan" alias="Asia/Taipei ROC"/>`
		`+ <type name="tzdar" description="Dar es Salaam, Tanzania" alias="Africa/Dar_es_Salaam"/>`
		`+ - <type name="uaiev" description="Kiev, Ukraine" alias="Europe/Kiev"/>`
		`+ + <type name="uaiev" description="Kyiv, Ukraine" alias="Europe/Kiev Europe/Kyiv"/>`
		`+ <type name="uaozh" description="Zaporizhia (Zaporozhye), Ukraine" alias="Europe/Zaporozhye"/>`
		`+ <type name="uasip" description="Simferopol, Ukraine" alias="Europe/Simferopol"/>`
		`+ <type name="uauzh" description="Uzhhorod (Uzhgorod), Ukraine" alias="Europe/Uzhgorod"/>`
		`+ diff --git a/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java b/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java`
		`+ index c2b5672646c..53903d19d3d 100644`
		`+ --- a/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java`
		`+ +++ b/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java`
		`+ @@ -23,7 +23,7 @@`
		`+`
		`+ /*`
		`+ * @test`
		`+ - * @bug 8181157 8202537 8234347 8236548`
		`+ + * @bug 8181157 8202537 8234347 8236548 8293834`
		`+ * @modules jdk.localedata`
		`+ * @summary Checks CLDR time zone names are generated correctly at runtime`
		`+ * @run testng/othervm -Djava.locale.providers=CLDR TimeZoneNamesTest`
		`+ @@ -102,6 +102,24 @@ public class TimeZoneNamesTest {`
		`+ "UTC+04:00",`
		`+ "heure : Astrakhan",`
		`+ "UTC+04:00"},`
		`+ + {"Europe/Kyiv", Locale.US, "Eastern European Standard Time",`
		`+ + "GMT+02:00",`
		`+ + "Eastern European Summer Time",`
		`+ + "GMT+03:00",`
		`+ + "Eastern European Time",`
		`+ + "GMT+02:00"},`
		`+ + {"Europe/Kyiv", Locale.FRANCE, "heure normale d\u2019Europe de l\u2019Est",`
		`+ + "UTC+02:00",`
		`+ + "heure d\u2019\u00e9t\u00e9 d\u2019Europe de l\u2019Est",`
		`+ + "UTC+03:00",`
		`+ + "heure d\u2019Europe de l\u2019Est",`
		`+ + "UTC+02:00"},`
		`+ + {"Europe/Kyiv", Locale.GERMANY, "Osteurop\u00e4ische Normalzeit",`
		`+ + "OEZ",`
		`+ + "Osteurop\u00e4ische Sommerzeit",`
		`+ + "OESZ",`
		`+ + "Osteurop\u00e4ische Zeit",`
		`+ + "OEZ"},`
		`+ {"Europe/Saratov", Locale.US, "Saratov Standard Time",`
		`+ "GMT+04:00",`
		`+ "Saratov Daylight Time",`

jdk8294357-tzdata2022d.patch

file added

+304

		`@@ -0,0 +1,304 @@`
		`+ commit f67b4de8a07b8158be1dfb5b09cdb4cc5b7ac93b`
		`+ Author: David Alvarez <alvdavi@amazon.com>`
		`+ Date: Tue Oct 11 20:04:39 2022 +0000`
		`+`
		`+ 8294357: (tz) Update Timezone Data to 2022d`
		`+`
		`+ Reviewed-by: phh`
		`+ Backport-of: f01573368f905f27d26f1d07d9cfd26dcc736a54`
		`+`
		`+ diff --git a/make/data/tzdata/VERSION b/make/data/tzdata/VERSION`
		`+ index decb8716b22..889d0e6dad7 100644`
		`+ --- a/make/data/tzdata/VERSION`
		`+ +++ b/make/data/tzdata/VERSION`
		`+ @@ -21,4 +21,4 @@`
		`+ # or visit www.oracle.com if you need additional information or have any`
		`+ # questions.`
		`+ #`
		`+ -tzdata2022c`
		`+ +tzdata2022d`
		`+ diff --git a/make/data/tzdata/asia b/make/data/tzdata/asia`
		`+ index 3a150b0f36b..f9df7432947 100644`
		`+ --- a/make/data/tzdata/asia`
		`+ +++ b/make/data/tzdata/asia`
		`+ @@ -3398,10 +3398,6 @@ Zone Asia/Karachi 4:28:12 - LMT 1907`
		`+ # The winter time in 2015 started on October 23 at 01:00.`
		`+ # https://wafa.ps/ar_page.aspx?id=CgpCdYa670694628582aCgpCdY`
		`+ # http://www.palestinecabinet.gov.ps/portal/meeting/details/27583`
		`+ -#`
		`+ -# From Paul Eggert (2019-04-10):`
		`+ -# For now, guess spring-ahead transitions are at 00:00 on the Saturday`
		`+ -# preceding March's last Sunday (i.e., Sat>=24).`
		`+`
		`+ # From P Chan (2021-10-18):`
		`+ # http://wafa.ps/Pages/Details/34701`
		`+ @@ -3418,6 +3414,18 @@ Zone Asia/Karachi 4:28:12 - LMT 1907`
		`+ # From Heba Hamad (2022-03-10):`
		`+ # summer time will begin in Palestine from Sunday 03-27-2022, 00:00 AM.`
		`+`
		`+ +# From Heba Hamad (2022-08-30):`
		`+ +# winter time will begin in Palestine from Saturday 10-29, 02:00 AM by`
		`+ +# 60 minutes backwards. Also the state of Palestine adopted the summer`
		`+ +# and winter time for the years: 2023,2024,2025,2026 ...`
		`+ +# https://mm.icann.org/pipermail/tz/attachments/20220830/9f024566/Time-0001.pdf`
		`+ +# (2022-08-31): ... the Saturday before the last Sunday in March and October`
		`+ +# at 2:00 AM ,for the years from 2023 to 2026.`
		`+ +# (2022-09-05): https://mtit.pna.ps/Site/New/1453`
		`+ +#`
		`+ +# From Paul Eggert (2022-08-31):`
		`+ +# For now, assume that this rule will also be used after 2026.`
		`+ +`
		`+ # Rule NAME FROM TO - IN ON AT SAVE LETTER/S`
		`+ Rule EgyptAsia 1957 only - May 10 0:00 1:00 S`
		`+ Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 -`
		`+ @@ -3448,14 +3456,16 @@ Rule Palestine 2013 only - Sep 27 0:00 0 -`
		`+ Rule Palestine 2014 only - Oct 24 0:00 0 -`
		`+ Rule Palestine 2015 only - Mar 28 0:00 1:00 S`
		`+ Rule Palestine 2015 only - Oct 23 1:00 0 -`
		`+ -Rule Palestine 2016 2018 - Mar Sat>=24 1:00 1:00 S`
		`+ -Rule Palestine 2016 2018 - Oct Sat>=24 1:00 0 -`
		`+ +Rule Palestine 2016 2018 - Mar Sat<=30 1:00 1:00 S`
		`+ +Rule Palestine 2016 2018 - Oct Sat<=30 1:00 0 -`
		`+ Rule Palestine 2019 only - Mar 29 0:00 1:00 S`
		`+ -Rule Palestine 2019 only - Oct Sat>=24 0:00 0 -`
		`+ -Rule Palestine 2020 2021 - Mar Sat>=24 0:00 1:00 S`
		`+ +Rule Palestine 2019 only - Oct Sat<=30 0:00 0 -`
		`+ +Rule Palestine 2020 2021 - Mar Sat<=30 0:00 1:00 S`
		`+ Rule Palestine 2020 only - Oct 24 1:00 0 -`
		`+ -Rule Palestine 2021 max - Oct Fri>=23 1:00 0 -`
		`+ -Rule Palestine 2022 max - Mar Sun>=25 0:00 1:00 S`
		`+ +Rule Palestine 2021 only - Oct 29 1:00 0 -`
		`+ +Rule Palestine 2022 only - Mar 27 0:00 1:00 S`
		`+ +Rule Palestine 2022 max - Oct Sat<=30 2:00 0 -`
		`+ +Rule Palestine 2023 max - Mar Sat<=30 2:00 1:00 S`
		`+`
		`+ # Zone NAME STDOFF RULES FORMAT [UNTIL]`
		`+ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct`
		`+ diff --git a/make/data/tzdata/backward b/make/data/tzdata/backward`
		`+ index d4a29e8cf29..7765d99aedf 100644`
		`+ --- a/make/data/tzdata/backward`
		`+ +++ b/make/data/tzdata/backward`
		`+ @@ -113,6 +113,8 @@ Link Etc/UTC Etc/UCT`
		`+ Link Europe/London Europe/Belfast`
		`+ Link Europe/Kyiv Europe/Kiev`
		`+ Link Europe/Chisinau Europe/Tiraspol`
		`+ +Link Europe/Kyiv Europe/Uzhgorod`
		`+ +Link Europe/Kyiv Europe/Zaporozhye`
		`+ Link Europe/London GB`
		`+ Link Europe/London GB-Eire`
		`+ Link Etc/GMT GMT+0`
		`+ diff --git a/make/data/tzdata/europe b/make/data/tzdata/europe`
		`+ index 879b5337536..accc845dbaf 100644`
		`+ --- a/make/data/tzdata/europe`
		`+ +++ b/make/data/tzdata/europe`
		`+ @@ -2638,10 +2638,14 @@ Zone Europe/Simferopol 2:16:24 - LMT 1880`
		`+ # From Alexander Krivenyshev (2014-03-17):`
		`+ # time change at 2:00 (2am) on March 30, 2014`
		`+ # https://vz.ru/news/2014/3/17/677464.html`
		`+ -# From Paul Eggert (2014-03-30):`
		`+ -# Simferopol and Sevastopol reportedly changed their central town clocks`
		`+ -# late the previous day, but this appears to have been ceremonial`
		`+ -# and the discrepancies are small enough to not worry about.`
		`+ +# From Tim Parenti (2022-07-01), per Paul Eggert (2014-03-30):`
		`+ +# The clocks at the railway station in Simferopol were put forward from 22:00`
		`+ +# to 24:00 the previous day in a "symbolic ceremony"; however, per`
		`+ +# contemporaneous news reports, "ordinary Crimeans [made] the daylight savings`
		`+ +# time switch at 2am" on Sunday.`
		`+ +# https://www.business-standard.com/article/pti-stories/crimea-to-set-clocks-to-russia-time-114033000014_1.html`
		`+ +# https://www.reuters.com/article/us-ukraine-crisis-crimea-time/crimea-switches-to-moscow-time-amid-incorporation-frenzy-idUKBREA2S0LT20140329`
		`+ +# https://www.bbc.com/news/av/world-europe-26806583`
		`+ 2:00 EU EE%sT 2014 Mar 30 2:00`
		`+ 4:00 - MSK 2014 Oct 26 2:00s`
		`+ 3:00 - MSK`
		`+ @@ -3774,8 +3778,8 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.`
		`+ # US colleague David Cochrane) are still trying to get more`
		`+ # information upon these local deviations from Kiev rules.`
		`+ #`
		`+ -# From Paul Eggert (2022-02-08):`
		`+ -# For now, assume that Ukraine's other three zones followed the same rules,`
		`+ +# From Paul Eggert (2022-08-27):`
		`+ +# For now, assume that Ukraine's zones all followed the same rules,`
		`+ # except that Crimea switched to Moscow time in 1994 as described elsewhere.`
		`+`
		`+ # From Igor Karpov, who works for the Ukrainian Ministry of Justice,`
		`+ @@ -3845,21 +3849,7 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.`
		`+ # * Ukrainian Government's Resolution of 20.03.1992, No. 139.`
		`+ # http://www.uazakon.com/documents/date_8u/pg_grcasa.htm`
		`+`
		`+ -# From Paul Eggert (2022-04-12):`
		`+ -# As is usual in tzdb, Ukrainian zones use the most common English spellings.`
		`+ -# In particular, tzdb's name Europe/Kyiv uses the most common spelling in`
		`+ -# English for Ukraine's capital. Although tzdb's former name was Europe/Kiev,`
		`+ -# "Kyiv" is now more common due to widespread reporting of the current conflict.`
		`+ -# Conversely, tzdb continues to use the names Europe/Uzhgorod and`
		`+ -# Europe/Zaporozhye; this is similar to tzdb's use of Europe/Prague, which is`
		`+ -# certainly wrong as a transliteration of the Czech "Praha".`
		`+ -# English-language spelling of Ukrainian names is in flux, and`
		`+ -# some day "Uzhhorod" or "Zaporizhzhia" may become substantially more`
		`+ -# common in English; in the meantime, do not change these`
		`+ -# English spellings as that means less disruption for our users.`
		`+ -`
		`+ # Zone NAME STDOFF RULES FORMAT [UNTIL]`
		`+ -# This represents most of Ukraine. See above for the spelling of "Kyiv".`
		`+ Zone Europe/Kyiv 2:02:04 - LMT 1880`
		`+ 2:02:04 - KMT 1924 May 2 # Kyiv Mean Time`
		`+ 2:00 - EET 1930 Jun 21`
		`+ @@ -3869,34 +3859,6 @@ Zone Europe/Kyiv 2:02:04 - LMT 1880`
		`+ 2:00 1:00 EEST 1991 Sep 29 3:00`
		`+ 2:00 C-Eur EE%sT 1996 May 13`
		`+ 2:00 EU EE%sT`
		`+ -# Transcarpathia used CET 1990/1991.`
		`+ -# "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but`
		`+ -# "Uzhgorod" is more common in English.`
		`+ -Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct`
		`+ - 1:00 - CET 1940`
		`+ - 1:00 C-Eur CE%sT 1944 Oct`
		`+ - 1:00 1:00 CEST 1944 Oct 26`
		`+ - 1:00 - CET 1945 Jun 29`
		`+ - 3:00 Russia MSK/MSD 1990`
		`+ - 3:00 - MSK 1990 Jul 1 2:00`
		`+ - 1:00 - CET 1991 Mar 31 3:00`
		`+ - 2:00 - EET 1992 Mar 20`
		`+ - 2:00 C-Eur EE%sT 1996 May 13`
		`+ - 2:00 EU EE%sT`
		`+ -# Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.`
		`+ -# "Zaporizhzhia" is the transliteration of the Ukrainian name, but`
		`+ -# "Zaporozh'ye" is more common in English. Use the common English`
		`+ -# spelling, except omit the apostrophe as it is not allowed in`
		`+ -# portable Posix file names.`
		`+ -Zone Europe/Zaporozhye 2:20:40 - LMT 1880`
		`+ - 2:20 - +0220 1924 May 2`
		`+ - 2:00 - EET 1930 Jun 21`
		`+ - 3:00 - MSK 1941 Aug 25`
		`+ - 1:00 C-Eur CE%sT 1943 Oct 25`
		`+ - 3:00 Russia MSK/MSD 1991 Mar 31 2:00`
		`+ - 2:00 E-Eur EE%sT 1992 Mar 20`
		`+ - 2:00 C-Eur EE%sT 1996 May 13`
		`+ - 2:00 EU EE%sT`
		`+`
		`+ # Vatican City`
		`+ # See Europe/Rome.`
		`+ diff --git a/make/data/tzdata/southamerica b/make/data/tzdata/southamerica`
		`+ index 13ec081c7e0..3c0e0e2061c 100644`
		`+ --- a/make/data/tzdata/southamerica`
		`+ +++ b/make/data/tzdata/southamerica`
		`+ @@ -1332,8 +1332,14 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914`
		`+ # for America/Santiago will start on midnight of September 11th;`
		`+ # and will end on April 1st, 2023. Magallanes region (America/Punta_Arenas)`
		`+ # will keep UTC -3 "indefinitely"... This is because on September 4th`
		`+ -# we will have a voting whether to approve a new Constitution....`
		`+ -# https://www.interior.gob.cl/noticias/2022/08/09/comunicado-el-proximo-sabado-10-de-septiembre-los-relojes-se-deben-adelantar-una-hora/`
		`+ +# we will have a voting whether to approve a new Constitution.`
		`+ +#`
		`+ +# From Eduardo Romero Urra (2022-08-17):`
		`+ +# https://www.diariooficial.interior.gob.cl/publicaciones/2022/08/13/43327/01/2172567.pdf`
		`+ +#`
		`+ +# From Paul Eggert (2022-08-17):`
		`+ +# Although the presidential decree stops at fall 2026, assume that`
		`+ +# similar DST rules will continue thereafter.`
		`+`
		`+ # Rule NAME FROM TO - IN ON AT SAVE LETTER/S`
		`+ Rule Chile 1927 1931 - Sep 1 0:00 1:00 -`
		`+ diff --git a/make/data/tzdata/zone.tab b/make/data/tzdata/zone.tab`
		`+ index 51b65fa273c..ee025196e50 100644`
		`+ --- a/make/data/tzdata/zone.tab`
		`+ +++ b/make/data/tzdata/zone.tab`
		`+ @@ -424,8 +424,6 @@ TV -0831+17913 Pacific/Funafuti`
		`+ TW +2503+12130 Asia/Taipei`
		`+ TZ -0648+03917 Africa/Dar_es_Salaam`
		`+ UA +5026+03031 Europe/Kyiv Ukraine (most areas)`
		`+ -UA +4837+02218 Europe/Uzhgorod Transcarpathia`
		`+ -UA +4750+03510 Europe/Zaporozhye Zaporozhye and east Lugansk`
		`+ UG +0019+03225 Africa/Kampala`
		`+ UM +2813-17722 Pacific/Midway Midway Islands`
		`+ UM +1917+16637 Pacific/Wake Wake Island`
		`+ diff --git a/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java b/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java`
		`+ index bfe0dd3b548..1dc82561f23 100644`
		`+ --- a/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java`
		`+ +++ b/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java`
		`+ @@ -573,12 +573,8 @@ public final class ZoneInfoFile {`
		`+ // we can then pass in the dom = -1, dow > 0 into ZoneInfo`
		`+ //`
		`+ // hacking, assume the >=24 is the result of ZRB optimization for`
		`+ - // "last", it works for now. From tzdata2020d this hacking`
		`+ - // will not work for Asia/Gaza and Asia/Hebron which follow`
		`+ - // Palestine DST rules.`
		`+ - if (dom < 0 \|\| dom >= 24 &&`
		`+ - !(zoneId.equals("Asia/Gaza") \|\|`
		`+ - zoneId.equals("Asia/Hebron"))) {`
		`+ + // "last", it works for now.`
		`+ + if (dom < 0 \|\| dom >= 24) {`
		`+ params[1] = -1;`
		`+ params[2] = toCalendarDOW[dow];`
		`+ } else {`
		`+ @@ -600,7 +596,6 @@ public final class ZoneInfoFile {`
		`+ params[7] = 0;`
		`+ } else {`
		`+ // hacking: see comment above`
		`+ - // No need of hacking for Asia/Gaza and Asia/Hebron from tz2021e`
		`+ if (dom < 0 \|\| dom >= 24) {`
		`+ params[6] = -1;`
		`+ params[7] = toCalendarDOW[dow];`
		`+ diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION`
		`+ index c32bee39fba..71470168456 100644`
		`+ --- a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION`
		`+ +++ b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION`
		`+ @@ -1 +1 @@`
		`+ -tzdata2022c`
		`+ +tzdata2022d`
		`+ diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt b/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt`
		`+ index a5e6428a3f5..e3ce742f887 100644`
		`+ --- a/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt`
		`+ +++ b/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt`
		`+ @@ -183,6 +183,8 @@ Link Etc/UTC Etc/UCT`
		`+ Link Europe/London Europe/Belfast`
		`+ Link Europe/Kyiv Europe/Kiev`
		`+ Link Europe/Chisinau Europe/Tiraspol`
		`+ +Link Europe/Kyiv Europe/Uzhgorod`
		`+ +Link Europe/Kyiv Europe/Zaporozhye`
		`+ Link Europe/London GB`
		`+ Link Europe/London GB-Eire`
		`+ Link Etc/GMT GMT+0`
		`+ diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt`
		`+ index fc148537f1f..b3823958ae4 100644`
		`+ --- a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt`
		`+ +++ b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt`
		`+ @@ -163,11 +163,9 @@ Europe/Simferopol MSK`
		`+ Europe/Sofia EET EEST`
		`+ Europe/Tallinn EET EEST`
		`+ Europe/Tirane CET CEST`
		`+ -Europe/Uzhgorod EET EEST`
		`+ Europe/Vienna CET CEST`
		`+ Europe/Vilnius EET EEST`
		`+ Europe/Warsaw CET CEST`
		`+ -Europe/Zaporozhye EET EEST`
		`+ Europe/Zurich CET CEST`
		`+ HST HST`
		`+ MET MET MEST`
		`+ diff --git a/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java b/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java`
		`+ index 7b50c342a0d..a7d14f1aa21 100644`
		`+ --- a/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java`
		`+ +++ b/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java`
		`+ @@ -176,11 +176,12 @@ public class TestZoneInfo310 {`
		`+ * save time in IANA tzdata. This bug is tracked via JDK-8223388.`
		`+ *`
		`+ * These are the zones/rules that employ negative DST in vanguard`
		`+ - * format (as of 2019a):`
		`+ + * format (as of 2019a), Palestine added in 2022d:`
		`+ *`
		`+ * - Rule "Eire"`
		`+ * - Rule "Morocco"`
		`+ * - Rule "Namibia"`
		`+ + * - Rule "Palestine"`
		`+ * - Zone "Europe/Prague"`
		`+ *`
		`+ * Tehran/Iran rule has rules beyond 2037, in which javazic assumes`
		`+ @@ -196,6 +197,8 @@ public class TestZoneInfo310 {`
		`+ zid.equals("Europe/Dublin") \|\| // uses "Eire" rule`
		`+ zid.equals("Europe/Prague") \|\|`
		`+ zid.equals("Asia/Tehran") \|\| // last rule mismatch`
		`+ + zid.equals("Asia/Gaza") \|\| // uses "Palestine" rule`
		`+ + zid.equals("Asia/Hebron") \|\| // uses "Palestine" rule`
		`+ zid.equals("Iran")) { // last rule mismatch`
		`+ continue;`
		`+ }`

jdk8295173-tzdata2022e.patch

file added

+420

		`@@ -0,0 +1,420 @@`
		`+ commit 826a9b80d7db0395308d9f8d5f23d5afc0756971`
		`+ Author: duke <duke@openjdk.org>`
		`+ Date: Fri Oct 14 20:26:41 2022 +0000`
		`+`
		`+ Backport 21407dec0156301871a83328615e4d975c4287c4`
		`+`
		`+ diff --git a/make/data/tzdata/VERSION b/make/data/tzdata/VERSION`
		`+ index 889d0e6dad7..b8cb36e69f4 100644`
		`+ --- a/make/data/tzdata/VERSION`
		`+ +++ b/make/data/tzdata/VERSION`
		`+ @@ -21,4 +21,4 @@`
		`+ # or visit www.oracle.com if you need additional information or have any`
		`+ # questions.`
		`+ #`
		`+ -tzdata2022d`
		`+ +tzdata2022e`
		`+ diff --git a/make/data/tzdata/asia b/make/data/tzdata/asia`
		`+ index f9df7432947..5b2337fd0b6 100644`
		`+ --- a/make/data/tzdata/asia`
		`+ +++ b/make/data/tzdata/asia`
		`+ @@ -2254,6 +2254,17 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 31 15:00u`
		`+ # From the Arabic version, it seems to say it would be at midnight`
		`+ # (assume 24:00) on the last Thursday in February, starting from 2022.`
		`+`
		`+ +# From Issam Al-Zuwairi (2022-10-05):`
		`+ +# The Council of Ministers in Jordan decided Wednesday 5th October 2022,`
		`+ +# that daylight saving time (DST) will be throughout the year....`
		`+ +#`
		`+ +# From Brian Inglis (2022-10-06):`
		`+ +# https://petra.gov.jo/Include/InnerPage.jsp?ID=45567&lang=en&name=en_news`
		`+ +#`
		`+ +# From Paul Eggert (2022-10-05):`
		`+ +# Like Syria, model this as a transition from EEST +03 (DST) to plain +03`
		`+ +# (non-DST) at the point where DST would otherwise have ended.`
		`+ +`
		`+ # Rule NAME FROM TO - IN ON AT SAVE LETTER/S`
		`+ Rule Jordan 1973 only - Jun 6 0:00 1:00 S`
		`+ Rule Jordan 1973 1975 - Oct 1 0:00 0 -`
		`+ @@ -2285,11 +2296,12 @@ Rule Jordan 2005 only - Sep lastFri 0:00s 0 -`
		`+ Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 -`
		`+ Rule Jordan 2013 only - Dec 20 0:00 0 -`
		`+ Rule Jordan 2014 2021 - Mar lastThu 24:00 1:00 S`
		`+ -Rule Jordan 2014 max - Oct lastFri 0:00s 0 -`
		`+ -Rule Jordan 2022 max - Feb lastThu 24:00 1:00 S`
		`+ +Rule Jordan 2014 2022 - Oct lastFri 0:00s 0 -`
		`+ +Rule Jordan 2022 only - Feb lastThu 24:00 1:00 S`
		`+ # Zone NAME STDOFF RULES FORMAT [UNTIL]`
		`+ Zone Asia/Amman 2:23:44 - LMT 1931`
		`+ - 2:00 Jordan EE%sT`
		`+ + 2:00 Jordan EE%sT 2022 Oct 28 0:00s`
		`+ + 3:00 - +03`
		`+`
		`+`
		`+ # Kazakhstan`
		`+ @@ -3838,19 +3850,27 @@ Rule Syria 2007 only - Nov Fri>=1 0:00 0 -`
		`+ # Our brief summary:`
		`+ # https://www.timeanddate.com/news/time/syria-dst-2012.html`
		`+`
		`+ -# From Arthur David Olson (2012-03-27):`
		`+ -# Assume last Friday in March going forward XXX.`
		`+ +# From Steffen Thorsen (2022-10-05):`
		`+ +# Syria is adopting year-round DST, starting this autumn....`
		`+ +# From https://www.enabbaladi.net/archives/607812`
		`+ +# "This [the decision] came after the weekly government meeting today,`
		`+ +# Tuesday 4 October ..."`
		`+ +#`
		`+ +# From Paul Eggert (2022-10-05):`
		`+ +# Like Jordan, model this as a transition from EEST +03 (DST) to plain +03`
		`+ +# (non-DST) at the point where DST would otherwise have ended.`
		`+`
		`+ Rule Syria 2008 only - Apr Fri>=1 0:00 1:00 S`
		`+ Rule Syria 2008 only - Nov 1 0:00 0 -`
		`+ Rule Syria 2009 only - Mar lastFri 0:00 1:00 S`
		`+ Rule Syria 2010 2011 - Apr Fri>=1 0:00 1:00 S`
		`+ -Rule Syria 2012 max - Mar lastFri 0:00 1:00 S`
		`+ -Rule Syria 2009 max - Oct lastFri 0:00 0 -`
		`+ +Rule Syria 2012 2022 - Mar lastFri 0:00 1:00 S`
		`+ +Rule Syria 2009 2022 - Oct lastFri 0:00 0 -`
		`+`
		`+ # Zone NAME STDOFF RULES FORMAT [UNTIL]`
		`+ Zone Asia/Damascus 2:25:12 - LMT 1920 # Dimashq`
		`+ - 2:00 Syria EE%sT`
		`+ + 2:00 Syria EE%sT 2022 Oct 28 0:00`
		`+ + 3:00 - +03`
		`+`
		`+ # Tajikistan`
		`+ # From Shanks & Pottenger.`
		`+ diff --git a/make/data/tzdata/europe b/make/data/tzdata/europe`
		`+ index accc845dbaf..2832c4b9763 100644`
		`+ --- a/make/data/tzdata/europe`
		`+ +++ b/make/data/tzdata/europe`
		`+ @@ -3417,7 +3417,7 @@ Zone Europe/Madrid -0:14:44 - LMT 1901 Jan 1 0:00u`
		`+ 0:00 Spain WE%sT 1940 Mar 16 23:00`
		`+ 1:00 Spain CE%sT 1979`
		`+ 1:00 EU CE%sT`
		`+ -Zone Africa/Ceuta -0:21:16 - LMT 1900 Dec 31 23:38:44`
		`+ +Zone Africa/Ceuta -0:21:16 - LMT 1901 Jan 1 0:00u`
		`+ 0:00 - WET 1918 May 6 23:00`
		`+ 0:00 1:00 WEST 1918 Oct 7 23:00`
		`+ 0:00 - WET 1924`
		`+ diff --git a/make/data/tzdata/northamerica b/make/data/tzdata/northamerica`
		`+ index 114cef14cce..ce4ee74582c 100644`
		`+ --- a/make/data/tzdata/northamerica`
		`+ +++ b/make/data/tzdata/northamerica`
		`+ @@ -462,7 +462,7 @@ Rule Chicago 1922 1966 - Apr lastSun 2:00 1:00 D`
		`+ Rule Chicago 1922 1954 - Sep lastSun 2:00 0 S`
		`+ Rule Chicago 1955 1966 - Oct lastSun 2:00 0 S`
		`+ # Zone NAME STDOFF RULES FORMAT [UNTIL]`
		`+ -Zone America/Chicago -5:50:36 - LMT 1883 Nov 18 12:09:24`
		`+ +Zone America/Chicago -5:50:36 - LMT 1883 Nov 18 18:00u`
		`+ -6:00 US C%sT 1920`
		`+ -6:00 Chicago C%sT 1936 Mar 1 2:00`
		`+ -5:00 - EST 1936 Nov 15 2:00`
		`+ @@ -471,7 +471,7 @@ Zone America/Chicago -5:50:36 - LMT 1883 Nov 18 12:09:24`
		`+ -6:00 Chicago C%sT 1967`
		`+ -6:00 US C%sT`
		`+ # Oliver County, ND switched from mountain to central time on 1992-10-25.`
		`+ -Zone America/North_Dakota/Center -6:45:12 - LMT 1883 Nov 18 12:14:48`
		`+ +Zone America/North_Dakota/Center -6:45:12 - LMT 1883 Nov 18 19:00u`
		`+ -7:00 US M%sT 1992 Oct 25 2:00`
		`+ -6:00 US C%sT`
		`+ # Morton County, ND, switched from mountain to central time on`
		`+ @@ -481,7 +481,7 @@ Zone America/North_Dakota/Center -6:45:12 - LMT 1883 Nov 18 12:14:48`
		`+ # Jones, Mellette, and Todd Counties in South Dakota;`
		`+ # but in practice these other counties were already observing central time.`
		`+ # See <http://www.epa.gov/fedrgstr/EPA-IMPACT/2003/October/Day-28/i27056.htm>.`
		`+ -Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21`
		`+ +Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 19:00u`
		`+ -7:00 US M%sT 2003 Oct 26 2:00`
		`+ -6:00 US C%sT`
		`+`
		`+ @@ -498,7 +498,7 @@ Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21`
		`+ # largest city in Mercer County). Google Maps places Beulah's city hall`
		`+ # at 47° 15' 51" N, 101° 46' 40" W, which yields an offset of 6h47'07".`
		`+`
		`+ -Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 12:12:53`
		`+ +Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 19:00u`
		`+ -7:00 US M%sT 2010 Nov 7 2:00`
		`+ -6:00 US C%sT`
		`+`
		`+ @@ -530,7 +530,7 @@ Rule Denver 1921 only - May 22 2:00 0 S`
		`+ Rule Denver 1965 1966 - Apr lastSun 2:00 1:00 D`
		`+ Rule Denver 1965 1966 - Oct lastSun 2:00 0 S`
		`+ # Zone NAME STDOFF RULES FORMAT [UNTIL]`
		`+ -Zone America/Denver -6:59:56 - LMT 1883 Nov 18 12:00:04`
		`+ +Zone America/Denver -6:59:56 - LMT 1883 Nov 18 19:00u`
		`+ -7:00 US M%sT 1920`
		`+ -7:00 Denver M%sT 1942`
		`+ -7:00 US M%sT 1946`
		`+ @@ -583,7 +583,7 @@ Rule CA 1950 1966 - Apr lastSun 1:00 1:00 D`
		`+ Rule CA 1950 1961 - Sep lastSun 2:00 0 S`
		`+ Rule CA 1962 1966 - Oct lastSun 2:00 0 S`
		`+ # Zone NAME STDOFF RULES FORMAT [UNTIL]`
		`+ -Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 12:07:02`
		`+ +Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 20:00u`
		`+ -8:00 US P%sT 1946`
		`+ -8:00 CA P%sT 1967`
		`+ -8:00 US P%sT`
		`+ @@ -845,7 +845,7 @@ Zone Pacific/Honolulu -10:31:26 - LMT 1896 Jan 13 12:00`
		`+ # Go with the Arizona State Library instead.`
		`+`
		`+ # Zone NAME STDOFF RULES FORMAT [UNTIL]`
		`+ -Zone America/Phoenix -7:28:18 - LMT 1883 Nov 18 11:31:42`
		`+ +Zone America/Phoenix -7:28:18 - LMT 1883 Nov 18 19:00u`
		`+ -7:00 US M%sT 1944 Jan 1 0:01`
		`+ -7:00 - MST 1944 Apr 1 0:01`
		`+ -7:00 US M%sT 1944 Oct 1 0:01`
		`+ @@ -873,7 +873,7 @@ Link America/Phoenix America/Creston`
		`+ # switched four weeks late in 1974.`
		`+ #`
		`+ # Zone NAME STDOFF RULES FORMAT [UNTIL]`
		`+ -Zone America/Boise -7:44:49 - LMT 1883 Nov 18 12:15:11`
		`+ +Zone America/Boise -7:44:49 - LMT 1883 Nov 18 20:00u`
		`+ -8:00 US P%sT 1923 May 13 2:00`
		`+ -7:00 US M%sT 1974`
		`+ -7:00 - MST 1974 Feb 3 2:00`
		`+ @@ -945,7 +945,7 @@ Rule Indianapolis 1941 only - Jun 22 2:00 1:00 D`
		`+ Rule Indianapolis 1941 1954 - Sep lastSun 2:00 0 S`
		`+ Rule Indianapolis 1946 1954 - Apr lastSun 2:00 1:00 D`
		`+ # Zone NAME STDOFF RULES FORMAT [UNTIL]`
		`+ -Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 12:15:22`
		`+ +Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 18:00u`
		`+ -6:00 US C%sT 1920`
		`+ -6:00 Indianapolis C%sT 1942`
		`+ -6:00 US C%sT 1946`
		`+ @@ -965,7 +965,7 @@ Rule Marengo 1951 only - Sep lastSun 2:00 0 S`
		`+ Rule Marengo 1954 1960 - Apr lastSun 2:00 1:00 D`
		`+ Rule Marengo 1954 1960 - Sep lastSun 2:00 0 S`
		`+ # Zone NAME STDOFF RULES FORMAT [UNTIL]`
		`+ -Zone America/Indiana/Marengo -5:45:23 - LMT 1883 Nov 18 12:14:37`
		`+ +Zone America/Indiana/Marengo -5:45:23 - LMT 1883 Nov 18 18:00u`
		`+ -6:00 US C%sT 1951`
		`+ -6:00 Marengo C%sT 1961 Apr 30 2:00`
		`+ -5:00 - EST 1969`
		`+ @@ -989,7 +989,7 @@ Rule Vincennes 1960 only - Oct lastSun 2:00 0 S`
		`+ Rule Vincennes 1961 only - Sep lastSun 2:00 0 S`
		`+ Rule Vincennes 1962 1963 - Oct lastSun 2:00 0 S`
		`+ # Zone NAME STDOFF RULES FORMAT [UNTIL]`
		`+ -Zone America/Indiana/Vincennes -5:50:07 - LMT 1883 Nov 18 12:09:53`
		`+ +Zone America/Indiana/Vincennes -5:50:07 - LMT 1883 Nov 18 18:00u`
		`+ -6:00 US C%sT 1946`
		`+ -6:00 Vincennes C%sT 1964 Apr 26 2:00`
		`+ -5:00 - EST 1969`
		`+ @@ -1009,7 +1009,7 @@ Rule Perry 1955 1960 - Sep lastSun 2:00 0 S`
		`+ Rule Perry 1956 1963 - Apr lastSun 2:00 1:00 D`
		`+ Rule Perry 1961 1963 - Oct lastSun 2:00 0 S`
		`+ # Zone NAME STDOFF RULES FORMAT [UNTIL]`
		`+ -Zone America/Indiana/Tell_City -5:47:03 - LMT 1883 Nov 18 12:12:57`
		`+ +Zone America/Indiana/Tell_City -5:47:03 - LMT 1883 Nov 18 18:00u`
		`+ -6:00 US C%sT 1946`
		`+ -6:00 Perry C%sT 1964 Apr 26 2:00`
		`+ -5:00 - EST 1967 Oct 29 2:00`
		`+ @@ -1026,7 +1026,7 @@ Rule Pike 1955 1960 - Sep lastSun 2:00 0 S`
		`+ Rule Pike 1956 1964 - Apr lastSun 2:00 1:00 D`
		`+ Rule Pike 1961 1964 - Oct lastSun 2:00 0 S`
		`+ # Zone NAME STDOFF RULES FORMAT [UNTIL]`
		`+ -Zone America/Indiana/Petersburg -5:49:07 - LMT 1883 Nov 18 12:10:53`
		`+ +Zone America/Indiana/Petersburg -5:49:07 - LMT 1883 Nov 18 18:00u`
		`+ -6:00 US C%sT 1955`
		`+ -6:00 Pike C%sT 1965 Apr 25 2:00`
		`+ -5:00 - EST 1966 Oct 30 2:00`
		`+ @@ -1048,7 +1048,7 @@ Rule Starke 1955 1956 - Oct lastSun 2:00 0 S`
		`+ Rule Starke 1957 1958 - Sep lastSun 2:00 0 S`
		`+ Rule Starke 1959 1961 - Oct lastSun 2:00 0 S`
		`+ # Zone NAME STDOFF RULES FORMAT [UNTIL]`
		`+ -Zone America/Indiana/Knox -5:46:30 - LMT 1883 Nov 18 12:13:30`
		`+ +Zone America/Indiana/Knox -5:46:30 - LMT 1883 Nov 18 18:00u`
		`+ -6:00 US C%sT 1947`
		`+ -6:00 Starke C%sT 1962 Apr 29 2:00`
		`+ -5:00 - EST 1963 Oct 27 2:00`
		`+ @@ -1064,7 +1064,7 @@ Rule Pulaski 1946 1954 - Sep lastSun 2:00 0 S`
		`+ Rule Pulaski 1955 1956 - Oct lastSun 2:00 0 S`
		`+ Rule Pulaski 1957 1960 - Sep lastSun 2:00 0 S`
		`+ # Zone NAME STDOFF RULES FORMAT [UNTIL]`
		`+ -Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 12:13:35`
		`+ +Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 18:00u`
		`+ -6:00 US C%sT 1946`
		`+ -6:00 Pulaski C%sT 1961 Apr 30 2:00`
		`+ -5:00 - EST 1969`
		`+ @@ -1075,7 +1075,7 @@ Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 12:13:35`
		`+ #`
		`+ # Switzerland County, Indiana, did not observe DST from 1973 through 2005.`
		`+ # Zone NAME STDOFF RULES FORMAT [UNTIL]`
		`+ -Zone America/Indiana/Vevay -5:40:16 - LMT 1883 Nov 18 12:19:44`
		`+ +Zone America/Indiana/Vevay -5:40:16 - LMT 1883 Nov 18 18:00u`
		`+ -6:00 US C%sT 1954 Apr 25 2:00`
		`+ -5:00 - EST 1969`
		`+ -5:00 US E%sT 1973`
		`+ @@ -1111,7 +1111,7 @@ Rule Louisville 1950 1961 - Apr lastSun 2:00 1:00 D`
		`+ Rule Louisville 1950 1955 - Sep lastSun 2:00 0 S`
		`+ Rule Louisville 1956 1961 - Oct lastSun 2:00 0 S`
		`+ # Zone NAME STDOFF RULES FORMAT [UNTIL]`
		`+ -Zone America/Kentucky/Louisville -5:43:02 - LMT 1883 Nov 18 12:16:58`
		`+ +Zone America/Kentucky/Louisville -5:43:02 - LMT 1883 Nov 18 18:00u`
		`+ -6:00 US C%sT 1921`
		`+ -6:00 Louisville C%sT 1942`
		`+ -6:00 US C%sT 1946`
		`+ @@ -1145,7 +1145,7 @@ Zone America/Kentucky/Louisville -5:43:02 - LMT 1883 Nov 18 12:16:58`
		`+ # Federal Register 65, 160 (2000-08-17), pp 50154-50158.`
		`+ # https://www.gpo.gov/fdsys/pkg/FR-2000-08-17/html/00-20854.htm`
		`+ #`
		`+ -Zone America/Kentucky/Monticello -5:39:24 - LMT 1883 Nov 18 12:20:36`
		`+ +Zone America/Kentucky/Monticello -5:39:24 - LMT 1883 Nov 18 18:00u`
		`+ -6:00 US C%sT 1946`
		`+ -6:00 - CST 1968`
		`+ -6:00 US C%sT 2000 Oct 29 2:00`
		`+ @@ -2640,6 +2640,8 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20`
		`+ # longitude they are located at.`
		`+`
		`+ # Rule NAME FROM TO - IN ON AT SAVE LETTER/S`
		`+ +Rule Mexico 1931 only - May 1 23:00 1:00 D`
		`+ +Rule Mexico 1931 only - Oct 1 0:00 0 S`
		`+ Rule Mexico 1939 only - Feb 5 0:00 1:00 D`
		`+ Rule Mexico 1939 only - Jun 25 0:00 0 S`
		`+ Rule Mexico 1940 only - Dec 9 0:00 1:00 D`
		`+ @@ -2656,13 +2658,13 @@ Rule Mexico 2002 max - Apr Sun>=1 2:00 1:00 D`
		`+ Rule Mexico 2002 max - Oct lastSun 2:00 0 S`
		`+ # Zone NAME STDOFF RULES FORMAT [UNTIL]`
		`+ # Quintana Roo; represented by Cancún`
		`+ -Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 0:12:56`
		`+ +Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 6:00u`
		`+ -6:00 - CST 1981 Dec 23`
		`+ -5:00 Mexico E%sT 1998 Aug 2 2:00`
		`+ -6:00 Mexico C%sT 2015 Feb 1 2:00`
		`+ -5:00 - EST`
		`+ # Campeche, Yucatán; represented by Mérida`
		`+ -Zone America/Merida -5:58:28 - LMT 1922 Jan 1 0:01:32`
		`+ +Zone America/Merida -5:58:28 - LMT 1922 Jan 1 6:00u`
		`+ -6:00 - CST 1981 Dec 23`
		`+ -5:00 - EST 1982 Dec 2`
		`+ -6:00 Mexico C%sT`
		`+ @@ -2676,23 +2678,21 @@ Zone America/Merida -5:58:28 - LMT 1922 Jan 1 0:01:32`
		`+ # See: Inicia mañana Horario de Verano en zona fronteriza, El Universal,`
		`+ # 2016-03-12`
		`+ # http://www.eluniversal.com.mx/articulo/estados/2016/03/12/inicia-manana-horario-de-verano-en-zona-fronteriza`
		`+ -Zone America/Matamoros -6:40:00 - LMT 1921 Dec 31 23:20:00`
		`+ +Zone America/Matamoros -6:30:00 - LMT 1922 Jan 1 6:00u`
		`+ -6:00 - CST 1988`
		`+ -6:00 US C%sT 1989`
		`+ -6:00 Mexico C%sT 2010`
		`+ -6:00 US C%sT`
		`+ # Durango; Coahuila, Nuevo León, Tamaulipas (away from US border)`
		`+ -Zone America/Monterrey -6:41:16 - LMT 1921 Dec 31 23:18:44`
		`+ +Zone America/Monterrey -6:41:16 - LMT 1922 Jan 1 6:00u`
		`+ -6:00 - CST 1988`
		`+ -6:00 US C%sT 1989`
		`+ -6:00 Mexico C%sT`
		`+ # Central Mexico`
		`+ -Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 0:23:24`
		`+ +Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 7:00u`
		`+ -7:00 - MST 1927 Jun 10 23:00`
		`+ -6:00 - CST 1930 Nov 15`
		`+ - -7:00 - MST 1931 May 1 23:00`
		`+ - -6:00 - CST 1931 Oct`
		`+ - -7:00 - MST 1932 Apr 1`
		`+ + -7:00 Mexico M%sT 1932 Apr 1`
		`+ -6:00 Mexico C%sT 2001 Sep 30 2:00`
		`+ -6:00 - CST 2002 Feb 20`
		`+ -6:00 Mexico C%sT`
		`+ @@ -2700,35 +2700,29 @@ Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 0:23:24`
		`+ # This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe,`
		`+ # Práxedis G Guerrero, Coyame del Sotol, Ojinaga, and Manuel Benavides.`
		`+ # (See the 2016-03-12 El Universal source mentioned above.)`
		`+ -Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 0:02:20`
		`+ +Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 7:00u`
		`+ -7:00 - MST 1927 Jun 10 23:00`
		`+ -6:00 - CST 1930 Nov 15`
		`+ - -7:00 - MST 1931 May 1 23:00`
		`+ - -6:00 - CST 1931 Oct`
		`+ - -7:00 - MST 1932 Apr 1`
		`+ + -7:00 Mexico M%sT 1932 Apr 1`
		`+ -6:00 - CST 1996`
		`+ -6:00 Mexico C%sT 1998`
		`+ -6:00 - CST 1998 Apr Sun>=1 3:00`
		`+ -7:00 Mexico M%sT 2010`
		`+ -7:00 US M%sT`
		`+ # Chihuahua (away from US border)`
		`+ -Zone America/Chihuahua -7:04:20 - LMT 1921 Dec 31 23:55:40`
		`+ +Zone America/Chihuahua -7:04:20 - LMT 1922 Jan 1 7:00u`
		`+ -7:00 - MST 1927 Jun 10 23:00`
		`+ -6:00 - CST 1930 Nov 15`
		`+ - -7:00 - MST 1931 May 1 23:00`
		`+ - -6:00 - CST 1931 Oct`
		`+ - -7:00 - MST 1932 Apr 1`
		`+ + -7:00 Mexico M%sT 1932 Apr 1`
		`+ -6:00 - CST 1996`
		`+ -6:00 Mexico C%sT 1998`
		`+ -6:00 - CST 1998 Apr Sun>=1 3:00`
		`+ -7:00 Mexico M%sT`
		`+ # Sonora`
		`+ -Zone America/Hermosillo -7:23:52 - LMT 1921 Dec 31 23:36:08`
		`+ +Zone America/Hermosillo -7:23:52 - LMT 1922 Jan 1 7:00u`
		`+ -7:00 - MST 1927 Jun 10 23:00`
		`+ -6:00 - CST 1930 Nov 15`
		`+ - -7:00 - MST 1931 May 1 23:00`
		`+ - -6:00 - CST 1931 Oct`
		`+ - -7:00 - MST 1932 Apr 1`
		`+ + -7:00 Mexico M%sT 1932 Apr 1`
		`+ -6:00 - CST 1942 Apr 24`
		`+ -7:00 - MST 1949 Jan 14`
		`+ -8:00 - PST 1970`
		`+ @@ -2763,24 +2757,20 @@ Zone America/Hermosillo -7:23:52 - LMT 1921 Dec 31 23:36:08`
		`+ # Use "Bahia_Banderas" to keep the name to fourteen characters.`
		`+`
		`+ # Mazatlán`
		`+ -Zone America/Mazatlan -7:05:40 - LMT 1921 Dec 31 23:54:20`
		`+ +Zone America/Mazatlan -7:05:40 - LMT 1922 Jan 1 7:00u`
		`+ -7:00 - MST 1927 Jun 10 23:00`
		`+ -6:00 - CST 1930 Nov 15`
		`+ - -7:00 - MST 1931 May 1 23:00`
		`+ - -6:00 - CST 1931 Oct`
		`+ - -7:00 - MST 1932 Apr 1`
		`+ + -7:00 Mexico M%sT 1932 Apr 1`
		`+ -6:00 - CST 1942 Apr 24`
		`+ -7:00 - MST 1949 Jan 14`
		`+ -8:00 - PST 1970`
		`+ -7:00 Mexico M%sT`
		`+`
		`+ # Bahía de Banderas`
		`+ -Zone America/Bahia_Banderas -7:01:00 - LMT 1921 Dec 31 23:59:00`
		`+ +Zone America/Bahia_Banderas -7:01:00 - LMT 1922 Jan 1 7:00u`
		`+ -7:00 - MST 1927 Jun 10 23:00`
		`+ -6:00 - CST 1930 Nov 15`
		`+ - -7:00 - MST 1931 May 1 23:00`
		`+ - -6:00 - CST 1931 Oct`
		`+ - -7:00 - MST 1932 Apr 1`
		`+ + -7:00 Mexico M%sT 1932 Apr 1`
		`+ -6:00 - CST 1942 Apr 24`
		`+ -7:00 - MST 1949 Jan 14`
		`+ -8:00 - PST 1970`
		`+ @@ -2788,7 +2778,7 @@ Zone America/Bahia_Banderas -7:01:00 - LMT 1921 Dec 31 23:59:00`
		`+ -6:00 Mexico C%sT`
		`+`
		`+ # Baja California`
		`+ -Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 0:11:56`
		`+ +Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 7:00u`
		`+ -7:00 - MST 1924`
		`+ -8:00 - PST 1927 Jun 10 23:00`
		`+ -7:00 - MST 1930 Nov 15`
		`+ diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION`
		`+ index 71470168456..0cad939008f 100644`
		`+ --- a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION`
		`+ +++ b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION`
		`+ @@ -1 +1 @@`
		`+ -tzdata2022d`
		`+ +tzdata2022e`
		`+ diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt`
		`+ index b3823958ae4..2f2786f1c69 100644`
		`+ --- a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt`
		`+ +++ b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt`
		`+ @@ -97,9 +97,7 @@ America/Winnipeg CST CDT`
		`+ America/Yakutat AKST AKDT`
		`+ America/Yellowknife MST MDT`
		`+ Antarctica/Macquarie AEST AEDT`
		`+ -Asia/Amman EET EEST`
		`+ Asia/Beirut EET EEST`
		`+ -Asia/Damascus EET EEST`
		`+ Asia/Famagusta EET EEST`
		`+ Asia/Gaza EET EEST`
		`+ Asia/Hebron EET EEST`

ahughes commented 2 years ago

Update CLDR data with Europe/Kyiv (JDK-8293834)
Drop JDK-8292223 patch which we found to be unnecessary
Update TestTranslations.java to use public API based on TimeZoneNamesTest upstream