Skip to content

Commit f2eeda6

Browse files
committed
8283277: ISO 4217 Amendment 171 Update
Backport-of: c4dc58e12e197562dce90c0027aa74c29047cea6
1 parent 71f28e3 commit f2eeda6

File tree

6 files changed

+17
-14
lines changed

6 files changed

+17
-14
lines changed

make/data/currency/CurrencyData.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ formatVersion=3
3232
# Version of the currency code information in this class.
3333
# It is a serial number that accompanies with each amendment.
3434

35-
dataVersion=170
35+
dataVersion=171
3636

3737
# List of all valid ISO 4217 currency codes.
3838
# To ensure compatibility, do not remove codes.
@@ -51,7 +51,7 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036
5151
MTL470-MUR480-MVR462-MWK454-MXN484-MXV979-MYR458-MZM508-MZN943-NAD516-NGN566-\
5252
NIO558-NLG528-NOK578-NPR524-NZD554-OMR512-PAB590-PEN604-PGK598-PHP608-\
5353
PKR586-PLN985-PTE620-PYG600-QAR634-ROL642-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\
54-
SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\
54+
SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLE925-SLL694-SOS706-\
5555
SRD968-SRG740-SSP728-STD678-STN930-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
5656
TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-UYI940-\
5757
UYU858-UZS860-VEB862-VED926-VEF937-VES928-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
@@ -484,7 +484,7 @@ CS=CSD
484484
# SEYCHELLES
485485
SC=SCR
486486
# SIERRA LEONE
487-
SL=SLL
487+
SL=SLE
488488
# SINGAPORE
489489
SG=SGD
490490
# SLOVAKIA

src/java.base/share/classes/sun/util/resources/CurrencyNames.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -221,6 +221,7 @@ SGD=SGD
221221
SHP=SHP
222222
SIT=SIT
223223
SKK=SKK
224+
SLE=SLE
224225
SLL=SLL
225226
SOS=SOS
226227
SRD=SRD
@@ -445,6 +446,7 @@ sgd=Singapore Dollar
445446
shp=Saint Helena Pound
446447
sit=Slovenian Tolar
447448
skk=Slovak Koruna
449+
sle=Sierra Leonean Leone
448450
sll=Sierra Leonean Leone
449451
sos=Somali Shilling
450452
srd=Surinamese Dollar

test/jdk/java/util/Currency/ValidateISO4217.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
2424
* @test
2525
* @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759
2626
* 8039317 8074350 8074351 8145952 8187946 8193552 8202026 8204269
27-
* 8208746 8209775 8264792 8274658
27+
* 8208746 8209775 8264792 8274658 8283277
2828
* @summary Validate ISO 4217 data for Currency class.
2929
* @modules java.base/java.util:open
3030
* jdk.localedata
@@ -101,7 +101,7 @@ public class ValidateISO4217 {
101101
static final String otherCodes =
102102
"ADP-AFA-ATS-AYM-AZM-BEF-BGL-BOV-BYB-BYR-CHE-CHW-CLF-COU-CUC-CYP-"
103103
+ "DEM-EEK-ESP-FIM-FRF-GHC-GRD-GWP-IEP-ITL-LTL-LUF-LVL-MGF-MRO-MTL-MXV-MZM-NLG-"
104-
+ "PTE-ROL-RUR-SDD-SIT-SKK-SRG-STD-TMM-TPE-TRL-VEF-UYI-USN-USS-VEB-VED-"
104+
+ "PTE-ROL-RUR-SDD-SIT-SLL-SKK-SRG-STD-TMM-TPE-TRL-VEF-UYI-USN-USS-VEB-VED-"
105105
+ "XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-"
106106
+ "YUM-ZMK-ZWD-ZWN-ZWR";
107107

test/jdk/java/util/Currency/tablea1.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#
22
#
3-
# Amendments up until ISO 4217 AMENDMENT NUMBER 170
4-
# (As of 1 Oct 2021)
3+
# Amendments up until ISO 4217 AMENDMENT NUMBER 171
4+
# (As of 16 Mar 2022)
55
#
66

77
# Version
88
FILEVERSION=3
9-
DATAVERSION=170
9+
DATAVERSION=171
1010

1111
# ISO 4217 currency data
1212
AF AFN 971 2
@@ -218,7 +218,7 @@ RS RSD 941 2
218218
CS CSD 891 2
219219
#CS EUR 978 2
220220
SC SCR 690 2
221-
SL SLL 694 2
221+
SL SLE 925 2
222222
SG SGD 702 2
223223
SK EUR 978 2
224224
# MA 131

test/jdk/sun/text/resources/LocaleData

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6448,6 +6448,7 @@ CurrencyNames//rsd=Serbian Dinar
64486448
CurrencyNames//scr=Seychellois Rupee
64496449
CurrencyNames//sdd=Sudanese Dinar (1992-2007)
64506450
CurrencyNames//sit=Slovenian Tolar
6451+
CurrencyNames//sle=Sierra Leonean Leone
64516452
CurrencyNames//sll=Sierra Leonean Leone
64526453
CurrencyNames//srd=Surinamese Dollar
64536454
CurrencyNames//srg=Surinamese Guilder

test/jdk/sun/text/resources/LocaleDataTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@
4040
* 8145136 8145952 8164784 8037111 8081643 7037368 8178872 8185841 8190918
4141
* 8187946 8195478 8181157 8179071 8193552 8202026 8204269 8202537 8208746
4242
* 8209775 8221432 8227127 8230284 8231273 8233579 8234288 8250665 8255086
43-
* 8251317 8274658
43+
* 8251317 8274658 8283277
4444
* @summary Verify locale data
4545
* @modules java.base/sun.util.resources
4646
* @modules jdk.localedata

0 commit comments

Comments
 (0)