From 96f85348b2d76c62b2beebd8912e14f0a84c0ce5 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Tue, 6 Mar 2012 23:21:24 +0000 Subject: [PATCH] ICU-8783 Updated tz related data to 2012b level X-SVN-Rev: 31599 --- src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java | 6 +++--- src/com/ibm/icu/impl/data/icudata.jar | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java b/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java index c56d82cc961..7f888b806dd 100644 --- a/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java +++ b/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java @@ -1,6 +1,6 @@ /** ******************************************************************************* - * Copyright (C) 2000-2011, International Business Machines Corporation and * + * Copyright (C) 2000-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -107,7 +107,7 @@ public class TimeZoneTest extends TestFmwk public void TestShortZoneIDs() throws Exception { ZoneDescriptor[] JDK_116_REFERENCE_LIST = { - new ZoneDescriptor("MIT", -660, true), // updated to false when merging 2010j + new ZoneDescriptor("MIT", 780, false), // Pacific/Apia +13:00 as of 2012b new ZoneDescriptor("HST", -600, false), new ZoneDescriptor("AST", -540, true), new ZoneDescriptor("PST", -480, true), @@ -133,7 +133,7 @@ public class TimeZoneTest extends TestFmwk // This is a standard Unix zone, so don't remap it - Liu 3Jan01 // new ZoneDescriptor("NET", 240, false); // As of bug 4191164, fix NET - new ZoneDescriptor("NET", 240, true), + new ZoneDescriptor("NET", 240, false), // Asia/Yerevan - no DST as of 2012b // PLT behaves differently under different JDKs, so we don't check it // new ZoneDescriptor("PLT", 300, false), // updated Oct 2003 aliu new ZoneDescriptor("IST", 330, false), diff --git a/src/com/ibm/icu/impl/data/icudata.jar b/src/com/ibm/icu/impl/data/icudata.jar index 4560f7ce81d..4433c58c2cc 100755 --- a/src/com/ibm/icu/impl/data/icudata.jar +++ b/src/com/ibm/icu/impl/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb685decf2fc23072d1e14da657cda2dce196c0afd34c81908e8288fae1a859c -size 5460576 +oid sha256:274a67cf194c7fa70e9034de8a5b8cccb2950733ffd3babac1d509d978d7c487 +size 5456211