From 0768b26e8652b48ae335aca378df4f13c71b2d5c Mon Sep 17 00:00:00 2001 From: Erik Torres Aguilar Date: Wed, 2 Dec 2020 21:36:06 +0000 Subject: [PATCH] ICU-21405 BRS 68.2 Version update and regenerate configure for v68.2 --- icu4c/readme.html | 6 +++--- 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 | 4 ++-- icu4j/main/shared/data/testdata.jar | 4 ++-- .../icu/dev/test/util/DebugUtilitiesData.java | 2 +- tools/cldr/cldr-to-icu/build-icu-data.xml | 4 ++-- 13 files changed, 32 insertions(+), 32 deletions(-) diff --git a/icu4c/readme.html b/icu4c/readme.html index bbf06d16d9c..06381c55c25 100644 --- a/icu4c/readme.html +++ b/icu4c/readme.html @@ -3,7 +3,7 @@ - ReadMe for ICU 68.1 + ReadMe for ICU 68.2 (Preview Release) - ICU 68.1 ReadMe + ICU 68.2 ReadMe @@ -47,7 +47,7 @@

This is a release candidate version of ICU4C. It is not recommended for production use.

-

Last updated: 2020-Oct-01
+

Last updated: 2020-Dec-02
Copyright © 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html
Copyright © 1997-2016 International Business Machines Corporation and others. diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h index a4cbb9e0fe8..a46481a3fe6 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 @@ -139,7 +139,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION "68.1" +#define U_ICU_VERSION "68.2" /** * The current ICU library major version number as a string, for library name suffixes. @@ -158,7 +158,7 @@ /** Data version in ICU4C. * @internal ICU 4.4 Internal Use Only **/ -#define U_ICU_DATA_VERSION "68.1" +#define U_ICU_DATA_VERSION "68.2" #endif /* U_HIDE_INTERNAL_API */ /*=========================================================================== diff --git a/icu4c/source/configure b/icu4c/source/configure index 274dce68f73..d5d57ce88d7 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 68.1. +# Generated by GNU Autoconf 2.69 for ICU 68.2. # # Report bugs to . # @@ -582,8 +582,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ICU' PACKAGE_TARNAME='International Components for Unicode' -PACKAGE_VERSION='68.1' -PACKAGE_STRING='ICU 68.1' +PACKAGE_VERSION='68.2' +PACKAGE_STRING='ICU 68.2' PACKAGE_BUGREPORT='http://icu-project.org/bugs' PACKAGE_URL='http://icu-project.org' @@ -1364,7 +1364,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 68.1 to adapt to many kinds of systems. +\`configure' configures ICU 68.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1430,7 +1430,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ICU 68.1:";; + short | recursive ) echo "Configuration of ICU 68.2:";; esac cat <<\_ACEOF @@ -1568,7 +1568,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ICU configure 68.1 +ICU configure 68.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2314,7 +2314,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 68.1, which was +It was created by ICU $as_me 68.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -8544,7 +8544,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 68.1, which was +This file was extended by ICU $as_me 68.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8598,7 +8598,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 68.1 +ICU config.status 68.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 123a1b96a3c..c4692375945 100644 --- a/icu4c/source/data/misc/icuver.txt +++ b/icu4c/source/data/misc/icuver.txt @@ -9,6 +9,6 @@ // *************************************************************************** icuver:table(nofallback){ CLDRVersion{"38"} - DataVersion{"68.1.0.0"} - ICUVersion{"68.1.0.0"} + DataVersion{"68.2.0.0"} + ICUVersion{"68.2.0.0"} } diff --git a/icu4j/build.properties b/icu4j/build.properties index def6147a61b..f4393c6b688 100644 --- a/icu4j/build.properties +++ b/icu4j/build.properties @@ -6,7 +6,7 @@ #******************************************************************************* api.report.version = 68 api.report.prev.version = 67 -release.file.ver = 68_1 -api.doc.version = 68.1 -maven.pom.ver = 68.1 +release.file.ver = 68_2 +api.doc.version = 68.2 +maven.pom.ver = 68.2 diff --git a/icu4j/eclipse-build/build.properties b/icu4j/eclipse-build/build.properties index cd5849a4984..ef1ba42215b 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=68.1.0 +icu4j.plugin.impl.version.string=68.2.0 copyright.eclipse=(C) 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html icu4j.data.version.number=68 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 72fd079c466..158a47a05e0 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 @@ -553,7 +553,7 @@ public final class VersionInfo implements Comparable UNICODE_12_1 = getInstance(12, 1, 0, 0); UNICODE_13_0 = getInstance(13, 0, 0, 0); - ICU_VERSION = getInstance(68, 1, 0, 0); + ICU_VERSION = getInstance(68, 2, 0, 0); ICU_DATA_VERSION = ICU_VERSION; UNICODE_VERSION = UNICODE_13_0; diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties index f15cd34c6d7..c448fedf34a 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 = 68 -icu4j.impl.version = 68.1 +icu4j.impl.version = 68.2 icu4j.data.version = 68 default.exec.env = JavaSE-1.7 diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 56a5edad0a4..f7e2f357e2a 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:079654dc48a1f25b918e4408123703bf0182c3391002d0d618191f46f8b9ed78 -size 13270502 +oid sha256:3a06cc5edfa390f101ee383d479e647467eda4ba3abc28ac548d36b41e3403e3 +size 13294453 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 8c98da2d134..b1f3c44e1b9 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:2307e62abb987090e8083a213b86733849261015c3ed3bc7308f8aef3ecaa1f3 -size 94647 +oid sha256:3ed9607128c66bdca1458201bb1bd30e60d40fa024ce7c42f531e3930ebe2b12 +size 94662 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index 6b3f882e763..e7039236d82 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:ba1096e3fc2313d44b1aa66469702f462d4ee5624303eb0fdc3fd5ca422518bb -size 723507 +oid sha256:c80f58afc2714a7e1af4706c075a23ae37de228f0d383bf0cbaec340ade76030 +size 726478 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 c6b7ff515aa..44d3221ceea 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="68.1"; + public static final String ICU4C_VERSION="68.2"; public static final int UDebugEnumType = 0; public static final int UCalendarDateFields = 1; public static final int UCalendarMonths = 2; diff --git a/tools/cldr/cldr-to-icu/build-icu-data.xml b/tools/cldr/cldr-to-icu/build-icu-data.xml index c5b143c2a6e..1d5148cdbf2 100644 --- a/tools/cldr/cldr-to-icu/build-icu-data.xml +++ b/tools/cldr/cldr-to-icu/build-icu-data.xml @@ -47,10 +47,10 @@ - + - +