Skip to content

Commit

Permalink
8283277: ISO 4217 Amendment 171 Update
Browse files Browse the repository at this point in the history
Backport-of: c4dc58e12e197562dce90c0027aa74c29047cea6
  • Loading branch information
GoeLin committed Aug 6, 2022
1 parent b284851 commit bb31cd9
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 14 deletions.
8 changes: 4 additions & 4 deletions make/data/currency/CurrencyData.properties
@@ -1,5 +1,5 @@
#
# Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2000, 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
Expand Down Expand Up @@ -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=170
dataVersion=171

# List of all valid ISO 4217 currency codes.
# To ensure compatibility, do not remove codes.
Expand All @@ -51,7 +51,7 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036
MTL470-MUR480-MVR462-MWK454-MXN484-MXV979-MYR458-MZM508-MZN943-NAD516-NGN566-\
NIO558-NLG528-NOK578-NPR524-NZD554-OMR512-PAB590-PEN604-PGK598-PHP608-\
PKR586-PLN985-PTE620-PYG600-QAR634-ROL642-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\
SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\
SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLE925-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-VED926-VEF937-VES928-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
Expand Down Expand Up @@ -484,7 +484,7 @@ CS=CSD
# SEYCHELLES
SC=SCR
# SIERRA LEONE
SL=SLL
SL=SLE
# SINGAPORE
SG=SGD
# SLOVAKIA
Expand Down
@@ -1,5 +1,5 @@
#
# Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2005, 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
Expand Down Expand Up @@ -221,6 +221,7 @@ SGD=SGD
SHP=SHP
SIT=SIT
SKK=SKK
SLE=SLE
SLL=SLL
SOS=SOS
SRD=SRD
Expand Down Expand Up @@ -445,6 +446,7 @@ sgd=Singapore Dollar
shp=Saint Helena Pound
sit=Slovenian Tolar
skk=Slovak Koruna
sle=Sierra Leonean Leone
sll=Sierra Leonean Leone
sos=Somali Shilling
srd=Surinamese Dollar
Expand Down
6 changes: 3 additions & 3 deletions test/jdk/java/util/Currency/ValidateISO4217.java
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 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
Expand All @@ -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
* 8208746 8209775 8264792 8274658 8283277
* @summary Validate ISO 4217 data for Currency class.
* @modules java.base/java.util:open
* jdk.localedata
Expand Down Expand Up @@ -101,7 +101,7 @@ public class ValidateISO4217 {
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-VED-"
+ "PTE-ROL-RUR-SDD-SIT-SLL-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
8 changes: 4 additions & 4 deletions test/jdk/java/util/Currency/tablea1.txt
@@ -1,12 +1,12 @@
#
#
# Amendments up until ISO 4217 AMENDMENT NUMBER 170
# (As of 1 Oct 2021)
# Amendments up until ISO 4217 AMENDMENT NUMBER 171
# (As of 16 Mar 2022)
#

# Version
FILEVERSION=3
DATAVERSION=170
DATAVERSION=171

# ISO 4217 currency data
AF AFN 971 2
Expand Down Expand Up @@ -218,7 +218,7 @@ RS RSD 941 2
CS CSD 891 2
#CS EUR 978 2
SC SCR 690 2
SL SLL 694 2
SL SLE 925 2
SG SGD 702 2
SK EUR 978 2
# MA 131
Expand Down
1 change: 1 addition & 0 deletions test/jdk/sun/text/resources/LocaleData
Expand Up @@ -6448,6 +6448,7 @@ CurrencyNames//rsd=Serbian Dinar
CurrencyNames//scr=Seychellois Rupee
CurrencyNames//sdd=Sudanese Dinar (1992-2007)
CurrencyNames//sit=Slovenian Tolar
CurrencyNames//sle=Sierra Leonean Leone
CurrencyNames//sll=Sierra Leonean Leone
CurrencyNames//srd=Surinamese Dollar
CurrencyNames//srg=Surinamese Guilder
Expand Down
4 changes: 2 additions & 2 deletions test/jdk/sun/text/resources/LocaleDataTest.java
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 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
Expand Down Expand Up @@ -40,7 +40,7 @@
* 8145136 8145952 8164784 8037111 8081643 7037368 8178872 8185841 8190918
* 8187946 8195478 8181157 8179071 8193552 8202026 8204269 8202537 8208746
* 8209775 8221432 8227127 8230284 8231273 8233579 8234288 8250665 8255086
* 8251317 8274658
* 8251317 8274658 8283277
* @summary Verify locale data
* @modules java.base/sun.util.resources
* @modules jdk.localedata
Expand Down

1 comment on commit bb31cd9

@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.