ICU-10434 tzdata2013i to ICU4J

X-SVN-Rev: 34829

diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index cd7a22d3fc4318e7988d8ba950be5ee7af5d79e6..bbcadb56b2c616294da05c4a6067fc7328c5819d 100755 (executable)
--- a/icu4j/main/shared/data/icutzdata.jar
+++ b/icu4j/main/shared/data/icutzdata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:73f64fdcce5632f238ef2f48a18dc8ce92ae9498b8f9af67c618d9302f24b034
-size 97708
+oid sha256:19cc70f636c04ef9a4550063aa4d5ede9f54339e15141ce369c0979d0a376d46
+size 90801

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
index 446c970373c963d81c2206092d573567cded005a..b572c05f66ebf1d4c49ee68e071d1465dc746f27 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
@@ -1,6 +1,6 @@
 /**
  *******************************************************************************
- * Copyright (C) 2000-2013, International Business Machines Corporation and    *
+ * Copyright (C) 2000-2014, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -1798,7 +1798,8 @@ public class TimeZoneTest extends TestFmwk
             {"Europe/Helsinki",                 "FI"},
             {"Europe/Mariehamn",                "AX"},  // Link Europe/Helsinki, but in zone.tab
             {"Asia/Riyadh",                     "SA"},
-            {"Asia/Riyadh87",                   "001"}, // this should be "SA" actually, but not in zone.tab
+            // tz file solar87 was removed from tzdata2013i
+            // {"Asia/Riyadh87",                   "001"}, // this should be "SA" actually, but not in zone.tab
             {"Etc/Unknown",                     null},  // CLDR canonical, but not a sysmte zone ID
             {"bogus",                           null},  // bogus
             {"GMT+08:00",                       null},  // a custom ID, not a system zone ID