From e87a2bddafe3949763709658fc185123a9ebf3cf Mon Sep 17 00:00:00 2001
From: Yong Jeffrey Huang <yhuang@openjdk.org>
Date: Wed, 14 Aug 2013 22:49:54 -0700
Subject: [PATCH] 8021121: ISO 4217 Amendment Number 156

Reviewed-by: naoto
---
 jdk/src/share/classes/java/util/CurrencyData.properties   | 4 ++--
 .../sun/util/resources/lv/CurrencyNames_lv_LV.properties  | 3 ++-
 jdk/test/java/util/Currency/tablea1.txt                   | 8 ++++----
 jdk/test/sun/text/resources/LocaleData                    | 2 ++
 jdk/test/sun/text/resources/LocaleDataTest.java           | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/jdk/src/share/classes/java/util/CurrencyData.properties b/jdk/src/share/classes/java/util/CurrencyData.properties
index 4783af39505..a22ddd4b3b6 100644
--- a/jdk/src/share/classes/java/util/CurrencyData.properties
+++ b/jdk/src/share/classes/java/util/CurrencyData.properties
@@ -28,7 +28,7 @@ formatVersion=1
 # Version of the currency code information in this class.
 # It is a serial number that accompanies with each amendment.
 
-dataVersion=155
+dataVersion=156
 
 # List of all valid ISO 4217 currency codes.
 # To ensure compatibility, do not remove codes.
@@ -320,7 +320,7 @@ KG=KGS
 # LAO PEOPLE'S DEMOCRATIC REPUBLIC
 LA=LAK
 # LATVIA
-LV=LVL
+LV=LVL;2013-12-31-22-00-00;EUR
 # LEBANON
 LB=LBP
 # LESOTHO
diff --git a/jdk/src/share/classes/sun/util/resources/lv/CurrencyNames_lv_LV.properties b/jdk/src/share/classes/sun/util/resources/lv/CurrencyNames_lv_LV.properties
index 2a07e7dc6bb..71a952aab05 100644
--- a/jdk/src/share/classes/sun/util/resources/lv/CurrencyNames_lv_LV.properties
+++ b/jdk/src/share/classes/sun/util/resources/lv/CurrencyNames_lv_LV.properties
@@ -1,5 +1,5 @@
 # 
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2013, 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
@@ -35,4 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
+EUR=\u20AC
 LVL=Ls
diff --git a/jdk/test/java/util/Currency/tablea1.txt b/jdk/test/java/util/Currency/tablea1.txt
index 40af4631257..94c848ae880 100644
--- a/jdk/test/java/util/Currency/tablea1.txt
+++ b/jdk/test/java/util/Currency/tablea1.txt
@@ -1,12 +1,12 @@
 #
 #
-# Amendments up until ISO 4217 AMENDMENT NUMBER 155
-#   (As of 11 April 2013)
+# Amendments up until ISO 4217 AMENDMENT NUMBER 156
+#   (As of 23 July 2013)
 #
 
 # Version
 FILEVERSION=1
-DATAVERSION=155
+DATAVERSION=156
 
 # ISO 4217 currency data
 AF	AFN	971	2
@@ -135,7 +135,7 @@ KR	KRW	410	0
 KW	KWD	414	3
 KG	KGS	417	2
 LA	LAK	418	2
-LV	LVL	428	2
+LV	LVL	428	2	2013-12-31-22-00-00	EUR	978	2
 LB	LBP	422	2
 #LS	ZAR	710	2
 LS	LSL	426	2
diff --git a/jdk/test/sun/text/resources/LocaleData b/jdk/test/sun/text/resources/LocaleData
index 4bcb9739295..8a717f64017 100644
--- a/jdk/test/sun/text/resources/LocaleData
+++ b/jdk/test/sun/text/resources/LocaleData
@@ -7679,3 +7679,5 @@ FormatData/pt/MonthAbbreviations/9=out
 FormatData/pt/MonthAbbreviations/10=nov
 FormatData/pt/MonthAbbreviations/11=dez
 
+# bug 8021121
+CurrencyNames/lv_LV/EUR=\u20AC
diff --git a/jdk/test/sun/text/resources/LocaleDataTest.java b/jdk/test/sun/text/resources/LocaleDataTest.java
index 961fcf52be1..09abf98c989 100644
--- a/jdk/test/sun/text/resources/LocaleDataTest.java
+++ b/jdk/test/sun/text/resources/LocaleDataTest.java
@@ -35,7 +35,7 @@
  *      6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787
  *      6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495
  *      7003124 7085757 7028073 7171028 7189611 8000983 7195759 8004489 8006509
- *      7114053 7074882 7040556 8013836
+ *      7114053 7074882 7040556 8013836 8021121
  * @summary Verify locale data
  *
  */