80 lines
2.7 KiB
Diff
80 lines
2.7 KiB
Diff
|
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
|