Update to jdk-20.0.2+9
Update release notes to 20.0.2+9 Update system crypto policy & FIPS patch from new fips-20u tree Update generate_tarball.sh ICEDTEA_VERSION Update CLDR reference data following update to 42 (Rocky Mountain-Normalzeit => Rocky-Mountain-Normalzeit) Dropped JDK-8295447, JDK-8296239 & JDK-8299439 patches now upstream Adapted rh1750419-redhat_alt_java.patch Related: RHEL-45217
This commit is contained in:
parent
3edefc6f27
commit
6a4c389808
3
.gitignore
vendored
3
.gitignore
vendored
@ -7,3 +7,6 @@
|
||||
/openjdk-jdk19u-jdk-19+36.tar.xz
|
||||
/openjdk-jdk19u-jdk-19.0.1+10.tar.xz
|
||||
/openjdk-jdk19u-jdk-19.0.2+7.tar.xz
|
||||
/openjdk-jdk20u-jdk-20+36.tar.xz
|
||||
/openjdk-jdk20u-jdk-20.0.1+9.tar.xz
|
||||
/openjdk-jdk20u-jdk-20.0.2+9.tar.xz
|
||||
|
@ -52,7 +52,7 @@ public class TestTranslations {
|
||||
map.put(Locale.FRANCE, new String[] { "heure normale des Rocheuses", "UTC\u221207:00", "MST",
|
||||
"heure d\u2019\u00e9t\u00e9 des Rocheuses", "UTC\u221206:00", "MDT",
|
||||
"heure des Rocheuses", "UTC\u221207:00", "MT"});
|
||||
map.put(Locale.GERMANY, new String[] { "Rocky Mountain-Normalzeit", "GMT-07:00", "MST",
|
||||
map.put(Locale.GERMANY, new String[] { "Rocky-Mountain-Normalzeit", "GMT-07:00", "MST",
|
||||
"Rocky-Mountain-Sommerzeit", "GMT-06:00", "MDT",
|
||||
"Rocky-Mountain-Zeit", "GMT-07:00", "MT"});
|
||||
CIUDAD_JUAREZ = Collections.unmodifiableMap(map);
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -38,7 +38,7 @@ set -e
|
||||
OPENJDK_URL_DEFAULT=https://github.com
|
||||
COMPRESSION_DEFAULT=xz
|
||||
# Corresponding IcedTea version
|
||||
ICEDTEA_VERSION=13.0
|
||||
ICEDTEA_VERSION=15.0
|
||||
|
||||
if [ "x$1" = "xhelp" ] ; then
|
||||
echo -e "Behaviour may be specified by setting the following variables:\n"
|
||||
|
@ -315,7 +315,7 @@
|
||||
%endif
|
||||
|
||||
# New Version-String scheme-style defines
|
||||
%global featurever 19
|
||||
%global featurever 20
|
||||
%global fakefeaturever 21
|
||||
%global interimver 0
|
||||
%global updatever 2
|
||||
@ -323,7 +323,7 @@
|
||||
# buildjdkver is usually same as %%{featurever},
|
||||
# but in time of bootstrap of next jdk, it is featurever-1,
|
||||
# and this it is better to change it here, on single place
|
||||
%global buildjdkver 17
|
||||
%global buildjdkver %{fakefeaturever}
|
||||
# We don't add any LTS designator for STS packages (Fedora and EPEL).
|
||||
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
|
||||
%if 0%{?rhel} && !0%{?epel}
|
||||
@ -368,15 +368,15 @@
|
||||
# Define IcedTea version used for SystemTap tapsets and desktop file
|
||||
%global icedteaver 6.0.0pre00-c848b93a8598
|
||||
# Define current Git revision for the FIPS support patches
|
||||
%global fipsver d95bb40c7c8
|
||||
%global fipsver fd3de3d95b5
|
||||
|
||||
# Standard JPackage naming and versioning defines
|
||||
%global origin openjdk
|
||||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{origin}
|
||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||
%global buildver 7
|
||||
%global rpmrelease 2
|
||||
%global buildver 9
|
||||
%global rpmrelease 1
|
||||
#%%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
|
||||
@ -636,8 +636,8 @@ Patch600: rh1750419-redhat_alt_java.patch
|
||||
Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
|
||||
|
||||
# Crypto policy and FIPS support patches
|
||||
# Patch is generated from the fips-19u tree at https://github.com/rh-openjdk/jdk/tree/fips-19u
|
||||
# as follows: git diff %%{vcstag} src make test > fips-19u-$(git show -s --format=%h HEAD).patch
|
||||
# Patch is generated from the fips-20u tree at https://github.com/rh-openjdk/jdk/tree/fips-20u
|
||||
# as follows: git diff %%{vcstag} src make test > fips-20u-$(git show -s --format=%h HEAD).patch
|
||||
# Diff is limited to src and make subdirectories to exclude .github changes
|
||||
# Fixes currently included:
|
||||
# PR3183, RH1340845: Follow system wide crypto policy
|
||||
@ -671,7 +671,7 @@ Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-d
|
||||
# test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java: fixed jtreg main class
|
||||
# RH1940064: Enable XML Signature provider in FIPS mode
|
||||
# RH2173781: Avoid calling C_GetInfo() too early, before cryptoki is initialized
|
||||
Patch1001: fips-19u-%{fipsver}.patch
|
||||
Patch1001: fips-20u-%{fipsver}.patch
|
||||
|
||||
#############################################
|
||||
#
|
||||
@ -683,16 +683,11 @@ Patch1001: fips-19u-%{fipsver}.patch
|
||||
|
||||
#############################################
|
||||
#
|
||||
# OpenJDK patches which missed 19.0.2
|
||||
# OpenJDK patches which missed last update
|
||||
#
|
||||
#############################################
|
||||
|
||||
# JDK-8295447: NullPointerException with invalid pattern matching construct in constructor call
|
||||
Patch2007: jdk8295447-npe_in_constructor.patch
|
||||
# JDK-8296239: ISO 4217 Amendment 174 Update
|
||||
Patch2008: jdk8296239-iso4217_up174.patch
|
||||
# JDK-8299439: java/text/Format/NumberFormat/CurrencyFormat.java fails for hr_HR
|
||||
Patch2009: jdk8299439-test_for_hr.patch
|
||||
# Currently empty
|
||||
|
||||
#############################################
|
||||
#
|
||||
@ -977,10 +972,6 @@ pushd %{top_level_dir_name}
|
||||
%patch1001 -p1
|
||||
# nss.cfg PKCS11 support; must come last as it also alters java.security
|
||||
%patch1000 -p1
|
||||
# updates which missed 19.0.2
|
||||
%patch2007 -p1
|
||||
%patch2008 -p1
|
||||
%patch2009 -p1
|
||||
popd # openjdk
|
||||
|
||||
%patch600
|
||||
@ -1687,14 +1678,28 @@ done
|
||||
%{_jvmdir}/%{miscportablearchive}.sha256sum
|
||||
|
||||
%changelog
|
||||
* Tue Aug 15 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:19.0.1.0.10-1
|
||||
* Wed Aug 16 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:20.0.2.0.9-1
|
||||
- Update to jdk-20.0.2+9
|
||||
- Update release notes to 20.0.2+9
|
||||
- Update system crypto policy & FIPS patch from new fips-20u tree
|
||||
- Update generate_tarball.sh ICEDTEA_VERSION
|
||||
- Update CLDR reference data following update to 42 (Rocky Mountain-Normalzeit => Rocky-Mountain-Normalzeit)
|
||||
|
||||
* Wed Aug 16 2023 Jiri Vanek <jvanek@redhat.com> - 1:20.0.2.0.9-1
|
||||
- Dropped JDK-8295447, JDK-8296239 & JDK-8299439 patches now upstream
|
||||
- Adapted rh1750419-redhat_alt_java.patch
|
||||
|
||||
* Tue Aug 15 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:19.0.2.0.7-2
|
||||
- Bump rpmrelease to rebuild for CentOS 9
|
||||
|
||||
* Tue Aug 15 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:19.0.2.0.7-1
|
||||
- Update to jdk-19.0.2 release
|
||||
- Update release notes to 19.0.2
|
||||
- Rebase FIPS patches from fips-19u branch
|
||||
- Remove references to sample directory removed by JDK-8284999
|
||||
- Add local patch JDK-8295447 (javac NPE) which was accepted into 19u upstream but not in the GA tag
|
||||
- Add local patches for JDK-8296239 & JDK-8299439 (Croatia Euro update) which are present in 8u, 11u & 17u releases
|
||||
- Related: RHEL-12997
|
||||
- Switch buildjdkver to java-21-openjdk
|
||||
|
||||
* Thu Aug 10 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:18.0.2.0.9-2
|
||||
- Bump rpmrelease to rebuild for CentOS 9
|
||||
|
@ -299,7 +299,7 @@
|
||||
%endif
|
||||
|
||||
# New Version-String scheme-style defines
|
||||
%global featurever 19
|
||||
%global featurever 20
|
||||
%global fakefeaturever 21
|
||||
%global interimver 0
|
||||
%global updatever 2
|
||||
@ -338,17 +338,17 @@
|
||||
# Define IcedTea version used for SystemTap tapsets and desktop file
|
||||
%global icedteaver 6.0.0pre00-c848b93a8598
|
||||
# Define current Git revision for the FIPS support patches
|
||||
%global fipsver d95bb40c7c8
|
||||
%global fipsver fd3de3d95b5
|
||||
|
||||
# Standard JPackage naming and versioning defines
|
||||
%global origin openjdk
|
||||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{origin}
|
||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||
%global buildver 7
|
||||
%global buildver 9
|
||||
%global rpmrelease 1
|
||||
# Settings used by the portable build
|
||||
%global portablerelease 2
|
||||
%global portablerelease 1
|
||||
%global portablesuffix el9
|
||||
%global portablebuilddir /builddir/build/BUILD
|
||||
|
||||
@ -1373,8 +1373,8 @@ Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk1
|
||||
Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
|
||||
|
||||
# Crypto policy and FIPS support patches
|
||||
# Patch is generated from the fips-19u tree at https://github.com/rh-openjdk/jdk/tree/fips-19u
|
||||
# as follows: git diff %%{vcstag} src make test > fips-19u-$(git show -s --format=%h HEAD).patch
|
||||
# Patch is generated from the fips-20u tree at https://github.com/rh-openjdk/jdk/tree/fips-20u
|
||||
# as follows: git diff %%{vcstag} src make test > fips-20u-$(git show -s --format=%h HEAD).patch
|
||||
# Diff is limited to src and make subdirectories to exclude .github changes
|
||||
# Fixes currently included:
|
||||
# PR3183, RH1340845: Follow system wide crypto policy
|
||||
@ -1408,7 +1408,7 @@ Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-d
|
||||
# test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java: fixed jtreg main class
|
||||
# RH1940064: Enable XML Signature provider in FIPS mode
|
||||
# RH2173781: Avoid calling C_GetInfo() too early, before cryptoki is initialized
|
||||
Patch1001: fips-19u-%{fipsver}.patch
|
||||
Patch1001: fips-20u-%{fipsver}.patch
|
||||
|
||||
#############################################
|
||||
#
|
||||
@ -1420,16 +1420,11 @@ Patch1001: fips-19u-%{fipsver}.patch
|
||||
|
||||
#############################################
|
||||
#
|
||||
# OpenJDK patches which missed 19.0.2
|
||||
# OpenJDK patches which missed last update
|
||||
#
|
||||
#############################################
|
||||
|
||||
# JDK-8295447: NullPointerException with invalid pattern matching construct in constructor call
|
||||
Patch2007: jdk8295447-npe_in_constructor.patch
|
||||
# JDK-8296239: ISO 4217 Amendment 174 Update
|
||||
Patch2008: jdk8296239-iso4217_up174.patch
|
||||
# JDK-8299439: java/text/Format/NumberFormat/CurrencyFormat.java fails for hr_HR
|
||||
Patch2009: jdk8299439-test_for_hr.patch
|
||||
# Currently empty
|
||||
|
||||
#############################################
|
||||
#
|
||||
@ -1882,10 +1877,6 @@ pushd %{top_level_dir_name}
|
||||
%patch1001 -p1
|
||||
# nss.cfg PKCS11 support; must come last as it also alters java.security
|
||||
%patch1000 -p1
|
||||
# updates which missed 19.0.2
|
||||
%patch2007 -p1
|
||||
%patch2008 -p1
|
||||
%patch2009 -p1
|
||||
popd # openjdk
|
||||
|
||||
%patch600
|
||||
@ -2528,6 +2519,19 @@ cjc.mainProgram(args)
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Aug 16 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:20.0.0.0.36-1
|
||||
- Update to jdk-20.0.2+9
|
||||
- Update release notes to 20.0.2+9
|
||||
- Update system crypto policy & FIPS patch from new fips-20u tree
|
||||
- Update generate_tarball.sh ICEDTEA_VERSION
|
||||
- Update CLDR reference data following update to 42 (Rocky Mountain-Normalzeit => Rocky-Mountain-Normalzeit)
|
||||
- Related: RHEL-45217
|
||||
|
||||
* Wed Aug 16 2023 Jiri Vanek <jvanek@redhat.com> - 1:20.0.0.0.36-1
|
||||
- Dropped JDK-8295447, JDK-8296239 & JDK-8299439 patches now upstream
|
||||
- Adapted rh1750419-redhat_alt_java.patch
|
||||
- Related: RHEL-45217
|
||||
|
||||
* Tue Aug 15 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:19.0.1.0.10-1
|
||||
- Update to jdk-19.0.2 release
|
||||
- Update release notes to 19.0.2
|
||||
|
@ -1,97 +0,0 @@
|
||||
commit c9d485792b99233f381dcdfd69838e7b973909bd
|
||||
Author: Victor Rudometov <vrudomet@openjdk.org>
|
||||
Date: Thu Dec 1 10:57:43 2022 +0000
|
||||
|
||||
8295447: NullPointerException with invalid pattern matching construct in constructor call
|
||||
|
||||
Backport-of: 6c05771b9be3dd5cbcdb40d2e53cc53959926cdd
|
||||
|
||||
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
|
||||
index 21cc8e57e1f..46b076d3d03 100644
|
||||
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
|
||||
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
|
||||
@@ -4145,6 +4145,10 @@ public class Attr extends JCTree.Visitor {
|
||||
Type exprType,
|
||||
Type pattType) {
|
||||
Warner warner = new Warner();
|
||||
+ // if any type is erroneous, the problem is reported elsewhere
|
||||
+ if (exprType.isErroneous() || pattType.isErroneous()) {
|
||||
+ return false;
|
||||
+ }
|
||||
if (!types.isCastable(exprType, pattType, warner)) {
|
||||
chk.basicHandler.report(pos,
|
||||
diags.fragment(Fragments.InconvertibleTypes(exprType, pattType)));
|
||||
@@ -4206,7 +4210,7 @@ public class Attr extends JCTree.Visitor {
|
||||
tree.record = record;
|
||||
} else {
|
||||
log.error(tree.pos(), Errors.DeconstructionPatternOnlyRecords(site.tsym));
|
||||
- expectedRecordTypes = Stream.generate(() -> Type.noType)
|
||||
+ expectedRecordTypes = Stream.generate(() -> types.createErrorType(tree.type))
|
||||
.limit(tree.nested.size())
|
||||
.collect(List.collector());
|
||||
}
|
||||
diff --git a/test/langtools/tools/javac/T8295447.java b/test/langtools/tools/javac/T8295447.java
|
||||
new file mode 100644
|
||||
index 00000000000..76fcaf10f8d
|
||||
--- /dev/null
|
||||
+++ b/test/langtools/tools/javac/T8295447.java
|
||||
@@ -0,0 +1,46 @@
|
||||
+/*
|
||||
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
+ *
|
||||
+ * This code is free software; you can redistribute it and/or modify it
|
||||
+ * under the terms of the GNU General Public License version 2 only, as
|
||||
+ * published by the Free Software Foundation.
|
||||
+ *
|
||||
+ * This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
+ * version 2 for more details (a copy is included in the LICENSE file that
|
||||
+ * accompanied this code).
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License version
|
||||
+ * 2 along with this work; if not, write to the Free Software Foundation,
|
||||
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
+ *
|
||||
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
+ * or visit www.oracle.com if you need additional information or have any
|
||||
+ * questions.
|
||||
+ */
|
||||
+/**
|
||||
+ * @test
|
||||
+ * @bug 8295447
|
||||
+ * @summary NullPointerException with invalid pattern matching construct in constructor call
|
||||
+ * @modules jdk.compiler
|
||||
+ * @compile/fail/ref=T8295447.out -XDrawDiagnostics --enable-preview -source ${jdk.version} T8295447.java
|
||||
+ */
|
||||
+public class T8295447 {
|
||||
+ class Foo {
|
||||
+ void m(Object o) {
|
||||
+ if(o instanceof Foo(int x)) {}
|
||||
+ }
|
||||
+
|
||||
+ Foo(Object o) {
|
||||
+ m((o instanceof Foo(int x))? 0 : 1);
|
||||
+ }
|
||||
+ void m(int i) { }
|
||||
+ }
|
||||
+
|
||||
+ class Base { int i; Base(int j) { i = j; } }
|
||||
+ class Sub extends Base {
|
||||
+ Sub(Object o) { super(o instanceof java.awt.Point(int x, int y)? x + y: 0); }
|
||||
+ }
|
||||
+}
|
||||
diff --git a/test/langtools/tools/javac/T8295447.out b/test/langtools/tools/javac/T8295447.out
|
||||
new file mode 100644
|
||||
index 00000000000..7f6746f802f
|
||||
--- /dev/null
|
||||
+++ b/test/langtools/tools/javac/T8295447.out
|
||||
@@ -0,0 +1,6 @@
|
||||
+T8295447.java:33:29: compiler.err.deconstruction.pattern.only.records: T8295447.Foo
|
||||
+T8295447.java:37:29: compiler.err.deconstruction.pattern.only.records: T8295447.Foo
|
||||
+T8295447.java:44:44: compiler.err.deconstruction.pattern.only.records: java.awt.Point
|
||||
+- compiler.note.preview.filename: T8295447.java, DEFAULT
|
||||
+- compiler.note.preview.recompile
|
||||
+3 errors
|
||||
\ No newline at end of file
|
@ -1,79 +0,0 @@
|
||||
commit bf899de7aa8cc862ed123865b9aa26e06d96a7de
|
||||
Author: duke <duke@openjdk.org>
|
||||
Date: Thu Jan 26 00:55:32 2023 +0000
|
||||
|
||||
Backport fd837649811c866c144c9133d211fb5ad8f994a7
|
||||
|
||||
diff --git a/src/java.base/share/data/currency/CurrencyData.properties b/src/java.base/share/data/currency/CurrencyData.properties
|
||||
index 688de592c7b..d234c96c476 100644
|
||||
--- a/src/java.base/share/data/currency/CurrencyData.properties
|
||||
+++ b/src/java.base/share/data/currency/CurrencyData.properties
|
||||
@@ -32,7 +32,7 @@ formatVersion=3
|
||||
# Version of the currency code information in this class.
|
||||
# It is a serial number that accompanies with each amendment.
|
||||
|
||||
-dataVersion=173
|
||||
+dataVersion=174
|
||||
|
||||
# List of all valid ISO 4217 currency codes.
|
||||
# To ensure compatibility, do not remove codes.
|
||||
@@ -189,7 +189,7 @@ CR=CRC
|
||||
# COTE D'IVOIRE
|
||||
CI=XOF
|
||||
# CROATIA
|
||||
-HR=HRK
|
||||
+HR=HRK;2022-12-31-23-00-00;EUR
|
||||
# CUBA
|
||||
CU=CUP
|
||||
# Cura\u00e7ao
|
||||
diff --git a/test/jdk/java/util/Currency/ValidateISO4217.java b/test/jdk/java/util/Currency/ValidateISO4217.java
|
||||
index b7e64f318b1..b6a91835b19 100644
|
||||
--- a/test/jdk/java/util/Currency/ValidateISO4217.java
|
||||
+++ b/test/jdk/java/util/Currency/ValidateISO4217.java
|
||||
@@ -24,7 +24,7 @@
|
||||
* @test
|
||||
* @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759
|
||||
* 8039317 8074350 8074351 8145952 8187946 8193552 8202026 8204269
|
||||
- * 8208746 8209775 8264792 8274658 8283277
|
||||
+ * 8208746 8209775 8264792 8274658 8283277 8296239
|
||||
* @summary Validate ISO 4217 data for Currency class.
|
||||
* @modules java.base/java.util:open
|
||||
* jdk.localedata
|
||||
@@ -34,7 +34,7 @@
|
||||
* ############################################################################
|
||||
*
|
||||
* ValidateISO4217 is a tool to detect differences between the latest ISO 4217
|
||||
- * data and and Java's currency data which is based on ISO 4217.
|
||||
+ * data and Java's currency data which is based on ISO 4217.
|
||||
* If there is a difference, the following file which includes currency data
|
||||
* may need to be updated.
|
||||
* src/share/classes/java/util/CurrencyData.properties
|
||||
diff --git a/test/jdk/java/util/Currency/tablea1.txt b/test/jdk/java/util/Currency/tablea1.txt
|
||||
index 3e107823042..3eef0eba00e 100644
|
||||
--- a/test/jdk/java/util/Currency/tablea1.txt
|
||||
+++ b/test/jdk/java/util/Currency/tablea1.txt
|
||||
@@ -1,12 +1,12 @@
|
||||
#
|
||||
#
|
||||
-# Amendments up until ISO 4217 AMENDMENT NUMBER 173
|
||||
-# (As of 23 September 2022)
|
||||
+# Amendments up until ISO 4217 AMENDMENT NUMBER 174
|
||||
+# (As of 2 November 2022)
|
||||
#
|
||||
|
||||
# Version
|
||||
FILEVERSION=3
|
||||
-DATAVERSION=173
|
||||
+DATAVERSION=174
|
||||
|
||||
# ISO 4217 currency data
|
||||
AF AFN 971 2
|
||||
@@ -67,7 +67,7 @@ CD CDF 976 2
|
||||
CK NZD 554 2
|
||||
CR CRC 188 2
|
||||
CI XOF 952 0
|
||||
-HR HRK 191 2
|
||||
+HR HRK 191 2 2022-12-31-23-00-00 EUR 978 2
|
||||
CU CUP 192 2
|
||||
CW ANG 532 2
|
||||
CY EUR 978 2
|
@ -1,63 +0,0 @@
|
||||
commit cf262d7441d797942d33ed2a79540230fc5c97fa
|
||||
Author: Christoph Langer <clanger@openjdk.org>
|
||||
Date: Thu Jan 12 08:02:58 2023 +0000
|
||||
|
||||
8299439: java/text/Format/NumberFormat/CurrencyFormat.java fails for hr_HR
|
||||
|
||||
Reviewed-by: naoto
|
||||
Backport-of: 3b374c0153950ab193f3a188b57d3404b4ce2fe2
|
||||
|
||||
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties
|
||||
index 70f210e2da6..56e61953a8c 100644
|
||||
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties
|
||||
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||
+# Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
@@ -35,4 +35,5 @@
|
||||
# This notice and attribution to Taligent may not be removed.
|
||||
# Taligent is a registered trademark of Taligent, Inc.
|
||||
|
||||
+EUR=\u20AC
|
||||
HRK=Kn
|
||||
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
|
||||
index dc167492272..a806ebe778a 100644
|
||||
--- a/test/jdk/ProblemList.txt
|
||||
+++ b/test/jdk/ProblemList.txt
|
||||
@@ -1,6 +1,6 @@
|
||||
###########################################################################
|
||||
#
|
||||
-# Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
diff --git a/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties b/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties
|
||||
index cf73a9c7e31..665dd3b290a 100644
|
||||
--- a/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties
|
||||
+++ b/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties
|
||||
@@ -79,7 +79,7 @@ fr_FR=\u20AC
|
||||
fr_LU=\u20AC
|
||||
hi_IN=\u0930\u0942
|
||||
hr=\u00A4
|
||||
-hr_HR=Kn
|
||||
+hr_HR=\u20AC
|
||||
hu=\u00A4
|
||||
hu_HU=Ft
|
||||
is=\u00A4
|
||||
@@ -94,9 +94,9 @@ ja_JP=\uFFE5
|
||||
ko=\u00A4
|
||||
ko_KR=\uFFE6
|
||||
lt=\u00A4
|
||||
-lt_LT=Lt;2014-12-31-22-00-00;\u20AC
|
||||
+lt_LT=\u20AC
|
||||
lv=\u00A4
|
||||
-lv_LV=Ls;2013-12-31-22-00-00;\u20AC
|
||||
+lv_LV=\u20AC
|
||||
mk=\u00A4
|
||||
mk_MK=Den
|
||||
nl=\u00A4
|
@ -112,6 +112,6 @@ index b734fe2ba78..79dc8307650 100644
|
||||
+#endif
|
||||
+#endif
|
||||
+
|
||||
#ifdef _MSC_VER
|
||||
#if _MSC_VER > 1400 && _MSC_VER < 1600
|
||||
|
||||
/*
|
||||
* Entry point.
|
||||
*/
|
||||
|
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
|
||||
SHA512 (openjdk-jdk19u-jdk-19.0.2+7.tar.xz) = f9b54ae43074caa53773000ed8000ff5592cda44b2bef8fafa2c38cf623048722c34a111aacfd1831050525804230b29cc20fd95ad2162c43412b957190cc7b0
|
||||
SHA512 (openjdk-jdk20u-jdk-20.0.2+9.tar.xz) = 1513a9f43613401055f2638d75cb6338c25c5c068c66e03c5943f47a0a7d41279013a3f455738b92947712e99bb279daa50c488a086354f4e74c6e0c50e2e3c5
|
||||
|
Loading…
Reference in New Issue
Block a user