aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryhuang <none@none>2014-09-08 20:01:46 -0700
committeryhuang <none@none>2014-09-08 20:01:46 -0700
commit26cbe8bceb60b91babe05eae635887229e025380 (patch)
treec93b9dfa99859baabcb65da0a66cf7de2668ac60
parent5f7fe727eaf007fdd23cb5fdef25de513e11e9ef (diff)
8055222: Currency update needed for ISO 4217 Amendment #159jdk8u31-b08
Reviewed-by: naoto
-rw-r--r--src/share/classes/java/util/CurrencyData.properties6
-rw-r--r--src/share/classes/sun/util/resources/lt/CurrencyNames_lt_LT.properties3
-rw-r--r--test/java/util/Currency/tablea1.txt8
-rw-r--r--test/sun/text/resources/LocaleData3
-rw-r--r--test/sun/text/resources/LocaleDataTest.java4
5 files changed, 14 insertions, 10 deletions
diff --git a/src/share/classes/java/util/CurrencyData.properties b/src/share/classes/java/util/CurrencyData.properties
index a22ddd4b3..2b5a57049 100644
--- a/src/share/classes/java/util/CurrencyData.properties
+++ b/src/share/classes/java/util/CurrencyData.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2014, 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
@@ -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=156
+dataVersion=159
# List of all valid ISO 4217 currency codes.
# To ensure compatibility, do not remove codes.
@@ -332,7 +332,7 @@ LY=LYD
# LIECHTENSTEIN
LI=CHF
# LITHUANIA
-LT=LTL
+LT=LTL;2014-12-31-22-00-00;EUR
# LUXEMBOURG
LU=EUR
# MACAU
diff --git a/src/share/classes/sun/util/resources/lt/CurrencyNames_lt_LT.properties b/src/share/classes/sun/util/resources/lt/CurrencyNames_lt_LT.properties
index f7275219e..a0884fafe 100644
--- a/src/share/classes/sun/util/resources/lt/CurrencyNames_lt_LT.properties
+++ b/src/share/classes/sun/util/resources/lt/CurrencyNames_lt_LT.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2014, 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
LTL=Lt
diff --git a/test/java/util/Currency/tablea1.txt b/test/java/util/Currency/tablea1.txt
index 94c848ae8..298856753 100644
--- a/test/java/util/Currency/tablea1.txt
+++ b/test/java/util/Currency/tablea1.txt
@@ -1,12 +1,12 @@
#
#
-# Amendments up until ISO 4217 AMENDMENT NUMBER 156
-# (As of 23 July 2013)
+# Amendments up until ISO 4217 AMENDMENT NUMBER 159
+# (As of 15 August 2014)
#
# Version
FILEVERSION=1
-DATAVERSION=156
+DATAVERSION=159
# ISO 4217 currency data
AF AFN 971 2
@@ -142,7 +142,7 @@ LS LSL 426 2
LR LRD 430 2
LY LYD 434 3
LI CHF 756 2
-LT LTL 440 2
+LT LTL 440 2 2014-12-31-22-00-00 EUR 978 2
LU EUR 978 2
MO MOP 446 2
MK MKD 807 2
diff --git a/test/sun/text/resources/LocaleData b/test/sun/text/resources/LocaleData
index 9365989c2..9dca93b6e 100644
--- a/test/sun/text/resources/LocaleData
+++ b/test/sun/text/resources/LocaleData
@@ -7699,3 +7699,6 @@ FormatData/es_EC/TimePatterns/3=H:mm
# bug 8037343
FormatData/es_DO/DatePatterns/2=dd/MM/yyyy
FormatData/es_DO/DatePatterns/3=dd/MM/yy
+
+# bug 8055222
+CurrencyNames/lt_LT/EUR=\u20AC
diff --git a/test/sun/text/resources/LocaleDataTest.java b/test/sun/text/resources/LocaleDataTest.java
index e7245e655..e2cea1ab1 100644
--- a/test/sun/text/resources/LocaleDataTest.java
+++ b/test/sun/text/resources/LocaleDataTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, 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
@@ -36,7 +36,7 @@
* 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495
* 7003124 7085757 7028073 7171028 7189611 8000983 7195759 8004489 8006509
* 7114053 7074882 7040556 8013836 8021121 6192407 6931564 8027695 7090826
- * 8017142 8037343
+ * 8017142 8037343 8055222
* @summary Verify locale data
*
*/