]> granicus.if.org Git - icu/commitdiff
projects / icu / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4a17aa2)
ICU-9138 Updated ICU4J version to 49.1
authorYoshito Umaoka <y.umaoka@gmail.com>
Thu, 23 Feb 2012 22:54:04 +0000 (22:54 +0000)
committerYoshito Umaoka <y.umaoka@gmail.com>
Thu, 23 Feb 2012 22:54:04 +0000 (22:54 +0000)
X-SVN-Rev: 31497

icu4j/build.properties patch | blob | history
icu4j/eclipse-build/build.properties patch | blob | history
icu4j/eclipse-build/misc/about_icu.html patch | blob | history
icu4j/eclipse-build/misc/about_icu_base.html patch | blob | history
icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java patch | blob | history
icu4j/main/shared/build/common.properties patch | blob | history
icu4j/main/tests/collate/src/com/ibm/icu/dev/test/search/SearchTest.java patch | blob | history
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java patch | blob | history
icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/RoundTripTest.java patch | blob | history

diff --git a/icu4j/build.properties b/icu4j/build.properties
index 0428af88c7c114f134a57025d861510d5726b63d..d0dbc1ad8ddbfd29caf6800d6ad0d68a48d9b8ee 100644 (file)
--- a/icu4j/build.properties
+++ b/icu4j/build.properties
@@ -1,8 +1,8 @@
 #*******************************************************************************\r
-#* Copyright (C) 2009-2011, International Business Machines Corporation and    *\r
+#* 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 = 49m2\r
+release.file.ver = 49_1\r
 \r
diff --git a/icu4j/eclipse-build/build.properties b/icu4j/eclipse-build/build.properties
index b652ba07f510079e4907b8584e59bb9394a3a4df..e1fea97035c90175afebb61e96c3622aee744f24 100644 (file)
--- a/icu4j/eclipse-build/build.properties
+++ b/icu4j/eclipse-build/build.properties
@@ -1,7 +1,7 @@
 #*******************************************************************************
-#* Copyright (C) 2010-2011, International Business Machines Corporation and    *
+#* Copyright (C) 2010-2012, International Business Machines Corporation and    *
 #* others. All Rights Reserved.                                                *
 #*******************************************************************************
-icu4j.plugin.impl.version.string=49.0.2
-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.plugin.impl.version.string=49.1
+copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2012. All Rights Reserved. \n IBM is a registered trademark of IBM Corp.
 icu4j.data.version.number=49
diff --git a/icu4j/eclipse-build/misc/about_icu.html b/icu4j/eclipse-build/misc/about_icu.html
index d1cbf11e9ea67cdc435ba8628e9ffc30b73f0496..c2f8f62b193c1d85f7e687df7275d5c8240bce4d 100644 (file)
--- a/icu4j/eclipse-build/misc/about_icu.html
+++ b/icu4j/eclipse-build/misc/about_icu.html
@@ -8,7 +8,7 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>XXXX XX, 2011</p>   
+<p>XXXX XX, 2012</p>   
 <h3>License</h3>
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
@@ -31,13 +31,13 @@ and such source code may be obtained at <a href="http://www.eclipse.org/">http:/
                for informational purposes only, and you should look to the Redistributor's license for 
                terms and conditions of use.</p>
 
-               <p><strong>ICU4J 4.8.X.v2011XXXX plug-in</strong> <br/><br/>
+               <p><strong>ICU4J 49.X.X.v2012XXXX plug-in</strong> <br/><br/>
                The plug-in includes software (&quot;ICU4J&quot;) developed by International Business Machines
                Corporation and others.
                <br/><br/>
                ICU4J is:
                <blockquote>
-               Copyright (c) 1995-2011 International Business Machines Corporation and others<br/>
+               Copyright (c) 1995-2012 International Business Machines Corporation and others<br/>
                All rights reserved. 
                </blockquote>
                <p>
diff --git a/icu4j/eclipse-build/misc/about_icu_base.html b/icu4j/eclipse-build/misc/about_icu_base.html
index 271380756e3d78e162713dd96299581fb08dd563..af32a28b2ba12264a4f3421c96a5b92f85f1cbcb 100644 (file)
--- a/icu4j/eclipse-build/misc/about_icu_base.html
+++ b/icu4j/eclipse-build/misc/about_icu_base.html
@@ -8,7 +8,7 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>XXXX XX, 2011</p>
+<p>XXXX XX, 2012</p>
 <h3>License</h3>
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
@@ -31,13 +31,13 @@ and such source code may be obtained at <a href="http://www.eclipse.org/">http:/
                for informational purposes only, and you should look to the Redistributor's license for 
                terms and conditions of use.</p>
 
-               <p><strong>ICU4J 4.8.X.v2011XXXX base plug-in</strong> <br/><br/>
+               <p><strong>ICU4J 49.X.X.v2012XXXX base plug-in</strong> <br/><br/>
                The plug-in includes software (&quot;ICU4J&quot;) developed by International Business Machines
                Corporation and others.
                <br/><br/>
                ICU4J is:
                <blockquote>
-               Copyright (c) 1995-2011 International Business Machines Corporation and others<br/>
+               Copyright (c) 1995-2012 International Business Machines Corporation and others<br/>
                All rights reserved. 
                </blockquote>
                <p>
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 57fab48b6883e85956fdee7b230fa4ff778cf50d..9e665c548a8ecf4f2803a6f8c4123a15db48bad7 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
@@ -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, 0, 2, 0);
-        ICU_DATA_VERSION = getInstance(49, 0, 2, 0);
+        ICU_VERSION   = getInstance(49, 1, 0, 0);
+        ICU_DATA_VERSION = getInstance(49, 1, 0, 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 cbd5b23aaa8f03a2ed29b0a561398c967f755533..fbc5993a5f906d099d6906086ca6907dd3701635 100644 (file)
--- a/icu4j/main/shared/build/common.properties
+++ b/icu4j/main/shared/build/common.properties
@@ -1,13 +1,13 @@
 #*******************************************************************************
-#* Copyright (C) 2009-2011, International Business Machines Corporation and    *
+#* Copyright (C) 2009-2012, International Business Machines Corporation and    *
 #* others. All Rights Reserved.                                                *
 #*******************************************************************************
 
 # Version numbers, etc.
 icu4j.spec.version = 49
-icu4j.impl.version = 49.0.2
+icu4j.impl.version = 49.1
 icu4j.data.version = 49
-current.year = 2011
+current.year = 2012
 default.exec.env = J2SE-1.5
 
 corp = IBM Corporation
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 e6b6f2174e4fae9e4a7712a0390fb9a618672eb8..6dfede38878acbc5ca38dd0e1e0d12ad254da188 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
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (C) 2000-2011, International Business Machines Corporation and    *
+ * Copyright (C) 2000-2012, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -1790,7 +1790,7 @@ public class SearchTest extends TestFmwk {
     }
 
     public void TestSupplementary() {
-        if (isICUVersionBefore(49, 1)) { // ticket#8080
+        if (isICUVersionBefore(50, 0, 1)) { // ticket#8080
             return;
         }
         int count = 0;
@@ -1803,7 +1803,7 @@ public class SearchTest extends TestFmwk {
     }
 
     public void TestSupplementaryCanonical() {
-        if (isICUVersionBefore(49, 1)) { // ticket#8080
+        if (isICUVersionBefore(50, 0, 1)) { // 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 3c9e47dfa033b3283a420f2a41574999a08fbff7..064942eaf59d08dbc0e2332799fae968aab37aed 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
@@ -480,7 +480,7 @@ public class DateTimeGeneratorTest extends TestFmwk {
         for (int i = 0; i < locales.length; ++i) {
             for (int style1 = DateFormat.FULL; style1 <= DateFormat.SHORT; ++style1) {
                 for (int style2 = DateFormat.FULL; style2 < style1; ++style2) {
-                    checkCompatible(style1, style2, locales[i]);                    
+                    checkCompatible(style1, style2, locales[i]);
                 }
             }
         }
@@ -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(49, 1)) { // ticket#6806
+                if (isICUVersionBefore(50, 0, 1)) { // 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 14536fbb995d8c517867c40330b44cdadf8e7ee3..c76ae7919991b5316864aab2d3875508d6484d0f 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
@@ -1,6 +1,6 @@
 /**
  *******************************************************************************
- * Copyright (C) 2000-2011, International Business Machines Corporation and
+ * Copyright (C) 2000-2012, International Business Machines Corporation and
  * others. All Rights Reserved.
  *******************************************************************************
  */
@@ -82,7 +82,7 @@ public class RoundTripTest extends TestFmwk {
     public void init() {
         // TODO(Mark): Fix ticket #8989, transliterate U+0970.
         // Remove this method?
-        beforeICU49 = isICUVersionBefore(49, 1);
+        beforeICU49 = isICUVersionBefore(50, 0, 1);
         minusDevAbbBefore49 = beforeICU49 ? "-[\u0970]" : "";
     }
 
Unnamed repository; edit this file 'description' to name the repository.