--- a/make/data/currency/CurrencyData.properties	Wed Jun 06 09:07:38 2018 +0530
+++ b/make/data/currency/CurrencyData.properties	Tue Jun 05 23:06:32 2018 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2018, 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
@@ -32,7 +32,7 @@
 # Version of the currency code information in this class.
 # It is a serial number that accompanies with each amendment.
 
-dataVersion=164
+dataVersion=167
 
 # List of all valid ISO 4217 currency codes.
 # To ensure compatibility, do not remove codes.
@@ -47,7 +47,7 @@
     HRK191-HTG332-HUF348-IDR360-IEP372-ILS376-INR356-IQD368-IRR364-ISK352-\
     ITL380-JMD388-JOD400-JPY392-KES404-KGS417-KHR116-KMF174-KPW408-KRW410-\
     KWD414-KYD136-KZT398-LAK418-LBP422-LKR144-LRD430-LSL426-LTL440-LUF442-\
-    LVL428-LYD434-MAD504-MDL498-MGA969-MGF450-MKD807-MMK104-MNT496-MOP446-MRO478-\
+    LVL428-LYD434-MAD504-MDL498-MGA969-MGF450-MKD807-MMK104-MNT496-MOP446-MRO478-MRU929-\
     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-ROL946-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\
@@ -324,7 +324,7 @@
 # LAO PEOPLE'S DEMOCRATIC REPUBLIC (THE)
 LA=LAK
 # LATVIA
-LV=LVL;2013-12-31-22-00-00;EUR
+LV=EUR
 # LEBANON
 LB=LBP
 # LESOTHO
@@ -336,7 +336,7 @@
 # LIECHTENSTEIN
 LI=CHF
 # LITHUANIA
-LT=LTL;2014-12-31-22-00-00;EUR
+LT=EUR
 # LUXEMBOURG
 LU=EUR
 # MACAU
@@ -360,7 +360,7 @@
 # MARTINIQUE
 MQ=EUR
 # MAURITANIA
-MR=MRO
+MR=MRU
 # MAURITIUS
 MU=MUR
 # MAYOTTE

--- a/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties	Wed Jun 06 09:07:38 2018 +0530
+++ b/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties	Tue Jun 05 23:06:32 2018 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2018, 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
@@ -178,6 +178,7 @@
 MNT=MNT
 MOP=MOP
 MRO=MRO
+MRU=MRU
 MTL=MTL
 MUR=MUR
 MVR=MVR
@@ -399,6 +400,7 @@
 mnt=Mongolian Tugrik
 mop=Macanese Pataca
 mro=Mauritanian Ouguiya
+mru=Mauritanian Ouguiya
 mtl=Maltese Lira
 mur=Mauritian Rupee
 mvr=Maldivian Rufiyaa

--- a/test/jdk/java/util/Currency/ValidateISO4217.java	Wed Jun 06 09:07:38 2018 +0530
+++ b/test/jdk/java/util/Currency/ValidateISO4217.java	Tue Jun 05 23:06:32 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -23,7 +23,7 @@
 /*
  * @test
  * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759
- *      8039317 8074350 8074351 8145952 8187946
+ *      8039317 8074350 8074351 8145952 8187946 8193552 8202026 8204269
  * @summary Validate ISO 4217 data for Currency class.
  * @modules java.base/java.util:open
  *          jdk.localedata
@@ -96,7 +96,7 @@
     /* Codes that are obsolete, do not have related country */
     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-LUF-MGF-MTL-MXV-MZM-NLG-"
+        + "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-"
         + "XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-"
         + "YUM-ZMK-ZWD-ZWN-ZWR";

--- a/test/jdk/java/util/Currency/tablea1.txt	Wed Jun 06 09:07:38 2018 +0530
+++ b/test/jdk/java/util/Currency/tablea1.txt	Tue Jun 05 23:06:32 2018 -0700
@@ -1,12 +1,12 @@
 #
 #
-# Amendments up until ISO 4217 AMENDMENT NUMBER 164
-#   (As of 22 September 2017)
+# Amendments up until ISO 4217 AMENDMENT NUMBER 167
+#   (As of 4 June 2018)
 #
 
 # Version
 FILEVERSION=3
-DATAVERSION=164
+DATAVERSION=167
 
 # ISO 4217 currency data
 AF	AFN	971	2
@@ -135,14 +135,14 @@
 KW	KWD	414	3
 KG	KGS	417	2
 LA	LAK	418	2
-LV	LVL	428	2	2013-12-31-22-00-00	EUR	978	2
+LV	EUR	978	2
 LB	LBP	422	2
 #LS	ZAR	710	2
 LS	LSL	426	2
 LR	LRD	430	2
 LY	LYD	434	3
 LI	CHF	756	2
-LT	LTL	440	2	2014-12-31-22-00-00	EUR	978	2
+LT	EUR	978	2
 LU	EUR	978	2
 MO	MOP	446	2
 MK	MKD	807	2
@@ -154,7 +154,7 @@
 MT	EUR	978	2
 MH	USD	840	2
 MQ	EUR	978	2
-MR	MRO	478	2
+MR	MRU	929	2
 MU	MUR	480	2
 YT	EUR	978	2
 MX	MXN	484	2

--- a/test/jdk/sun/text/resources/LocaleData	Wed Jun 06 09:07:38 2018 +0530
+++ b/test/jdk/sun/text/resources/LocaleData	Tue Jun 05 23:06:32 2018 -0700
@@ -8317,3 +8317,6 @@
 CurrencyNames//lak=Lao Kip
 CurrencyNames//php=Philippine Piso
 CurrencyNames//azn=Azerbaijan Manat
+
+# bug $8193552
+CurrencyNames//mru=Mauritanian Ouguiya

--- a/test/jdk/sun/text/resources/LocaleDataTest.java	Wed Jun 06 09:07:38 2018 +0530
+++ b/test/jdk/sun/text/resources/LocaleDataTest.java	Tue Jun 05 23:06:32 2018 -0700
@@ -38,7 +38,7 @@
  *      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
+ *      8187946 8195478 8181157 8179071 8193552 8202026 8204269
  * @summary Verify locale data
  * @modules java.base/sun.util.resources
  * @modules jdk.localedata