ICU-6416 Move version to 4.1.1 including data.
X-SVN-Rev: 24456
This commit is contained in:
parent
cba0fb208e
commit
0a71c40b26
@ -11,13 +11,13 @@ icu4j.spec.version.string=4.1
|
||||
|
||||
# impl version will be updated for maintenance releases.
|
||||
# It must be <icu4j.spec.version.string>[.<maint-version>]
|
||||
icu4j.impl.version.string=4.1.0
|
||||
icu4j.impl.version.string=4.1.1
|
||||
|
||||
# data version number won't be changed in a feature stream
|
||||
icu4j.data.version.number=40
|
||||
icu4j.data.version.number=41
|
||||
|
||||
# these version numbers are used by API change report
|
||||
icu4j.version.number=410
|
||||
icu4j.version.number=411
|
||||
icu4j.previous.version.number=400
|
||||
|
||||
current.year=2008
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:49d7761f9ca8d9ea561e4e900aca98afa0f49e8770b1aa73c9fd6c5a28d20b20
|
||||
size 765478
|
||||
oid sha256:500355d67b1494ce64a59453eb673b8c6435634e565de5f9cdfc2a90d7f684cc
|
||||
size 765481
|
||||
|
@ -214,7 +214,7 @@ public class TestConversion extends ModuleTest {
|
||||
|
||||
} catch (Exception e) {
|
||||
// TODO implement loading of test data.
|
||||
if (skipIfBeforeICU(4,1,0)) {
|
||||
if (skipIfBeforeICU(4,1,1)) {
|
||||
logln("Skipping test:(" + cc.charset + ") due to ICU Charset not supported at this time");
|
||||
} else {
|
||||
errln(cc.charset + " was not found");
|
||||
@ -498,7 +498,7 @@ public class TestConversion extends ModuleTest {
|
||||
|
||||
} catch (Exception e) {
|
||||
// TODO implement loading of test data.
|
||||
if (skipIfBeforeICU(4,1,0)) {
|
||||
if (skipIfBeforeICU(4,1,1)) {
|
||||
logln("Skipping test:(" + cc.charset + ") due to ICU Charset not supported at this time");
|
||||
} else {
|
||||
errln(cc.charset + " was not found");
|
||||
|
@ -212,7 +212,7 @@ public class DateTimeGeneratorTest extends TestFmwk {
|
||||
if (GENERATE_TEST_DATA) {
|
||||
logln("new String[] {\"" + testSkeleton + "\", \"" + Utility.escape(formatted) + "\"},");
|
||||
} else if (!formatted.equals(testFormatted)) {
|
||||
if(skipIfBeforeICU(4,1,0)&& uLocale.equals("zh_Hans_CN") && testSkeleton.equals("HHmm")){
|
||||
if(skipIfBeforeICU(4,1,1)&& uLocale.equals("zh_Hans_CN") && testSkeleton.equals("HHmm")){
|
||||
logln(uLocale + "\tformatted string doesn't match test case: " + testSkeleton + "\t generated: " + pattern + "\t expected: " + testFormatted + "\t got: " + formatted);
|
||||
continue;
|
||||
}
|
||||
@ -391,7 +391,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,1,0)) {
|
||||
if (skipIfBeforeICU(4,1,1)) {
|
||||
logln(showOrderComparison(uLocale, style1, style2, order1, order2));
|
||||
} else {
|
||||
errln(showOrderComparison(uLocale, style1, style2, order1, order2));
|
||||
|
@ -206,7 +206,7 @@ public class RoundTripTest extends TestFmwk {
|
||||
|
||||
String getGreekSet() {
|
||||
// Time bomb
|
||||
if (skipIfBeforeICU(4,1,0)) {
|
||||
if (skipIfBeforeICU(4,1,1)) {
|
||||
// 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");
|
||||
@ -268,7 +268,7 @@ public class RoundTripTest extends TestFmwk {
|
||||
|
||||
public void TestHebrew() throws IOException {
|
||||
// Time bomb
|
||||
if (skipIfBeforeICU(4,1,0)) {
|
||||
if (skipIfBeforeICU(4,1,1)) {
|
||||
// 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");
|
||||
@ -283,7 +283,7 @@ public class RoundTripTest extends TestFmwk {
|
||||
|
||||
public void TestThai() throws IOException {
|
||||
long start = System.currentTimeMillis();
|
||||
if(skipIfBeforeICU(4,1,0)){
|
||||
if(skipIfBeforeICU(4,1,1)){
|
||||
new Test("Latin-Thai")
|
||||
.test("[a-zA-Z\u0142\u1ECD\u00E6\u0131\u0268\u02CC]",
|
||||
"[\u0E01-\u0E3A\u0E40-\u0E5B]",
|
||||
@ -365,7 +365,7 @@ public class RoundTripTest extends TestFmwk {
|
||||
|
||||
public void TestDevanagariLatin() throws IOException {
|
||||
long start = System.currentTimeMillis();
|
||||
if (skipIfBeforeICU(4,1,0)) {
|
||||
if (skipIfBeforeICU(4,1,1)) {
|
||||
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
|
||||
@ -738,7 +738,7 @@ public class RoundTripTest extends TestFmwk {
|
||||
logln("Testing only 5 of "+ interIndicArray.length+" Skipping rest (use -e for exhaustive)");
|
||||
num = 5;
|
||||
}
|
||||
if (skipIfBeforeICU(4,1,0)) {
|
||||
if (skipIfBeforeICU(4,1,1)) {
|
||||
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
|
||||
|
@ -5,7 +5,7 @@
|
||||
package com.ibm.icu.dev.test.util;
|
||||
|
||||
public class DebugUtilitiesData extends Object {
|
||||
public static final String ICU4C_VERSION="4.0";
|
||||
public static final String ICU4C_VERSION="4.1.1";
|
||||
public static final int UDebugEnumType = 0;
|
||||
public static final int UCalendarDateFields = 1;
|
||||
public static final int UCalendarMonths = 2;
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:01c2433ebe7df034f56d1dbfcbb7c89d56db771e2e9e5277da350be7dad5b940
|
||||
size 6603909
|
||||
oid sha256:578ea13cc3fccf283d2636a2eb390271d4749208fbfe6081568aac0ed7dcccfe
|
||||
size 6603886
|
||||
|
@ -124,7 +124,7 @@ public final class VersionInfo
|
||||
* @internal
|
||||
* @deprecated This API is ICU internal only.
|
||||
*/
|
||||
public static final String ICU_DATA_VERSION = "40b";
|
||||
public static final String ICU_DATA_VERSION = "41b";
|
||||
|
||||
/**
|
||||
* ICU4J collator runtime version
|
||||
@ -445,7 +445,7 @@ public final class VersionInfo
|
||||
UNICODE_4_0_1 = getInstance(4, 0, 1, 0);
|
||||
UNICODE_4_1 = getInstance(4, 1, 0, 0);
|
||||
UNICODE_5_0 = getInstance(4, 1, 0, 0);
|
||||
ICU_VERSION = getInstance(4, 1, 0, 0);
|
||||
ICU_VERSION = getInstance(4, 1, 1, 0);
|
||||
UCOL_RUNTIME_VERSION = getInstance(6);
|
||||
UCOL_BUILDER_VERSION = getInstance(7);
|
||||
UCOL_TAILORINGS_VERSION = getInstance(1);
|
||||
|
Loading…
Reference in New Issue
Block a user