From 741bbddcf9279f41385862be8913ed13b9e342c0 Mon Sep 17 00:00:00 2001 From: Daniel Ju Date: Tue, 15 Mar 2022 15:08:13 -0700 Subject: [PATCH] ICU-21900 BRS71RC Update version number and regenerate configure --- icu4c/source/common/unicode/uvernum.h | 8 ++++---- icu4c/source/configure | 18 +++++++++--------- icu4c/source/data/misc/icuver.txt | 4 ++-- icu4j/build.properties | 4 ++-- .../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 ++-- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h index 4b69e131dd1..2706e0b0606 100644 --- a/icu4c/source/common/unicode/uvernum.h +++ b/icu4c/source/common/unicode/uvernum.h @@ -66,13 +66,13 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ -#define U_ICU_VERSION_MINOR_NUM 0 +#define U_ICU_VERSION_MINOR_NUM 1 /** The current ICU patchlevel version as an integer. * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION_PATCHLEVEL_NUM 1 +#define U_ICU_VERSION_PATCHLEVEL_NUM 0 /** The current ICU build level version as an integer. * This value is for use by ICU clients. It defaults to 0. @@ -139,7 +139,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION "71.0.1" +#define U_ICU_VERSION "71.1" /** * 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 "71.0.1" +#define U_ICU_DATA_VERSION "71.1" #endif /* U_HIDE_INTERNAL_API */ /*=========================================================================== diff --git a/icu4c/source/configure b/icu4c/source/configure index c183daf4fb0..71e1462682f 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 71.0.1. +# Generated by GNU Autoconf 2.69 for ICU 71.1. # # Report bugs to . # @@ -582,8 +582,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ICU' PACKAGE_TARNAME='International Components for Unicode' -PACKAGE_VERSION='71.0.1' -PACKAGE_STRING='ICU 71.0.1' +PACKAGE_VERSION='71.1' +PACKAGE_STRING='ICU 71.1' PACKAGE_BUGREPORT='http://icu-project.org/bugs' PACKAGE_URL='http://icu-project.org' @@ -1375,7 +1375,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 71.0.1 to adapt to many kinds of systems. +\`configure' configures ICU 71.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1442,7 +1442,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ICU 71.0.1:";; + short | recursive ) echo "Configuration of ICU 71.1:";; esac cat <<\_ACEOF @@ -1580,7 +1580,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ICU configure 71.0.1 +ICU configure 71.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2326,7 +2326,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 71.0.1, which was +It was created by ICU $as_me 71.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -8601,7 +8601,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 71.0.1, which was +This file was extended by ICU $as_me 71.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8655,7 +8655,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 71.0.1 +ICU config.status 71.1 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 4c09c1c2f08..73033a8caef 100644 --- a/icu4c/source/data/misc/icuver.txt +++ b/icu4c/source/data/misc/icuver.txt @@ -9,6 +9,6 @@ // *************************************************************************** icuver:table(nofallback){ CLDRVersion{"41"} - DataVersion{"71.0.1.0"} - ICUVersion{"71.0.1.0"} + DataVersion{"71.1.0.0"} + ICUVersion{"71.1.0.0"} } diff --git a/icu4j/build.properties b/icu4j/build.properties index 0b39e241551..3c3777e0079 100644 --- a/icu4j/build.properties +++ b/icu4j/build.properties @@ -7,6 +7,6 @@ api.report.version = 71 api.report.prev.version = 70 release.file.ver = 71rc -api.doc.version = 71 Release Candidate -maven.pom.ver = 71.0.1-SNAPSHOT +api.doc.version = 71.1 +maven.pom.ver = 71.1-SNAPSHOT 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 704a6808650..02f357f816e 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 @@ -560,7 +560,7 @@ public final class VersionInfo implements Comparable UNICODE_13_0 = getInstance(13, 0, 0, 0); UNICODE_14_0 = getInstance(14, 0, 0, 0); - ICU_VERSION = getInstance(71, 0, 1, 0); + ICU_VERSION = getInstance(71, 1, 0, 0); ICU_DATA_VERSION = ICU_VERSION; UNICODE_VERSION = UNICODE_14_0; diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties index c8d81493810..a565191c894 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 = 71 -icu4j.impl.version = 71.0.1 +icu4j.impl.version = 71.1 icu4j.data.version = 71 default.exec.env = JavaSE-1.7 diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index ff9ee9b8601..91d0c35599d 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:3b822de5b134063e3d1aa30db2d1d9d08a04c0ea073f2090a5a4c0cea1bd1160 -size 13875335 +oid sha256:46c06bf5491037a3521947c1b941c31ae41a9d6394f3bee7cb530ae183398aeb +size 13875345 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 4e2316c409f..7b4479c3024 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:a8e0ec6339419bf50c8139553a65b27dda36a437885ad79fdf7c8fc19a2f200c -size 96439 +oid sha256:177d2e1826df0b449bbdb55d2db1d3963124e8772b86e389dc56409b2c8391ef +size 96449 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index 63f3e8ed782..7ec5454e8c6 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:9f35c3cfd66601b29789bf58d3866dd453e8504bd04932d841d6f902e2c60369 -size 826073 +oid sha256:9bc30210283755ae453860539e85359921975fcf8c0c628c8000cfb1d60e3174 +size 829052 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 3f6da640621..e32dd6e0083 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="71.0.1"; + public static final String ICU4C_VERSION="71.1"; 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 b4a160b3fe8..695f780aa36 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 @@ - + - +