!140 8239017 cmp-baseline fails because of differences in TimeZoneNames_kea

Merge pull request !140 from kuen/I4M067

8239017-cmp-baseline-fails-because-of-differences-in-TimeZoneNames_kea.patch

@@ -0,0 +1,26 @@
+From b2b541571c538d3ddd97066b96279882a2a23994 Mon Sep 17 00:00:00 2001
+From: zhangyipeng <zhangyipeng7@huawei.com>
+Date: Tue, 7 Dec 2021 10:17:09 +0800
+Subject: [PATCH] 8239017: cmp-baseline fails because of differences in
+ TimeZoneNames_kea
+
+---
+ .../src/classes/build/tools/cldrconverter/CLDRConverter.java    | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
+index 034b8ade4..434912726 100644
+--- a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
++++ b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
+@@ -665,7 +665,7 @@ public class CLDRConverter {
+     }
+ 
+     private static Map<String, Object> extractZoneNames(Map<String, Object> map, String id) {
+-        Map<String, Object> names = new HashMap<>();
++        Map<String, Object> names = new TreeMap<>(KeyComparator.INSTANCE);
+ 
+         getAvailableZoneIds().stream().forEach(tzid -> {
+             // If the tzid is deprecated, get the data for the replacement id
+-- 
+2.22.0
+

openjdk-11.spec

@@ -740,7 +740,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
 
 Name:    java-%{javaver}-%{origin}
 Version: %{newjavaver}.%{buildver}
-Release: 3
+Release: 4
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
 # and this change was brought into RHEL-4. java-1.5.0-ibm packages
 # also included the epoch in their virtual provides. This created a
@@ -865,6 +865,7 @@ Patch82: PS-introduce-UsePSRelaxedForwardee-to-enable-using-r.patch
 # 11.0.13
 Patch83: 8273111-Default-timezone-should-return-zone-ID-if-locatiome-is-valid-but-not-canonicalization-on-linux.patch
 Patch84: fix-memcpy-compile-warning-when-building-on-linux-x86.patch
+Patch85: 8239017-cmp-baseline-fails-because-of-differences-in-TimeZoneNames_kea.patch
 
 BuildRequires: autoconf
 BuildRequires: alsa-lib-devel
@@ -1147,6 +1148,7 @@ pushd %{top_level_dir_name}
 %patch82 -p1
 %patch83 -p1
 %patch84 -p1
+%patch85 -p1
 popd # openjdk
 
 # %patch1000
@@ -1649,6 +1651,9 @@ require "copy_jdk_configs.lua"
 
 
 %changelog
+* Fri Dec 10 2021 kuenking111 <wangkun49@huawei.com> - 1:11.0.13.7-4
+- add 8239017-cmp-baseline-fails-because-of-differences-in-TimeZoneNames_kea.patch
+
 * Fri Dec 10 2021 kuenking111 <wangkun49@huawei.com> - 1:11.0.13.7-3
 - add fix-memcpy-compile-warning-when-building-on-linux-x86.patch