From 7fd935bf5e959bb5b915eedc7b321bf08b1d982d Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Thu, 9 Oct 2014 15:25:12 +0000 Subject: [PATCH] ICU-11314 Updated ICU4J trunk version to 55m1. X-SVN-Rev: 36656 --- icu4j/build.properties | 8 +- icu4j/eclipse-build/build.properties | 4 +- icu4j/eclipse-build/misc/about_icu.html | 2 +- icu4j/eclipse-build/misc/about_icu_base.html | 2 +- .../src/com/ibm/icu/util/VersionInfo.java | 6 +- icu4j/main/shared/build/common.properties | 6 +- icu4j/main/shared/data/icudata.jar | 4 +- icu4j/main/shared/data/icutzdata.jar | 2 +- icu4j/main/shared/data/testdata.jar | 4 +- .../icu/dev/test/util/DebugUtilitiesData.java | 2 +- icu4j/pom.xml | 2 +- icu4j/readme.html | 83 ++++++++++--------- 12 files changed, 64 insertions(+), 61 deletions(-) diff --git a/icu4j/build.properties b/icu4j/build.properties index a9956d079e5..66d3534ab38 100644 --- a/icu4j/build.properties +++ b/icu4j/build.properties @@ -2,8 +2,8 @@ #* Copyright (C) 2009-2014, International Business Machines Corporation and * #* others. All Rights Reserved. * #******************************************************************************* -api.report.version = 54 -api.report.prev.version = 53 -release.file.ver = 54rc -api.doc.version = 54 Release Candidate +api.report.version = 55 +api.report.prev.version = 54 +release.file.ver = 55m1 +api.doc.version = 55 Milestone 1 diff --git a/icu4j/eclipse-build/build.properties b/icu4j/eclipse-build/build.properties index e9c20f8b91f..6505c94dc84 100644 --- a/icu4j/eclipse-build/build.properties +++ b/icu4j/eclipse-build/build.properties @@ -2,6 +2,6 @@ #* Copyright (C) 2010-2014, International Business Machines Corporation and * #* others. All Rights Reserved. * #******************************************************************************* -icu4j.plugin.impl.version.string=54.1.0 +icu4j.plugin.impl.version.string=55.0.1 copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2014. All Rights Reserved. \n IBM is a registered trademark of IBM Corp. -icu4j.data.version.number=54 +icu4j.data.version.number=55 diff --git a/icu4j/eclipse-build/misc/about_icu.html b/icu4j/eclipse-build/misc/about_icu.html index 1f360dd6e24..5c2aab4a430 100644 --- a/icu4j/eclipse-build/misc/about_icu.html +++ b/icu4j/eclipse-build/misc/about_icu.html @@ -31,7 +31,7 @@ and such source code may be obtained at http:/ for informational purposes only, and you should look to the Redistributor's license for terms and conditions of use.

-

ICU4J 54.X.X.v2014XXXX plug-in

+

ICU4J 55.X.X.v2014XXXX plug-in

The plug-in includes software ("ICU4J") developed by International Business Machines Corporation and others.

diff --git a/icu4j/eclipse-build/misc/about_icu_base.html b/icu4j/eclipse-build/misc/about_icu_base.html index 6fefa3fa63d..7df8131b24a 100644 --- a/icu4j/eclipse-build/misc/about_icu_base.html +++ b/icu4j/eclipse-build/misc/about_icu_base.html @@ -31,7 +31,7 @@ and such source code may be obtained at
http:/ for informational purposes only, and you should look to the Redistributor's license for terms and conditions of use.

-

ICU4J 54.X.X.v2014XXXX base plug-in

+

ICU4J 55.X.X.v2014XXXX base plug-in

The plug-in includes software ("ICU4J") developed by International Business Machines Corporation and others.

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 1dd2c90c883..f517d04e3ab 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java @@ -168,7 +168,7 @@ public final class VersionInfo implements Comparable * @deprecated This API is ICU internal only. */ @Deprecated - public static final String ICU_DATA_VERSION_PATH = "54b"; + public static final String ICU_DATA_VERSION_PATH = "55b"; /** * Data version in ICU4J. @@ -525,8 +525,8 @@ public final class VersionInfo implements Comparable UNICODE_6_3 = getInstance(6, 3, 0, 0); UNICODE_7_0 = getInstance(7, 0, 0, 0); - ICU_VERSION = getInstance(54, 1, 0, 0); - ICU_DATA_VERSION = getInstance(54, 1, 0, 0); + ICU_VERSION = getInstance(55, 0, 1, 0); + ICU_DATA_VERSION = getInstance(55, 0, 1, 0); UNICODE_VERSION = UNICODE_7_0; UCOL_RUNTIME_VERSION = getInstance(8); diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties index a76ce6993fe..444b3036450 100644 --- a/icu4j/main/shared/build/common.properties +++ b/icu4j/main/shared/build/common.properties @@ -4,9 +4,9 @@ #******************************************************************************* # Version numbers, etc. -icu4j.spec.version = 54 -icu4j.impl.version = 54.1.0 -icu4j.data.version = 54 +icu4j.spec.version = 55 +icu4j.impl.version = 55.0.1 +icu4j.data.version = 55 current.year = 2014 default.exec.env = J2SE-1.5 diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 4964ec34557..51be7b72065 100755 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f71ecf0595f618cd369dcda5527781c229ec1eb2123b6fd005c7827d93145f1 -size 11814820 +oid sha256:0a67d2496692ee32b7c62abb9e698239dd432ee761185178e5e30b41aba43457 +size 11814686 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 32ae1df027b..91f86f0ae79 100755 --- 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:0657ef25d0c5e9a830ce94696d27c08262fd9c2de972558827aa69ddf11e9b5f +oid sha256:98b39fc29bef7ff976f413ef1ca1abdb2ad7680d4a47d892a330b63df0ab68fc size 90694 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index 266f8ed70d2..8b259cb9659 100755 --- a/icu4j/main/shared/data/testdata.jar +++ b/icu4j/main/shared/data/testdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:edacb4e4dc08b7409cdb3a965a5fa84a6a1a754d0aa0055a6ed17178d180c4fe -size 812411 +oid sha256:f231ed4c01994c187658caf3b0ab03de01b45d814de0bc6b7ff4f54096cd6cf6 +size 812405 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java index 8fbbcb5913f..d7068ac0b1f 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java @@ -7,7 +7,7 @@ package com.ibm.icu.dev.test.util; public class DebugUtilitiesData extends Object { - public static final String ICU4C_VERSION="54.1"; + public static final String ICU4C_VERSION="55.0.1"; public static final int UDebugEnumType = 0; public static final int UCalendarDateFields = 1; public static final int UCalendarMonths = 2; diff --git a/icu4j/pom.xml b/icu4j/pom.xml index 86ff21382d8..1a2c7ee3d3a 100644 --- a/icu4j/pom.xml +++ b/icu4j/pom.xml @@ -11,7 +11,7 @@ com.ibm.icu icu4j - 54-SNAPSHOT + 55-SNAPSHOT ICU4J diff --git a/icu4j/readme.html b/icu4j/readme.html index ded4ddf5397..c115f7abae5 100644 --- a/icu4j/readme.html +++ b/icu4j/readme.html @@ -14,22 +14,22 @@ h4.doc { text-decoration: underline }

International Components for Unicode for Java (ICU4J)

-

Read Me for ICU4J 54.1

-(Last Update: 2014-Sep-26) +

Read Me for ICU4J 55 Milestone 1

+(Last Update: 2014-Oct-9)

-Note: This is major release of ICU4J. It contains bug fixes and adds implementations -of inherited API and introduces new API or functionality. - +Note: This is a development release of ICU4J 55. The contents of this document may not reflect the recent changes done -for ICU 54 development. This milestone is intended for those wishing -to get an early look at ICU4J 54 new features and API changes. It is not -recommended for production use. --> -

For the most recent release, see the

Changes In This Release

-

See the ICU 54 download page +

See the ICU 55 download page about new features in this release. The list of API changes since the previous ICU4J release is available -here.

+here.

- + - +

License Information

@@ -168,12 +168,12 @@ mean that projects using ICU become subject to GPL.

The IBM version contains the essential text of the license, omitting the X-specific trademarks and copyright notices. The full copy of ICU's license is included in the download + href="http://source.icu-project.org/repos/icu/icu4j/tags/milestone-55-0-1/main/shared/licenses/license.html">ICU's license is included in the download package.

Platform Dependencies

-ICU4J 54 depends on J2SE 5.0 functionality. Therefore, ICU4J only runs on +ICU4J 55 depends on J2SE 5.0 functionality. Therefore, ICU4J only runs on JRE version 5.0 or later. The table below shows the operating systems and JRE/VM versions currently used by the ICU development team to test ICU4J. @@ -856,54 +856,57 @@ from release to release, so clients should not depend on the exact organization of the data in ICU4J.

Some of the data files alias or otherwise reference data from other @@ -999,8 +1002,8 @@ ICU4J data is built by ICU4C tools. Please see "icu4j-readme.txt" in $icu4c_r Note: This procedure assumes that all 3 sources are present

  1. Checkout or download CLDR version 'release-26'
  2. -
  3. Checkout ICU4C with tag 'release-54-1'
  4. -
  5. Checkout ICU4J with tag 'release-54-1'
  6. +
  7. Checkout ICU4C with tag 'milestone-55-0-1'
  8. +
  9. Checkout ICU4J with tag 'milestone-55-0-1'
  10. cd to $icu4c_root/source/data directory
  11. Follow the instructions in $icu4c_root/source/data/cldr-icu-readme.txt
  12. Rebuild ICU4C with the newly generated data.
  13. @@ -1012,7 +1015,7 @@ ICU4J data is built by ICU4C tools. Please see "icu4j-readme.txt" in $icu4c_r

About ICU4J Time Zone

-

ICU4J 54 RC includes time zone data version 2014h, which is the latest one as of +

ICU4J 55m1 includes time zone data version 2014h, which is the latest one as of the release date. However, time zone data is frequently updated in response to changes made by local governments around the world. If you need to update the time zone data, please refer the ICU user guide topic