ICU-8287 Update ICU_VERSION & ICU_DATA_VERSION, update timebombs
X-SVN-Rev: 29594
diff --git a/main/classes/core/src/com/ibm/icu/util/VersionInfo.java b/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
index b601bc3..070166e 100644
--- a/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
+++ b/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
@@ -488,8 +488,8 @@
UNICODE_5_2 = getInstance(5, 2, 0, 0);
UNICODE_6_0 = getInstance(6, 0, 0, 0);
- ICU_VERSION = getInstance(4, 6, 0, 0);
- ICU_DATA_VERSION = getInstance(4, 6, 0, 0);
+ ICU_VERSION = getInstance(4, 6, 1, 0);
+ ICU_DATA_VERSION = getInstance(4, 6, 1, 0);
UNICODE_VERSION = UNICODE_6_0;
UCOL_RUNTIME_VERSION = getInstance(7);
diff --git a/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java b/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java
index 99dfb71..9675f61 100644
--- a/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java
+++ b/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java
@@ -1,6 +1,6 @@
/*
*******************************************************************************
- * Copyright (C) 2006-2010, Google, International Business Machines Corporation *
+ * Copyright (C) 2006-2011, Google, International Business Machines Corporation *
* and others. All Rights Reserved. *
*******************************************************************************
*/
@@ -516,7 +516,7 @@
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,6,0)) { // ticket#6806
+ if (skipIfBeforeICU(4,6,9)) { // ticket#6806
logln(showOrderComparison(uLocale, style1, style2, order1, order2));
} else {
errln(showOrderComparison(uLocale, style1, style2, order1, order2));
