# HG changeset patch # User yhuang # Date 1409815963 25200 # Node ID 13499e3d43df0f804bbb2646f88825c7e89d9adc # Parent a828828378f66e810b0d1fcb7c4d54019d597fe9 8055222: ISO 4217 Amendment #159 Reviewed-by: naoto diff -r a828828378f6 -r 13499e3d43df jdk/make/data/currency/CurrencyData.properties --- a/jdk/make/data/currency/CurrencyData.properties Wed Sep 03 17:08:58 2014 +0200 +++ b/jdk/make/data/currency/CurrencyData.properties Thu Sep 04 00:32:43 2014 -0700 @@ -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 @@ # 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 @@ # LIECHTENSTEIN LI=CHF # LITHUANIA -LT=LTL +LT=LTL;2014-12-31-22-00-00;EUR # LUXEMBOURG LU=EUR # MACAU diff -r a828828378f6 -r 13499e3d43df jdk/src/jdk.localedata/share/classes/sun/util/resources/lt/CurrencyNames_lt_LT.properties --- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/lt/CurrencyNames_lt_LT.properties Wed Sep 03 17:08:58 2014 +0200 +++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/lt/CurrencyNames_lt_LT.properties Thu Sep 04 00:32:43 2014 -0700 @@ -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 -r a828828378f6 -r 13499e3d43df jdk/test/java/util/Currency/tablea1.txt --- a/jdk/test/java/util/Currency/tablea1.txt Wed Sep 03 17:08:58 2014 +0200 +++ b/jdk/test/java/util/Currency/tablea1.txt Thu Sep 04 00:32:43 2014 -0700 @@ -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 @@ 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 -r a828828378f6 -r 13499e3d43df jdk/test/sun/text/resources/LocaleData --- a/jdk/test/sun/text/resources/LocaleData Wed Sep 03 17:08:58 2014 +0200 +++ b/jdk/test/sun/text/resources/LocaleData Thu Sep 04 00:32:43 2014 -0700 @@ -7696,3 +7696,6 @@ # 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 -r a828828378f6 -r 13499e3d43df jdk/test/sun/text/resources/LocaleDataTest.java --- a/jdk/test/sun/text/resources/LocaleDataTest.java Wed Sep 03 17:08:58 2014 +0200 +++ b/jdk/test/sun/text/resources/LocaleDataTest.java Thu Sep 04 00:32:43 2014 -0700 @@ -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 8017142 - * 8037343 + * 8037343 8055222 * @summary Verify locale data * */