ICU-8636 Updated the version to 49.0.1 (49M1) except data path (requiring C update).

X-SVN-Rev: 30215

diff --git a/icu4j/build.properties b/icu4j/build.properties
index 002cdbd686fa728d277a6f5833d6c4c6259b9f82..66e750c19d01d57e97ec3e55e212c54c352b8ddd 100644 (file)
--- a/icu4j/build.properties
+++ b/icu4j/build.properties
@@ -2,7 +2,7 @@
 #* Copyright (C) 2009-2011, International Business Machines Corporation and    *\r
 #* others. All Rights Reserved.                                                *\r
 #*******************************************************************************\r
-api.report.version = 48\r
-api.report.prev.version = 46\r
-release.file.ver = 4_8\r
+api.report.version = 49\r
+api.report.prev.version = 48\r
+release.file.ver = 49M1\r
 \r

diff --git a/icu4j/eclipse-build/build.properties b/icu4j/eclipse-build/build.properties
index 642e3895d52c8851c605a70b9215d49d83c800df..97c7ccd1d6009f2273b16191d796a277fcf02df0 100644 (file)
--- a/icu4j/eclipse-build/build.properties
+++ b/icu4j/eclipse-build/build.properties
@@ -2,6 +2,6 @@
 #* Copyright (C) 2010-2011, International Business Machines Corporation and    *
 #* others. All Rights Reserved.                                                *
 #*******************************************************************************
-icu4j.plugin.impl.version.string=4.8.0
+icu4j.plugin.impl.version.string=49.0.1
 copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2011. All Rights Reserved. \n IBM is a registered trademark of IBM Corp.
 icu4j.data.version.number=48

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 d4fef93f475f1e347f87fc4049fb509dd086ede0..70582af6a5ddf2ceb2c27c41eae7b59ad419fe76 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
@@ -488,7 +488,7 @@ public final class VersionInfo implements Comparable<VersionInfo>
         UNICODE_5_2   = getInstance(5, 2, 0, 0);
         UNICODE_6_0   = getInstance(6, 0, 0, 0);
 
-        ICU_VERSION   = getInstance(4, 8, 0, 0);
+        ICU_VERSION   = getInstance(49, 0, 1, 0);
         ICU_DATA_VERSION = getInstance(4, 8, 0, 0);
         UNICODE_VERSION = UNICODE_6_0;
 

diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties
index 80e2e1c946c751073e4e0f4e0e901fef52289f72..684e45bce9a3019b9e3379cb302967ef45e75a46 100644 (file)
--- a/icu4j/main/shared/build/common.properties
+++ b/icu4j/main/shared/build/common.properties
@@ -4,8 +4,8 @@
 #*******************************************************************************
 
 # Version numbers, etc.
-icu4j.spec.version = 4.8
-icu4j.impl.version = 4.8
+icu4j.spec.version = 49
+icu4j.impl.version = 49.0
 icu4j.data.version = 48
 current.year = 2011
 default.exec.env = J2SE-1.5

diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/search/SearchTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/search/SearchTest.java
index ada6af6a44aa17a9ab537acdf96c60bbcd87ae5e..e88ce5b0297f15e291d3fb8e5f902dbbee0a9341 100644 (file)
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/search/SearchTest.java
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/search/SearchTest.java
@@ -1790,7 +1790,7 @@ public class SearchTest extends TestFmwk {
     }
 
     public void TestSupplementary() {
-        if (skipIfBeforeICU(4,9,0)) { // ticket#8080
+        if (skipIfBeforeICU(49,0,2)) { // ticket#8080
             return;
         }
         int count = 0;
@@ -1803,7 +1803,7 @@ public class SearchTest extends TestFmwk {
     }
 
     public void TestSupplementaryCanonical() {
-        if (skipIfBeforeICU(4,9,0)) { // ticket#8080
+        if (skipIfBeforeICU(49,0,2)) { // ticket#8080
             return;
         }
         int count = 0;

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 0e51f2140b9d21ea05303b729d8f364625da4097..a6ab10df24cad5b7ff786a8ceb6d913834f14593 100644 (file)
--- 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
@@ -525,7 +525,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,9,0)) { // ticket#6806
+                if (skipIfBeforeICU(49,0,2)) { // ticket#6806
                     logln(showOrderComparison(uLocale, style1, style2, order1, order2));
                 } else {
                     errln(showOrderComparison(uLocale, style1, style2, order1, order2));