From 7bc2decc9e40ce953be7c9d1a137460163c22283 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Fri, 24 Jul 2009 19:02:13 +0000 Subject: [PATCH] ICU-7075 Update ICU4J version to 4.3.2 X-SVN-Rev: 26432 --- icu4j/build.properties | 2 +- .../classes/core/src/com/ibm/icu/util/VersionInfo.java | 2 +- icu4j/main/shared/build/common.properties | 5 ++--- .../com/ibm/icu/dev/test/charset/TestConversion.java | 8 ++++---- .../ibm/icu/dev/test/format/DateTimeGeneratorTest.java | 2 +- .../com/ibm/icu/dev/test/translit/RoundTripTest.java | 10 +++++----- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/icu4j/build.properties b/icu4j/build.properties index 192a0c43ee..3baaf06845 100644 --- a/icu4j/build.properties +++ b/icu4j/build.properties @@ -2,5 +2,5 @@ #* Copyright (C) 2009, International Business Machines Corporation and * #* others. All Rights Reserved. * #******************************************************************************* -api.report.version = 431 +api.report.version = 432 api.report.prev.version = 421 diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java b/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java index 0bf2b0dc67..5dd5c2b165 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java @@ -452,7 +452,7 @@ public final class VersionInfo implements Comparable UNICODE_4_1 = getInstance(4, 1, 0, 0); UNICODE_5_0 = getInstance(5, 0, 0, 0); UNICODE_5_1 = getInstance(5, 1, 0, 0); - ICU_VERSION = getInstance(4, 3, 1, 0); + ICU_VERSION = getInstance(4, 3, 2, 0); UCOL_RUNTIME_VERSION = getInstance(6); UCOL_BUILDER_VERSION = getInstance(7); UCOL_TAILORINGS_VERSION = getInstance(1); diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties index 685c7537a3..c4d694bf24 100644 --- a/icu4j/main/shared/build/common.properties +++ b/icu4j/main/shared/build/common.properties @@ -4,9 +4,8 @@ #******************************************************************************* # Version numbers, etc. -icu4j.spec.version = 4.3.1 -icu4j.impl.version = 4.3.1 -icu4j.data.version = 42 +icu4j.spec.version = 4.3.2 +icu4j.impl.version = 4.3.2 current.year = 2009 corp = IBM Corporation diff --git a/icu4j/main/tests/charset/src/com/ibm/icu/dev/test/charset/TestConversion.java b/icu4j/main/tests/charset/src/com/ibm/icu/dev/test/charset/TestConversion.java index bdf894745a..99d9e457e3 100644 --- a/icu4j/main/tests/charset/src/com/ibm/icu/dev/test/charset/TestConversion.java +++ b/icu4j/main/tests/charset/src/com/ibm/icu/dev/test/charset/TestConversion.java @@ -214,7 +214,7 @@ public class TestConversion extends ModuleTest { } } catch (Exception e) { - if (skipIfBeforeICU(4,3,1)) { // TIME BOMB + if (skipIfBeforeICU(4,3,2)) { // TIME BOMB logln("Skipping test:(" + cc.charset + ") due to ICU Charset not supported at this time"); } else { errln(cc.charset + " was not found"); @@ -496,7 +496,7 @@ public class TestConversion extends ModuleTest { } catch (Exception e) { // TODO implement loading of test data. - if (skipIfBeforeICU(4,3,1)) { + if (skipIfBeforeICU(4,3,2)) { logln("Skipping test:(" + cc.charset + ") due to ICU Charset not supported at this time"); } else { errln(cc.charset + " was not found"); @@ -1096,7 +1096,7 @@ public class TestConversion extends ModuleTest { // test to see if the conversion matches actual results if (output.limit() != expected.length()) { - if (skipIfBeforeICU(4,3,1)) { // TIME BOMB + if (skipIfBeforeICU(4,3,2)) { // TIME BOMB logln("Skipping test:(" + cc.charset + ") due to time bomb"); } else { errln("Test failed: output length does not match expected for charset: "+cc.charset+ " [" + cc.caseNr + "]"); @@ -1120,7 +1120,7 @@ public class TestConversion extends ModuleTest { logln("Expected: " + printchars(CharBuffer.wrap(expected), expected.length())); logln("Passed"); } - else if (skipIfBeforeICU(4,3,1)) { + else if (skipIfBeforeICU(4,3,2)) { // TIME BOMB } else { errln("[" + cc.caseNr + "]:" + cc.charset); diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java index 611d29eb37..d551041d6b 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java @@ -427,7 +427,7 @@ public class DateTimeGeneratorTest extends TestFmwk { DateOrder order2 = getOrdering(style2, uLocale); if (!order1.hasSameOrderAs(order2)) { if (order1.monthLength == order2.monthLength) { // error if have same month length, different ordering - if (skipIfBeforeICU(4,3,1)) { + if (skipIfBeforeICU(4,3,2)) { logln(showOrderComparison(uLocale, style1, style2, order1, order2)); } else { errln(showOrderComparison(uLocale, style1, style2, order1, order2)); diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/RoundTripTest.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/RoundTripTest.java index 24bfa63306..cd4bba5add 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/RoundTripTest.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/RoundTripTest.java @@ -322,7 +322,7 @@ public class RoundTripTest extends TestFmwk { String getGreekSet() { // Time bomb - if (skipIfBeforeICU(4,3,1)) { + if (skipIfBeforeICU(4,3,2)) { // We temporarily filter against Unicode 4.1, but we only do this // before version 3.5. logln("TestGreek needs to be updated to remove delete the section marked [:Age=4.0:] filter"); @@ -384,7 +384,7 @@ public class RoundTripTest extends TestFmwk { public void TestHebrew() throws IOException { // Time bomb - if (skipIfBeforeICU(4,3,1)) { + if (skipIfBeforeICU(4,3,2)) { // We temporarily filter against Unicode 4.1, but we only do this // before version 3.5. logln("TestHebrew needs to be updated to remove delete the section marked [:Age=4.0:] filter"); @@ -399,7 +399,7 @@ public class RoundTripTest extends TestFmwk { public void TestThai() throws IOException { long start = System.currentTimeMillis(); - if(skipIfBeforeICU(4,3,1)){ + if(skipIfBeforeICU(4,3,2)){ new Test("Latin-Thai") .test("[a-zA-Z\u0142\u1ECD\u00E6\u0131\u0268\u02CC]", "[\u0E01-\u0E3A\u0E40-\u0E5B]", @@ -481,7 +481,7 @@ public class RoundTripTest extends TestFmwk { public void TestDevanagariLatin() throws IOException { long start = System.currentTimeMillis(); - if (skipIfBeforeICU(4,3,1)) { + if (skipIfBeforeICU(4,3,2)) { logln("Warning: TestDevanagariLatin needs to be updated to remove delete the section marked [:Age=4.1:] filter"); } else { // We temporarily filter against Unicode 4.1, but we only do this @@ -854,7 +854,7 @@ public class RoundTripTest extends TestFmwk { logln("Testing only 5 of "+ interIndicArray.length+" Skipping rest (use -e for exhaustive)"); num = 5; } - if (skipIfBeforeICU(4,3,1)) { + if (skipIfBeforeICU(4,3,2)) { logln("Warning: TestInterIndic needs to be updated to remove delete the section marked [:Age=4.1:] filter"); } else { // We temporarily filter against Unicode 4.1, but we only do this