ICU-9233 Update ICU4J to 50.0.1

X-SVN-Rev: 31732

diff --git a/icu4j/build.properties b/icu4j/build.properties
index dc75983f9895772195496a7789350a40b7c73b08..8b53dc1dc675f54bf835885721adf0ba8e953423 100644 (file)
--- a/icu4j/build.properties
+++ b/icu4j/build.properties
@@ -2,8 +2,8 @@
 #* Copyright (C) 2009-2012, International Business Machines Corporation and    *\r
 #* others. All Rights Reserved.                                                *\r
 #*******************************************************************************\r
-api.report.version = 49\r
-api.report.prev.version = 48\r
-release.file.ver = 49_1\r
-api.doc.version = 49\r
+api.report.version = 50\r
+api.report.prev.version = 49\r
+release.file.ver = 50m1\r
+api.doc.version = 50\r
 \r

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 9e665c548a8ecf4f2803a6f8c4123a15db48bad7..f303ba375c77467bbc6cf43ebe60530867e8285f 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
@@ -149,7 +149,7 @@ public final class VersionInfo implements Comparable<VersionInfo>
      * @internal
      * @deprecated This API is ICU internal only.
      */
-    public static final String ICU_DATA_VERSION_PATH = "49b";
+    public static final String ICU_DATA_VERSION_PATH = "50b";
     
     /**
      * Data version in ICU4J.
@@ -495,8 +495,8 @@ public final class VersionInfo implements Comparable<VersionInfo>
         UNICODE_6_0   = getInstance(6, 0, 0, 0);
         UNICODE_6_1   = getInstance(6, 1, 0, 0);
 
-        ICU_VERSION   = getInstance(49, 1, 0, 0);
-        ICU_DATA_VERSION = getInstance(49, 1, 0, 0);
+        ICU_VERSION   = getInstance(50, 0, 1, 0);
+        ICU_DATA_VERSION = getInstance(50, 0, 1, 0);
         UNICODE_VERSION = UNICODE_6_1;
 
         UCOL_RUNTIME_VERSION = getInstance(7);

diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties
index fbc5993a5f906d099d6906086ca6907dd3701635..a21eb13e1a3a10ab29fea9fd6ec8c46a4cb2bf17 100644 (file)
--- a/icu4j/main/shared/build/common.properties
+++ b/icu4j/main/shared/build/common.properties
@@ -4,9 +4,9 @@
 #*******************************************************************************
 
 # Version numbers, etc.
-icu4j.spec.version = 49
-icu4j.impl.version = 49.1
-icu4j.data.version = 49
+icu4j.spec.version = 50
+icu4j.impl.version = 50.0.1
+icu4j.data.version = 50
 current.year = 2012
 default.exec.env = J2SE-1.5
 

diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index 9d22a10ffce18789bee6404391290c1d66a02b6b..178ee498f78b1a8b6b767a3262a5759a4d5106d6 100755 (executable)
--- a/icu4j/main/shared/data/icutzdata.jar
+++ b/icu4j/main/shared/data/icutzdata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93b50e94877fd8eb98ff9d54384b4cf0f61482e25a178eee666ff08761ece83b
+oid sha256:16b284af4c0fa695661c55a0d9ab28b43a6cc06db8f9e0b06565dde95486af00
 size 92858

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 6dfede38878acbc5ca38dd0e1e0d12ad254da188..d04488111b4c6e53cb029a5c641ca4d03d9af7c1 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 (isICUVersionBefore(50, 0, 1)) { // ticket#8080
+        if (isICUVersionBefore(50, 1, 0)) { // ticket#8080
             return;
         }
         int count = 0;
@@ -1803,7 +1803,7 @@ public class SearchTest extends TestFmwk {
     }
 
     public void TestSupplementaryCanonical() {
-        if (isICUVersionBefore(50, 0, 1)) { // ticket#8080
+        if (isICUVersionBefore(50, 1, 0)) { // 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 064942eaf59d08dbc0e2332799fae968aab37aed..96484a5c7bad1f590e86cb056787f9546ef31483 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
@@ -569,7 +569,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 (isICUVersionBefore(50, 0, 1)) { // ticket#6806
+                if (isICUVersionBefore(50, 1, 0)) { // ticket#6806
                     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 c76ae7919991b5316864aab2d3875508d6484d0f..c5f2223c6708390c525da8e6b3bbc309c0433ebf 100644 (file)
--- 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
@@ -74,16 +74,16 @@ public class RoundTripTest extends TestFmwk {
     static String HIRAGANA_ITERATION = "[\u309D\u309E]";
 
     // TODO(Mark): Fix ticket #8989, transliterate U+0970.
-    // Remove all references to beforeICU49 & minusDevAbbBefore49.
-    private boolean beforeICU49;
-    private String minusDevAbbBefore49;
+    // Remove all references to beforeICU50 & minusDevAbbBefore50.
+    private boolean beforeICU50;
+    private String minusDevAbbBefore50;
 
     @Override
     public void init() {
         // TODO(Mark): Fix ticket #8989, transliterate U+0970.
         // Remove this method?
-        beforeICU49 = isICUVersionBefore(50, 0, 1);
-        minusDevAbbBefore49 = beforeICU49 ? "-[\u0970]" : "";
+        beforeICU50 = isICUVersionBefore(50, 1, 0);
+        minusDevAbbBefore50 = beforeICU50 ? "-[\u0970]" : "";
     }
 
     //------------------------------------------------------------------
@@ -507,7 +507,7 @@ public class RoundTripTest extends TestFmwk {
         logln("Warning: TestDevanagariLatin needs to be updated to remove delete the section marked [:Age=4.1:] filter");
 
         new Test("Latin-DEVANAGARI", 50)
-        .test(latinForIndic, "[[[:Devanagari:][\u094d][\u0964\u0965]" + minusDevAbbBefore49 + "]&[:Age=4.1:]]", "[\u0965\u0904]", this, new LegalIndic());
+        .test(latinForIndic, "[[[:Devanagari:][\u094d][\u0964\u0965]" + minusDevAbbBefore50 + "]&[:Age=4.1:]]", "[\u0965\u0904]", this, new LegalIndic());
         showElapsed(start, "TestDevanagariLatin");
     }
 
@@ -892,8 +892,8 @@ public class RoundTripTest extends TestFmwk {
             // start
             // TODO(Mark): Fix ticket #8989, transliterate U+0970.
             new Test(interIndicArray[i][0], 50)
-            .test("[["+interIndicArray[i][1] + minusDevAbbBefore49 + "] &[:Age=4.1:]]",
-                    "[["+interIndicArray[i][2] + minusDevAbbBefore49 + "] &[:Age=4.1:]]",
+            .test("[["+interIndicArray[i][1] + minusDevAbbBefore50 + "] &[:Age=4.1:]]",
+                    "[["+interIndicArray[i][2] + minusDevAbbBefore50 + "] &[:Age=4.1:]]",
                     interIndicArray[i][3],
                     this, new LegalIndic());
             //end

diff --git a/icu4j/pom.xml b/icu4j/pom.xml
index 7e416b7c8f64d0d5f391e3324bdfdcaca8031763..9f53157ff0babfb2f9010aba00abe16d10cb24d7 100644 (file)
--- a/icu4j/pom.xml
+++ b/icu4j/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>com.ibm.icu</groupId>
   <artifactId>icu4j</artifactId>
-  <version>49.1</version>
+  <version>50-SNAPSHOT</version>
 
   <name>ICU4J</name>
   <description>