Skip to content

Commit

Permalink
8274658: ISO 4217 Amendment 170 Update
Browse files Browse the repository at this point in the history
Reviewed-by: sgehwolf
Backport-of: f2404d60de2b58c590bf885f5cce50c289073673
  • Loading branch information
gnu-andrew committed Mar 29, 2022
1 parent 57d8d29 commit f8a6695
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 12 deletions.
4 changes: 2 additions & 2 deletions jdk/src/share/classes/java/util/CurrencyData.properties
Expand Up @@ -31,7 +31,7 @@ formatVersion=2
# Version of the currency code information in this class.
# It is a serial number that accompanies with each amendment.

dataVersion=169
dataVersion=170

# List of all valid ISO 4217 currency codes.
# To ensure compatibility, do not remove codes.
Expand All @@ -53,7 +53,7 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036
SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\
SRD968-SRG740-SSP728-STD678-STN930-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-UYI940-\
UYU858-UZS860-VEB862-VEF937-VES928-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
UYU858-UZS860-VEB862-VED926-VEF937-VES928-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
XBB956-XBC957-XBD958-XCD951-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\
XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZMW967-ZWD716-ZWL932-\
ZWN942-ZWR935
Expand Down
@@ -1,5 +1,5 @@
#
# Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2005, 2021, 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
Expand Down Expand Up @@ -251,6 +251,7 @@ USS=USS
UYU=UYU
UZS=UZS
VEB=VEB
VED=VED
VEF=VEF
VES=VES
VND=VND
Expand Down Expand Up @@ -474,6 +475,7 @@ uss=US Dollar (Same day)
uyu=Uruguayan Peso
uzs=Uzbekistan Som
veb=Venezuelan Bol\u00edvar (1871-2008)
ved=Venezuelan Bol\u00edvar Soberano
vef=Venezuelan Bol\u00edvar
ves=Venezuelan Bol\u00edvar Soberano
vnd=Vietnamese Dong
Expand Down
6 changes: 3 additions & 3 deletions jdk/test/java/util/Currency/ValidateISO4217.java
Expand Up @@ -24,7 +24,7 @@
* @test
* @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759
* 8074350 8074351 8145952 8187946 8193552 8202026 8204269
* 8208746 8209775
* 8208746 8209775 8274658
* @summary Validate ISO 4217 data for Currency class.
*/

Expand Down Expand Up @@ -92,11 +92,11 @@ public class ValidateISO4217 {
{"MF", "EUR", "978", "2"}, // Saint Martin
};

/* Codes that are obsolete, do not have related country */
/* Codes that are obsolete, do not have related country, extra currency */
static final String otherCodes =
"ADP-AFA-ATS-AYM-AZM-BEF-BGL-BOV-BYB-BYR-CHE-CHW-CLF-COU-CUC-CYP-"
+ "DEM-EEK-ESP-FIM-FRF-GHC-GRD-GWP-IEP-ITL-LTL-LUF-LVL-MGF-MRO-MTL-MXV-MZM-NLG-"
+ "PTE-ROL-RUR-SDD-SIT-SKK-SRG-STD-TMM-TPE-TRL-VEF-UYI-USN-USS-VEB-"
+ "PTE-ROL-RUR-SDD-SIT-SKK-SRG-STD-TMM-TPE-TRL-VEF-UYI-USN-USS-VEB-VED-"
+ "XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-"
+ "YUM-ZMK-ZWD-ZWN-ZWR";

Expand Down
6 changes: 3 additions & 3 deletions jdk/test/java/util/Currency/tablea1.txt
@@ -1,12 +1,12 @@
#
#
# Amendments up until ISO 4217 AMENDMENT NUMBER 169
# (As of 27 Aug 2018)
# Amendments up until ISO 4217 AMENDMENT NUMBER 170
# (As of 1 Oct 2021)
#

# Version
FILEVERSION=2
DATAVERSION=169
DATAVERSION=170

# ISO 4217 currency data
AF AFN 971 2
Expand Down
3 changes: 2 additions & 1 deletion jdk/test/sun/text/resources/LocaleData
Expand Up @@ -8303,7 +8303,8 @@ CurrencyNames//azn=Azerbaijan Manat
# bug #8193552
CurrencyNames//mru=Mauritanian Ouguiya

# bug #8208746
# bug #8208746, #8274658
CurrencyNames//ved=Venezuelan Bol\u00edvar Soberano
CurrencyNames//ves=Venezuelan Bol\u00edvar Soberano

# bug# 8206879
Expand Down
4 changes: 2 additions & 2 deletions jdk/test/sun/text/resources/LocaleDataTest.java
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2021, 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
Expand Down Expand Up @@ -38,7 +38,7 @@
* 7114053 7074882 7040556 8013836 8021121 6192407 6931564 8027695 7090826
* 8017142 8037343 8055222 8042126 8074791 8075173 8080774 8129361 8145952
* 8164784 8187946 8195478 8193552 8202026 8204269 8208746 8209775 8234228
* 8250665 8255086
* 8250665 8255086 8274658
* @summary Verify locale data
*
*/
Expand Down

1 comment on commit f8a6695

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.