# HG changeset patch
# User ljiang
# Date 1535511941 25200
# Node ID 67092c6be8e1ee56cd80fd16a0c70e2a69a0241b
# Parent  8896112226cb4c727ef5d2a683aeafa8946edcda
8208746: ISO 4217 Amendment #168 update
8209775: ISO 4217 Amendment #169 update
Reviewed-by: naoto

diff -r 8896112226cb -r 67092c6be8e1 make/data/currency/CurrencyData.properties
--- a/make/data/currency/CurrencyData.properties	Wed Aug 29 08:00:00 2018 +0200
+++ b/make/data/currency/CurrencyData.properties	Tue Aug 28 20:05:41 2018 -0700
@@ -32,7 +32,7 @@
 # Version of the currency code information in this class.
 # It is a serial number that accompanies with each amendment.
 
-dataVersion=167
+dataVersion=169
 
 # List of all valid ISO 4217 currency codes.
 # To ensure compatibility, do not remove codes.
@@ -54,7 +54,7 @@
     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-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
+    UYU858-UZS860-VEB862-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
@@ -509,7 +509,7 @@
 SJ=NOK
 # Sint Maarten (Dutch part)
 SX=ANG
-# SWAZILAND
+# ESWATINI
 SZ=SZL
 # SWEDEN
 SE=SEK
@@ -564,7 +564,7 @@
 # VANUATU
 VU=VUV
 # VENEZUELA (BOLIVARIAN REPUBLIC OF)
-VE=VEF
+VE=VES
 # VIET NAM
 VN=VND
 # VIRGIN ISLANDS, BRITISH
diff -r 8896112226cb -r 67092c6be8e1 src/java.base/share/classes/sun/util/resources/CurrencyNames.properties
--- a/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties	Wed Aug 29 08:00:00 2018 +0200
+++ b/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties	Tue Aug 28 20:05:41 2018 -0700
@@ -252,6 +252,7 @@
 UZS=UZS
 VEB=VEB
 VEF=VEF
+VES=VES
 VND=VND
 VUV=VUV
 WST=WST
@@ -421,7 +422,7 @@
 pab=Panamanian Balboa
 pen=Peruvian Sol
 pgk=Papua New Guinean Kina
-php=Philippine Piso
+php=Philippine Peso
 pkr=Pakistani Rupee
 pln=Polish Zloty
 pte=Portuguese Escudo
@@ -474,6 +475,7 @@
 uzs=Uzbekistan Som
 veb=Venezuelan Bol\u00edvar (1871-2008)
 vef=Venezuelan Bol\u00edvar
+ves=Venezuelan Bol\u00edvar Soberano
 vnd=Vietnamese Dong
 vuv=Vanuatu Vatu
 wst=Samoan Tala
diff -r 8896112226cb -r 67092c6be8e1 test/jdk/java/util/Currency/ValidateISO4217.java
--- a/test/jdk/java/util/Currency/ValidateISO4217.java	Wed Aug 29 08:00:00 2018 +0200
+++ b/test/jdk/java/util/Currency/ValidateISO4217.java	Tue Aug 28 20:05:41 2018 -0700
@@ -24,6 +24,7 @@
  * @test
  * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759
  *      8039317 8074350 8074351 8145952 8187946 8193552 8202026 8204269
+ *      8208746 8209775
  * @summary Validate ISO 4217 data for Currency class.
  * @modules java.base/java.util:open
  *          jdk.localedata
diff -r 8896112226cb -r 67092c6be8e1 test/jdk/java/util/Currency/tablea1.txt
--- a/test/jdk/java/util/Currency/tablea1.txt	Wed Aug 29 08:00:00 2018 +0200
+++ b/test/jdk/java/util/Currency/tablea1.txt	Tue Aug 28 20:05:41 2018 -0700
@@ -1,12 +1,12 @@
 #
 #
-# Amendments up until ISO 4217 AMENDMENT NUMBER 167
-#   (As of 4 June 2018)
+# Amendments up until ISO 4217 AMENDMENT NUMBER 169
+#   (As of 27 Aug 2018)
 #
 
 # Version
 FILEVERSION=3
-DATAVERSION=167
+DATAVERSION=169
 
 # ISO 4217 currency data
 AF	AFN	971	2
@@ -268,7 +268,7 @@
 #UY	UYI	940	0
 UZ	UZS	860	2
 VU	VUV	548	0
-VE	VEF	937	2
+VE	VES	928	2
 VN	VND	704	0
 VG	USD	840	2
 VI	USD	840	2
diff -r 8896112226cb -r 67092c6be8e1 test/jdk/sun/text/resources/LocaleData
--- a/test/jdk/sun/text/resources/LocaleData	Wed Aug 29 08:00:00 2018 +0200
+++ b/test/jdk/sun/text/resources/LocaleData	Tue Aug 28 20:05:41 2018 -0700
@@ -8315,8 +8315,11 @@
 # bug #8187946
 CurrencyNames//stn=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra
 CurrencyNames//lak=Lao Kip
-CurrencyNames//php=Philippine Piso
+CurrencyNames//php=Philippine Peso
 CurrencyNames//azn=Azerbaijan Manat
 
-# bug $8193552
+# bug #8193552
 CurrencyNames//mru=Mauritanian Ouguiya
+
+# bug #8208746
+CurrencyNames//ves=Venezuelan Bol\u00edvar Soberano
diff -r 8896112226cb -r 67092c6be8e1 test/jdk/sun/text/resources/LocaleDataTest.java
--- a/test/jdk/sun/text/resources/LocaleDataTest.java	Wed Aug 29 08:00:00 2018 +0200
+++ b/test/jdk/sun/text/resources/LocaleDataTest.java	Tue Aug 28 20:05:41 2018 -0700
@@ -38,7 +38,8 @@
  *      7114053 7074882 7040556 8008577 8013836 8021121 6192407 6931564 8027695
  *      8017142 8037343 8055222 8042126 8074791 8075173 8080774 8129361 8134916
  *      8145136 8145952 8164784 8037111 8081643 7037368 8178872 8185841 8190918
- *      8187946 8195478 8181157 8179071 8193552 8202026 8204269 8202537
+ *      8187946 8195478 8181157 8179071 8193552 8202026 8204269 8202537 8208746
+ *      8209775
  * @summary Verify locale data
  * @modules java.base/sun.util.resources
  * @modules jdk.localedata