6608572: Currency change for Malta and Cyprus

Summary: Change the respective currencies
Reviewed-by: naoto, jenda

src/share/classes/java/util/CurrencyData.properties

@@ -29,7 +29,7 @@ formatVersion=1
 # It is a serial number that accompanies with each amendment, such as 
 # 'MAxxx.doc'
 
-dataVersion=139
+dataVersion=140
 
 # List of all valid ISO 4217 currency codes.
 # To ensure compatibility, do not remove codes.
@@ -187,7 +187,7 @@ HR=HRK
 # CUBA
 CU=CUP
 # CYPRUS
-CY=CYP
+CY=EUR
 # CZECH REPUBLIC
 CZ=CZK
 # DENMARK
@@ -346,7 +346,7 @@ MV=MVR
 # MALI
 ML=XOF
 # MALTA
-MT=MTL
+MT=EUR
 # MARSHALL ISLANDS
 MH=USD
 # MARTINIQUE

test/java/util/Currency/ValidateISO4217.java

@@ -90,7 +90,7 @@ public class ValidateISO4217 {
 
     /* Codes that are obsolete, do not have related country */
     static final String otherCodes =
-        "ADP-AFA-ATS-AYM-BEF-BGL-BOV-BYB-CLF-DEM-ESP-FIM-FRF-GRD-GWP-IEP-ITL-LUF-MGF-MXV-NLG-PTE-RUR-SDD-SIT-SRG-TPE-TRL-VEF-USN-USS-XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XTS-XXX-YUM-ZWN";
+        "ADP-AFA-ATS-AYM-BEF-BGL-BOV-BYB-CLF-CYP-DEM-ESP-FIM-FRF-GRD-GWP-IEP-ITL-LUF-MGF-MTL-MXV-NLG-PTE-RUR-SDD-SIT-SRG-TPE-TRL-VEF-USN-USS-XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XTS-XXX-YUM-ZWN";
 
     static boolean err = false;
 

test/java/util/Currency/tablea1.txt

 #
 #
-# Based on BSi's ISO4217 data - "TABLE A1.doc" + amendments up until MA139.doc
-#   (As of 18 June  2007)
+# Based on BSi's ISO4217 data - "TABLE A1.doc" + amendments up until MA140.doc
+#   (As of 24 September  2007)
 #
 
 # Version
 FILEVERSION=1
-DATAVERSION=139
+DATAVERSION=140
 
 # ISO 4217 currency data
 AF	AFN	971	2
@@ -68,7 +68,7 @@ CR	CRC	188	2
 CI	XOF	952	0
 HR	HRK	191	2
 CU	CUP	192	2
-CY	CYP	196	2
+CY	EUR	978	2
 CZ	CZK	203	2
 DK	DKK	208	2
 DJ	DJF	262	0
@@ -149,7 +149,7 @@ MW	MWK	454	2
 MY	MYR	458	2
 MV	MVR	462	2
 ML	XOF	952	0
-MT	MTL	470	2
+MT	EUR	978	2
 MH	USD	840	2
 MQ	EUR	978	2
 MR	MRO	478	2