diff --git a/docs/processes/release/tasks/versions.md b/docs/processes/release/tasks/versions.md index 5425302e4f56..23f0ea940694 100644 --- a/docs/processes/release/tasks/versions.md +++ b/docs/processes/release/tasks/versions.md @@ -53,6 +53,8 @@ need to be correspondingly updated. See below for more files to be updated and s [icu4c/source/data/misc/icuver.txt](https://github.com/unicode-org/icu/blob/main/icu4c/source/data/misc/icuver.txt) needs to be updated with the correct version number for ICU and its data. +### CLDR-to-ICU Conversion + #### Since ICU 77 The tool takes the `icuVersion` and `icuDataVersion` from the official ICU APIs. @@ -171,7 +173,7 @@ Changing the version for Java starting with ICU 74 requires a few steps: 2. [icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/DebugUtilitiesData.java](https://github.com/unicode-org/icu/blob/main/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/DebugUtilitiesData.java) There is a public string named `ICU4C_VERSION` which should be updated accordingly. - 'public static final String ICU4C_VERSION="74.0.1";' + `public static final String ICU4C_VERSION="74.0.1";` 3. When creating the final release of a major ICU version, or a point release (minor version update on a maintenance branch), @@ -208,7 +210,7 @@ The command requires a version number string that follows the typical Java / Mav This should happen at the same time and along with the work in the previous step for the version number when the version number is updated on `main` in the commit after the release/maintanence branch is cut. In other words, the above `versions:set-property` step should be executed at the same time - `mvn versions:set -DnewVersion=74.0.1-SNAPSHOT` is executed. + `mvn versions:set -DnewVersion=74.0.1-SNAPSHOT -DgenerateBackupPoms=false` is executed. 5. Update the following variables in `icu4j/releases_tools/shared.sh` @@ -229,7 +231,7 @@ Since ICU 77 this moved to a property: ``` Which can be easily be set from command line: ```sh -mvn versions:set-property -Dproperty=icu4j.version -DnewVersion=77.1 -f $ICU_DIR/tools/cldr/cldr-to-icu +mvn versions:set-property -Dproperty=icu4j.version -DnewVersion=77.1 -f $ICU_DIR/tools/cldr/cldr-to-icu -DgenerateBackupPoms=false ``` #### Until ICU 73 (inclusive) @@ -291,7 +293,7 @@ For updating ICU version numbers, follow the steps below. 3. [icu4j/main/core/src/main/java/com/ibm/icu/util/VersionInfo.java](https://github.com/unicode-org/icu/blob/main/icu4j/main/core/src/main/java/com/ibm/icu/util/VersionInfo.java) There is a static block starting at line 501 (as of 54.1) in the source file. - + Update the `ICU_VERSION` value, where the first three arguments represent the major, minor, and patch versions of a semantic version. Use the `getInstance(major, 0, 1, 0)` as the version during pre-release development, diff --git a/icu4c/source/allinone/Build.Windows.IcuVersion.props b/icu4c/source/allinone/Build.Windows.IcuVersion.props index a4023ae9f791..7cfed86463c4 100644 --- a/icu4c/source/allinone/Build.Windows.IcuVersion.props +++ b/icu4c/source/allinone/Build.Windows.IcuVersion.props @@ -3,6 +3,6 @@ - 76 + 77 diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h index a3cb882623be..b947ddf2917c 100644 --- a/icu4c/source/common/unicode/uvernum.h +++ b/icu4c/source/common/unicode/uvernum.h @@ -53,19 +53,19 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION_MAJOR_NUM 76 +#define U_ICU_VERSION_MAJOR_NUM 77 /** The current ICU minor version as an integer. * 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 0 /** 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 0 +#define U_ICU_VERSION_PATCHLEVEL_NUM 1 /** The current ICU build level version as an integer. * This value is for use by ICU clients. It defaults to 0. @@ -79,7 +79,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ -#define U_ICU_VERSION_SUFFIX _76 +#define U_ICU_VERSION_SUFFIX _77 /** * \def U_DEF2_ICU_ENTRY_POINT_RENAME @@ -132,7 +132,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION "76.1" +#define U_ICU_VERSION "77.0.1" /** * The current ICU library major version number as a string, for library name suffixes. @@ -145,13 +145,13 @@ * * @stable ICU 2.6 */ -#define U_ICU_VERSION_SHORT "76" +#define U_ICU_VERSION_SHORT "77" #ifndef U_HIDE_INTERNAL_API /** Data version in ICU4C. * @internal ICU 4.4 Internal Use Only **/ -#define U_ICU_DATA_VERSION "76.1" +#define U_ICU_DATA_VERSION "77.0.1" #endif /* U_HIDE_INTERNAL_API */ /*=========================================================================== diff --git a/icu4c/source/configure b/icu4c/source/configure index c824ff799e6f..5b40e1d33209 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.72 for ICU 76.1. +# Generated by GNU Autoconf 2.72 for ICU 77.0.1. # # Report bugs to . # @@ -606,8 +606,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ICU' PACKAGE_TARNAME='icu4c' -PACKAGE_VERSION='76.1' -PACKAGE_STRING='ICU 76.1' +PACKAGE_VERSION='77.0.1' +PACKAGE_STRING='ICU 77.0.1' PACKAGE_BUGREPORT='https://icu.unicode.org/bugs' PACKAGE_URL='https://icu.unicode.org/' @@ -1387,7 +1387,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 76.1 to adapt to many kinds of systems. +'configure' configures ICU 77.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1453,7 +1453,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ICU 76.1:";; + short | recursive ) echo "Configuration of ICU 77.0.1:";; esac cat <<\_ACEOF @@ -1592,7 +1592,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ICU configure 76.1 +ICU configure 77.0.1 generated by GNU Autoconf 2.72 Copyright (C) 2023 Free Software Foundation, Inc. @@ -2184,7 +2184,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 76.1, which was +It was created by ICU $as_me 77.0.1, which was generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -9019,7 +9019,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 76.1, which was +This file was extended by ICU $as_me 77.0.1, which was generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9075,7 +9075,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -ICU config.status 76.1 +ICU config.status 77.0.1 configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak index 5dd12bc0f797..b9ea7a1ba647 100644 --- a/icu4c/source/data/makedata.mak +++ b/icu4c/source/data/makedata.mak @@ -12,11 +12,11 @@ ############################################################################## # Keep the following in sync with the version - see common/unicode/uvernum.h -U_ICUDATA_NAME=icudt76 +U_ICUDATA_NAME=icudt77 ############################################################################## !IF "$(UWP)" == "UWP" # Optionally change the name of the data file for the UWP version. -U_ICUDATA_NAME=icudt76 +U_ICUDATA_NAME=icudt77 !ENDIF U_ICUDATA_ENDIAN_SUFFIX=l UNICODE_VERSION=16.0 diff --git a/icu4c/source/data/misc/icuver.txt b/icu4c/source/data/misc/icuver.txt index 048da6a25ce9..6f59f13d379f 100644 --- a/icu4c/source/data/misc/icuver.txt +++ b/icu4c/source/data/misc/icuver.txt @@ -9,6 +9,6 @@ // *************************************************************************** icuver:table(nofallback){ CLDRVersion{"46"} - DataVersion{"76.1.0.0"} - ICUVersion{"76.1.0.0"} + DataVersion{"77.0.1.0"} + ICUVersion{"77.0.1.0"} } diff --git a/icu4j/demos/pom.xml b/icu4j/demos/pom.xml index 66eba0ef41c0..52ef383562a7 100644 --- a/icu4j/demos/pom.xml +++ b/icu4j/demos/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.1 + 77.0.1-SNAPSHOT demos diff --git a/icu4j/main/charset/pom.xml b/icu4j/main/charset/pom.xml index ede3f95bd67b..e754aec46d54 100644 --- a/icu4j/main/charset/pom.xml +++ b/icu4j/main/charset/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.1 + 77.0.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/main/collate/pom.xml b/icu4j/main/collate/pom.xml index 4db9dd263c40..78eadff0bb18 100644 --- a/icu4j/main/collate/pom.xml +++ b/icu4j/main/collate/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.1 + 77.0.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/main/common_tests/pom.xml b/icu4j/main/common_tests/pom.xml index f3007b609462..47e379937898 100644 --- a/icu4j/main/common_tests/pom.xml +++ b/icu4j/main/common_tests/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.1 + 77.0.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/main/core/pom.xml b/icu4j/main/core/pom.xml index 93a695c9f7ce..0760367795b8 100644 --- a/icu4j/main/core/pom.xml +++ b/icu4j/main/core/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.1 + 77.0.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/VersionInfo.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/VersionInfo.java index 9abf94ba1554..6c84f2da5b2b 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/util/VersionInfo.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/VersionInfo.java @@ -239,7 +239,7 @@ public final class VersionInfo implements Comparable * @deprecated This API is ICU internal only. */ @Deprecated - public static final String ICU_DATA_VERSION_PATH = "76b"; + public static final String ICU_DATA_VERSION_PATH = "77b"; /** * Data version in ICU4J. @@ -584,7 +584,7 @@ public int compareTo(VersionInfo other) UNICODE_15_1 = getInstance(15, 1, 0, 0); UNICODE_16_0 = getInstance(16, 0, 0, 0); - ICU_VERSION = getInstance(76, 1, 0, 0); + ICU_VERSION = getInstance(77, 0, 1, 0); ICU_DATA_VERSION = ICU_VERSION; UNICODE_VERSION = UNICODE_16_0; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/DebugUtilitiesData.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/DebugUtilitiesData.java index 94976a5c9185..32b420996a60 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/DebugUtilitiesData.java +++ b/icu4j/main/core/src/test/java/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="76.1"; + public static final String ICU4C_VERSION="77.0.1"; public static final int UDebugEnumType = 0; public static final int UCalendarDateFields = 1; public static final int UCalendarMonths = 2; diff --git a/icu4j/main/currdata/pom.xml b/icu4j/main/currdata/pom.xml index a0ec34783c7c..ed3352fa2b10 100644 --- a/icu4j/main/currdata/pom.xml +++ b/icu4j/main/currdata/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.1 + 77.0.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/main/framework/pom.xml b/icu4j/main/framework/pom.xml index ec9480d4a1d8..32a8df866102 100644 --- a/icu4j/main/framework/pom.xml +++ b/icu4j/main/framework/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.1 + 77.0.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/main/icu4j/pom.xml b/icu4j/main/icu4j/pom.xml index 34ab4c7ccf06..bd87662e62f7 100644 --- a/icu4j/main/icu4j/pom.xml +++ b/icu4j/main/icu4j/pom.xml @@ -9,7 +9,7 @@ com.ibm.icu icu4j-root - 76.1 + 77.0.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/main/langdata/pom.xml b/icu4j/main/langdata/pom.xml index 0b37e48c15d9..6310217c076f 100644 --- a/icu4j/main/langdata/pom.xml +++ b/icu4j/main/langdata/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.1 + 77.0.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/main/localespi/pom.xml b/icu4j/main/localespi/pom.xml index acc08ada3e26..d819f3c3ab0b 100644 --- a/icu4j/main/localespi/pom.xml +++ b/icu4j/main/localespi/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.1 + 77.0.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/main/regiondata/pom.xml b/icu4j/main/regiondata/pom.xml index 0984b574c552..0a71c8986f82 100644 --- a/icu4j/main/regiondata/pom.xml +++ b/icu4j/main/regiondata/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.1 + 77.0.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/main/translit/pom.xml b/icu4j/main/translit/pom.xml index 53621bffcccf..98f8a639f44d 100644 --- a/icu4j/main/translit/pom.xml +++ b/icu4j/main/translit/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.1 + 77.0.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/perf-tests/pom.xml b/icu4j/perf-tests/pom.xml index 47acece7a220..3ac628e85648 100644 --- a/icu4j/perf-tests/pom.xml +++ b/icu4j/perf-tests/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.1 + 77.0.1-SNAPSHOT perf-tests diff --git a/icu4j/pom.xml b/icu4j/pom.xml index 816a147287dc..faeb96a96fcc 100644 --- a/icu4j/pom.xml +++ b/icu4j/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.1 + 77.0.1-SNAPSHOT pom ${proj-title} (${project.artifactId}) @@ -72,7 +72,7 @@ https://github.com/unicode-org/icu - 76 + 77 diff --git a/icu4j/releases_tools/shared.sh b/icu4j/releases_tools/shared.sh index 977296929523..3eec622421f6 100755 --- a/icu4j/releases_tools/shared.sh +++ b/icu4j/releases_tools/shared.sh @@ -5,10 +5,10 @@ export MAVEN_ARGS='--no-transfer-progress' # Version update! -export artifact_version='76.1' -export github_rel_version='76_1' -export api_report_version='76' -export api_report_prev_version='75' +export artifact_version='77.0.1-SNAPSHOT' +export github_rel_version='77_0_1' +export api_report_version='77' +export api_report_prev_version='76' export out_dir=target function checkThatJdk8IsDefault() { diff --git a/icu4j/samples/pom.xml b/icu4j/samples/pom.xml index 1072c4790ba2..61b28f651099 100644 --- a/icu4j/samples/pom.xml +++ b/icu4j/samples/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.1 + 77.0.1-SNAPSHOT samples diff --git a/icu4j/tools/build/pom.xml b/icu4j/tools/build/pom.xml index 3e1ab5dbe7c3..7f027bd4b51b 100644 --- a/icu4j/tools/build/pom.xml +++ b/icu4j/tools/build/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.1 + 77.0.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/tools/misc/pom.xml b/icu4j/tools/misc/pom.xml index ee05daa5de1c..796b87eb17d1 100644 --- a/icu4j/tools/misc/pom.xml +++ b/icu4j/tools/misc/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.1 + 77.0.1-SNAPSHOT ../../pom.xml diff --git a/tools/cldr/cldr-to-icu/README.md b/tools/cldr/cldr-to-icu/README.md index 3b1f20a9fc30..295a23135edd 100644 --- a/tools/cldr/cldr-to-icu/README.md +++ b/tools/cldr/cldr-to-icu/README.md @@ -121,9 +121,9 @@ echo $real_icu_ver real_cldr_ver=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout -f $CLDR_DIR/tools` echo $real_cldr_ver # Set dependency versions -mvn versions:set-property -Dproperty=icu4j.version -DnewVersion=$real_icu_ver -f $ICU_DIR/tools/cldr/cldr-to-icu -mvn versions:set-property -Dproperty=cldr-code.version -DnewVersion=$real_cldr_ver -f $ICU_DIR/tools/cldr/cldr-to-icu -mvn versions:set-property -Dproperty=icu4j.version -DnewVersion=$real_icu_ver -f $CLDR_DIR/tools +mvn versions:set-property -DgenerateBackupPoms=false -Dproperty=icu4j.version -DnewVersion=$real_icu_ver -f $ICU_DIR/tools/cldr/cldr-to-icu +mvn versions:set-property -DgenerateBackupPoms=false -Dproperty=cldr-code.version -DnewVersion=$real_cldr_ver -f $ICU_DIR/tools/cldr/cldr-to-icu +mvn versions:set-property -DgenerateBackupPoms=false -Dproperty=icu4j.version -DnewVersion=$real_icu_ver -f $CLDR_DIR/tools ``` ## Build everything diff --git a/tools/cldr/cldr-to-icu/pom.xml b/tools/cldr/cldr-to-icu/pom.xml index 2fb61ec8b4fa..677e632ed190 100644 --- a/tools/cldr/cldr-to-icu/pom.xml +++ b/tools/cldr/cldr-to-icu/pom.xml @@ -20,7 +20,7 @@ 11 11 - 76.1 + 77.0.1-SNAPSHOT 47.0-SNAPSHOT 32.1.1-jre 1.4.4