From da5fc8e730ff7004b23dae537c5f876b994bf1fa Mon Sep 17 00:00:00 2001 From: Erik Torres Date: Wed, 22 Sep 2021 22:51:08 +0000 Subject: [PATCH] ICU-21581 BRSRC 70.1 Version update and regenerate configure for v70.1 In this PR, I am updating the version number from 70.0.1 for the BRS task. Previously, we had frontloaded part of this, so the diff in this PR are not as numerous. It has also been decided that we should differentiate frontloaded tasks and RC tasks by having the version numbers being: Frontload version number: XX.X.X (70.0.1 -> Major.minor.patch) RC/GA version number: XX.X (70.1 -> Major.minor) I've added some documentation for this, for future releases :) --- docs/processes/release/tasks/versions.md | 24 +++++++++++++++++-- icu4c/source/common/unicode/uvernum.h | 8 +++---- icu4c/source/configure | 18 +++++++------- icu4c/source/data/misc/icuver.txt | 4 ++-- icu4j/build.properties | 4 ++-- .../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 ++-- 12 files changed, 50 insertions(+), 30 deletions(-) diff --git a/docs/processes/release/tasks/versions.md b/docs/processes/release/tasks/versions.md index 5dac8bfe261..7d9d01272f9 100644 --- a/docs/processes/release/tasks/versions.md +++ b/docs/processes/release/tasks/versions.md @@ -28,6 +28,26 @@ For reference, see the section in the User Guide about Version numbers here: +### ICU Version Number for Front load, RC and GA tasks + +The process of releasing a new ICU version (E.G. ICU 70.1) is divided in three phases: +* Front loading tasks +* Release Candidate (RC) tasks +* General Availability (GA) tasks + +As of ICU 70, the ICU Version number changes for each of these tasks. + +When "front loading" tasks, the version number will consist of a Major number, Minor number, and a Patch number. +For example: ICU version 70.0.1 + +For the RC and GA tasks, the ICU version number will consist of a Major number and a Minor number. +For example: ICU version 70.1 + +This means that when updating from the front load tasks to the RC tasks, files such as +[icu4c/source/common/unicode/uvernum.h](https://github.com/unicode-org/icu/blob/main/icu4c/source/common/unicode/uvernum.h) +need to be correspondingly updated. See below for more files to be updated and steps to be followed. + + ### ICU Data [icu4c/source/data/misc/icuver.txt](https://github.com/unicode-org/icu/blob/main/icu4c/source/data/misc/icuver.txt) @@ -122,7 +142,7 @@ For updating ICU version numbers, follow the steps below. 54rc. For official releases, use full version numbers using under bar as the separator, e.g. "54_1", "54_1_1". * api.doc.version: The version displayed in API reference doc - use full - version number such as "60.1" for official releases, "60 Milestone 1" for + version number such as "60.1" for official and RC releases, "60 Milestone 1" for milestone 1. * maven.pom.ver: The version used in ICU pom.xml files. Use full version number such as "60.1" for official releases, "61.1-SNAPSHOT" until 61.1 @@ -164,7 +184,7 @@ For updating ICU version numbers, follow the steps below. UNICODE_7_0 = getInstance(7, 0, 0, 0); ICU_VERSION = getInstance(54, 1, 0, 0); - ICU_DATA_VERSION = getInstance(54, 1, 0, 0); + ICU_DATA_VERSION = ICU_VERSION; UNICODE_VERSION = UNICODE_7_0; UCOL_RUNTIME_VERSION = getInstance(8); diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h index d5bdb0f949e..42e8865d7e3 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 "70.0.1" +#define U_ICU_VERSION "70.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 "70.0.1" +#define U_ICU_DATA_VERSION "70.1" #endif /* U_HIDE_INTERNAL_API */ /*=========================================================================== diff --git a/icu4c/source/configure b/icu4c/source/configure index 220591aae33..9eac70c5df2 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 70.0.1. +# Generated by GNU Autoconf 2.69 for ICU 70.1. # # Report bugs to . # @@ -582,8 +582,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ICU' PACKAGE_TARNAME='International Components for Unicode' -PACKAGE_VERSION='70.0.1' -PACKAGE_STRING='ICU 70.0.1' +PACKAGE_VERSION='70.1' +PACKAGE_STRING='ICU 70.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 70.0.1 to adapt to many kinds of systems. +\`configure' configures ICU 70.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 70.0.1:";; + short | recursive ) echo "Configuration of ICU 70.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 70.0.1 +ICU configure 70.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 70.0.1, which was +It was created by ICU $as_me 70.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -8606,7 +8606,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 70.0.1, which was +This file was extended by ICU $as_me 70.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8660,7 +8660,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 70.0.1 +ICU config.status 70.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 b765adeba91..0bc783e145f 100644 --- a/icu4c/source/data/misc/icuver.txt +++ b/icu4c/source/data/misc/icuver.txt @@ -9,6 +9,6 @@ // *************************************************************************** icuver:table(nofallback){ CLDRVersion{"40"} - DataVersion{"70.0.1.0"} - ICUVersion{"70.0.1.0"} + DataVersion{"70.1.0.0"} + ICUVersion{"70.1.0.0"} } diff --git a/icu4j/build.properties b/icu4j/build.properties index de5d8e4f941..5e6ab3b2514 100644 --- a/icu4j/build.properties +++ b/icu4j/build.properties @@ -7,6 +7,6 @@ api.report.version = 70 api.report.prev.version = 69 release.file.ver = 70rc -api.doc.version = 70 Release Candidate -maven.pom.ver = 70.0.1-SNAPSHOT +api.doc.version = 70.1 +maven.pom.ver = 70.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 8397369b723..e710f4976ab 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(70, 0, 1, 0); + ICU_VERSION = getInstance(70, 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 6578a6f1cc6..f766441ac19 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 = 70 -icu4j.impl.version = 70.0.1 +icu4j.impl.version = 70.1 icu4j.data.version = 70 default.exec.env = JavaSE-1.7 diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 93dc5f796e3..b8965a7193e 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:0999c85ee63f5dcf052f3f1f6157e0cefeb29bd54a9a3ca45e5c023f0c07f1d7 -size 13627686 +oid sha256:b7a56cb0519ca384bb5b6d273c74bf237853e9865b7151a8624816360321a35a +size 13627867 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index c7a373bf1e1..ee7fe0df7f7 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:2d35dbb4712e62f6c8e6fd4ef5838cc009939e29f82270118adc591fe6a4bab2 -size 96207 +oid sha256:530c8219acf0ab9e6bda05d7048a260d53cc4ed7aee3166e95a528dd510bc266 +size 96217 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index fb79278fb30..eddebbb336d 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:e77dd7e533f458a5b6076b5b516852c7f2637ce899ae83766a2b4e6beba7e3ce -size 826071 +oid sha256:683ed2daa2eedcdf4795e98fc2f7295c1945d6e953e93881db8f8f85ff43dcbe +size 829042 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 9e608627796..bc21af445b9 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="70.0.1"; + public static final String ICU4C_VERSION="70.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 cdddb5f1590..5af22010d2b 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 @@ - + - + -- 2.40.0