From d56461f8f04567cf46213857bd1f06f44c3e3fe9 Mon Sep 17 00:00:00 2001 From: Daniel Ju Date: Wed, 3 Apr 2019 12:25:22 -0700 Subject: [PATCH] ICU-20515 Update version numbers, regenerate JARs, regenerate configure --- icu4c/source/common/unicode/uvernum.h | 6 +++--- icu4c/source/configure | 18 +++++++++--------- icu4c/source/data/misc/icuver.txt | 4 ++-- icu4j/build.properties | 6 +++--- icu4j/eclipse-build/build.properties | 2 +- .../core/src/com/ibm/icu/util/VersionInfo.java | 2 +- icu4j/main/shared/build/common.properties | 2 +- 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 +- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h index 327fd25e84d..4372128f0a3 100644 --- a/icu4c/source/common/unicode/uvernum.h +++ b/icu4c/source/common/unicode/uvernum.h @@ -66,7 +66,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ -#define U_ICU_VERSION_MINOR_NUM 1 +#define U_ICU_VERSION_MINOR_NUM 2 /** The current ICU patchlevel version as an integer. * This value will change in the subsequent releases of ICU @@ -134,7 +134,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION "64.1" +#define U_ICU_VERSION "64.2" /** * The current ICU library major version number as a string, for library name suffixes. @@ -153,7 +153,7 @@ /** Data version in ICU4C. * @internal ICU 4.4 Internal Use Only **/ -#define U_ICU_DATA_VERSION "64.1" +#define U_ICU_DATA_VERSION "64.2" #endif /* U_HIDE_INTERNAL_API */ /*=========================================================================== diff --git a/icu4c/source/configure b/icu4c/source/configure index f36fe0a2caf..319abf09fe3 100755 --- a/icu4c/source/configure +++ b/icu4c/source/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ICU 64.1. +# Generated by GNU Autoconf 2.69 for ICU 64.2. # # Report bugs to . # @@ -582,8 +582,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ICU' PACKAGE_TARNAME='International Components for Unicode' -PACKAGE_VERSION='64.1' -PACKAGE_STRING='ICU 64.1' +PACKAGE_VERSION='64.2' +PACKAGE_STRING='ICU 64.2' PACKAGE_BUGREPORT='http://icu-project.org/bugs' PACKAGE_URL='http://icu-project.org' @@ -1359,7 +1359,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ICU 64.1 to adapt to many kinds of systems. +\`configure' configures ICU 64.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1425,7 +1425,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ICU 64.1:";; + short | recursive ) echo "Configuration of ICU 64.2:";; esac cat <<\_ACEOF @@ -1562,7 +1562,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ICU configure 64.1 +ICU configure 64.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2254,7 +2254,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ICU $as_me 64.1, which was +It was created by ICU $as_me 64.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -8428,7 +8428,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ICU $as_me 64.1, which was +This file was extended by ICU $as_me 64.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8482,7 +8482,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ICU config.status 64.1 +ICU config.status 64.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/icu4c/source/data/misc/icuver.txt b/icu4c/source/data/misc/icuver.txt index dc4bf4ce2b0..94fbfe60c75 100644 --- a/icu4c/source/data/misc/icuver.txt +++ b/icu4c/source/data/misc/icuver.txt @@ -8,6 +8,6 @@ // *************************************************************************** icuver:table(nofallback){ - DataVersion { "64.1.0.0" } - ICUVersion { "64.1.0.0" } + DataVersion { "64.2.0.0" } + ICUVersion { "64.2.0.0" } } diff --git a/icu4j/build.properties b/icu4j/build.properties index ad76e0768b6..121934f804a 100644 --- a/icu4j/build.properties +++ b/icu4j/build.properties @@ -6,7 +6,7 @@ #******************************************************************************* api.report.version = 64 api.report.prev.version = 63 -release.file.ver = 64_1 -api.doc.version = 64.1 -maven.pom.ver = 64.1 +release.file.ver = 64_2 +api.doc.version = 64.2 +maven.pom.ver = 64.2 diff --git a/icu4j/eclipse-build/build.properties b/icu4j/eclipse-build/build.properties index c006725c085..abe1745f147 100644 --- a/icu4j/eclipse-build/build.properties +++ b/icu4j/eclipse-build/build.properties @@ -4,6 +4,6 @@ #* Copyright (C) 2010-2016, International Business Machines Corporation and * #* others. All Rights Reserved. * #******************************************************************************* -icu4j.plugin.impl.version.string=64.1.0 +icu4j.plugin.impl.version.string=64.2.0 copyright.eclipse=(C) 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html#License icu4j.data.version.number=64 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 05b6bd7f1ec..c26c90b6a68 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 @@ -581,7 +581,7 @@ public final class VersionInfo implements Comparable UNICODE_11_0 = getInstance(11, 0, 0, 0); UNICODE_12_0 = getInstance(12, 0, 0, 0); - ICU_VERSION = getInstance(64, 1, 0, 0); + ICU_VERSION = getInstance(64, 2, 0, 0); ICU_DATA_VERSION = ICU_VERSION; UNICODE_VERSION = UNICODE_12_0; diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties index 9fb0e3ed54a..815096f7b7d 100644 --- a/icu4j/main/shared/build/common.properties +++ b/icu4j/main/shared/build/common.properties @@ -7,7 +7,7 @@ # Version numbers, etc. icu4j.spec.version = 64 -icu4j.impl.version = 64.1 +icu4j.impl.version = 64.2 icu4j.data.version = 64 default.exec.env = JavaSE-1.7 diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 36c0d08dd80..033e017fdd8 100644 --- 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:bd004f5d8064e047cef4f7d31326b39b7fc43fba685fab2f0d23c154f4dbc637 -size 12818511 +oid sha256:7b1eb395e730b69ea5a797123891255b575883260637f120efdecdd8dfdcd307 +size 12818198 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 76f5c26f664..ccb2e95b8c8 100644 --- 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:bad41bf7819eaa9ad2955b5a7600fb61252415f625bab22750bc60412bc83998 +oid sha256:e0efdabf8de31ade78baef74e575747695286d00aa37d2074f07337bb0aef028 size 94046 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index d0ed4efc47b..882477aee3f 100644 --- 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:c6bb1db1fc17098b4924ac455433b6058aae86d300e6b7c9f112775d7654946c -size 726372 +oid sha256:b9cf97f12ca73fc84ec1d22a861b9bae6549e4c033952a7ad6cc26b5f08feabc +size 726370 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 8c12615c0de..b9120693384 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 @@ -10,7 +10,7 @@ package com.ibm.icu.dev.test.util; public class DebugUtilitiesData extends Object { - public static final String ICU4C_VERSION="64.1"; + public static final String ICU4C_VERSION="64.2"; public static final int UDebugEnumType = 0; public static final int UCalendarDateFields = 1; public static final int UCalendarMonths = 2;