diff --git a/docs/processes/release/tasks/versions.md b/docs/processes/release/tasks/versions.md index ecc85b15c65c..f64fc28c94bb 100644 --- a/docs/processes/release/tasks/versions.md +++ b/docs/processes/release/tasks/versions.md @@ -161,7 +161,12 @@ Changing the version for Java starting with ICU 74 requires a few steps: public static final String ICU_DATA_VERSION_PATH = "74b"; -2. When creating the final release of a major ICU version, +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";' + +3. When creating the final release of a major ICU version, or a point release (minor version update on a maintenance branch), update the Maven project version for ICU4J at the root (`icu4j/pom.xml`) and all of the submodules with the following Maven command. @@ -185,7 +190,7 @@ The command requires a version number string that follows the typical Java / Mav mvn versions:set -DnewVersion=74.1 -DgenerateBackupPoms=false ``` -3. Immediately after creating the final release of a major ICU version, update the value that represents just the major version number of the semantic version. To do this, update the value of the ICU `icu.major.version` property in the root Maven pom.xml file at `icu4j/pom.xml`. +4. Immediately after creating the final release of a major ICU version, update the value that represents just the major version number of the semantic version. To do this, update the value of the ICU `icu.major.version` property in the root Maven pom.xml file at `icu4j/pom.xml`. This can be done by running the following command: @@ -198,13 +203,17 @@ The command requires a version number string that follows the typical Java / Mav 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. -4. Update the following variables in `icu4j/releases_tools/shared.sh` +5. Update the following variables in `icu4j/releases_tools/shared.sh` * `artifact_version` - The version used in the Maven `pom.xml` files. You can alternatively produce this value by running `mvn help:evaluate -Dexpression=project.version -q -DforceStdout`. * `github_rel_version` - The version used in the name of the GitHub downloadable artifacts. For example "73_2" or "74rc". * `api_report_version` - The major version of the new version. Change during RC BRS. * `api_report_prev_version` - The major version of the previous version. Change during RC BRS. +6. cldr-to-icu build tool has a dependency on the icu4j packages which needs to be updated in [`tools/cldr/cldr-to-icu/pom.xml`](https://github.com/unicode-org/icu/blob/main/tools/cldr/cldr-to-icu/pom.xml). Please update it to match the version that was updated in `icu4j/pom.xml` in the steps above. + + `74.0.1-SNAPSHOT` + #### Until ICU 73 (inclusive) diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h index bed63586c93f..a3cb882623be 100644 --- a/icu4c/source/common/unicode/uvernum.h +++ b/icu4c/source/common/unicode/uvernum.h @@ -59,13 +59,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. @@ -132,7 +132,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION "76.0.1" +#define U_ICU_VERSION "76.1" /** * The current ICU library major version number as a string, for library name suffixes. @@ -151,7 +151,7 @@ /** Data version in ICU4C. * @internal ICU 4.4 Internal Use Only **/ -#define U_ICU_DATA_VERSION "76.0.1" +#define U_ICU_DATA_VERSION "76.1" #endif /* U_HIDE_INTERNAL_API */ /*=========================================================================== diff --git a/icu4c/source/configure b/icu4c/source/configure index b33b1926d998..5f6fd3958ecd 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.0.1. +# Generated by GNU Autoconf 2.72 for ICU 76.1. # # Report bugs to . # @@ -606,8 +606,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ICU' PACKAGE_TARNAME='icu4c' -PACKAGE_VERSION='76.0.1' -PACKAGE_STRING='ICU 76.0.1' +PACKAGE_VERSION='76.1' +PACKAGE_STRING='ICU 76.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.0.1 to adapt to many kinds of systems. +'configure' configures ICU 76.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.0.1:";; + short | recursive ) echo "Configuration of ICU 76.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.0.1 +ICU configure 76.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.0.1, which was +It was created by ICU $as_me 76.1, which was generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -9018,7 +9018,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.0.1, which was +This file was extended by ICU $as_me 76.1, which was generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9074,7 +9074,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.0.1 +ICU config.status 76.1 configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" diff --git a/icu4c/source/data/misc/icuver.txt b/icu4c/source/data/misc/icuver.txt index 240ab60e49c9..048da6a25ce9 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.0.1.0"} - ICUVersion{"76.0.1.0"} + DataVersion{"76.1.0.0"} + ICUVersion{"76.1.0.0"} } diff --git a/icu4j/demos/pom.xml b/icu4j/demos/pom.xml index 2baf924b834a..2990cca0a024 100644 --- a/icu4j/demos/pom.xml +++ b/icu4j/demos/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.0.1-SNAPSHOT + 76.1-SNAPSHOT demos diff --git a/icu4j/main/charset/pom.xml b/icu4j/main/charset/pom.xml index 517f8b54e5de..7b705d9a1fbc 100644 --- a/icu4j/main/charset/pom.xml +++ b/icu4j/main/charset/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.0.1-SNAPSHOT + 76.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/main/collate/pom.xml b/icu4j/main/collate/pom.xml index 9b0bcdd2b926..0cdfd25e6d06 100644 --- a/icu4j/main/collate/pom.xml +++ b/icu4j/main/collate/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.0.1-SNAPSHOT + 76.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/main/common_tests/pom.xml b/icu4j/main/common_tests/pom.xml index 381b36f331db..e5b051c14c5e 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.0.1-SNAPSHOT + 76.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/main/core/pom.xml b/icu4j/main/core/pom.xml index 09a223de01ea..5385b791fdd1 100644 --- a/icu4j/main/core/pom.xml +++ b/icu4j/main/core/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.0.1-SNAPSHOT + 76.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 912a625ed49a..9abf94ba1554 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 @@ -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, 0, 1, 0); + ICU_VERSION = getInstance(76, 1, 0, 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 4040046903e4..94976a5c9185 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.0.1"; + public static final String ICU4C_VERSION="76.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 7eadaeeb2feb..53a41960b9a9 100644 --- a/icu4j/main/currdata/pom.xml +++ b/icu4j/main/currdata/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.0.1-SNAPSHOT + 76.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/main/framework/pom.xml b/icu4j/main/framework/pom.xml index 8873acd95b97..832c518e4bfd 100644 --- a/icu4j/main/framework/pom.xml +++ b/icu4j/main/framework/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.0.1-SNAPSHOT + 76.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/main/icu4j/pom.xml b/icu4j/main/icu4j/pom.xml index be93ead0e7c2..182026251df0 100644 --- a/icu4j/main/icu4j/pom.xml +++ b/icu4j/main/icu4j/pom.xml @@ -9,7 +9,7 @@ com.ibm.icu icu4j-root - 76.0.1-SNAPSHOT + 76.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/main/langdata/pom.xml b/icu4j/main/langdata/pom.xml index f90a598c44d8..ade5a882f708 100644 --- a/icu4j/main/langdata/pom.xml +++ b/icu4j/main/langdata/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.0.1-SNAPSHOT + 76.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/main/localespi/pom.xml b/icu4j/main/localespi/pom.xml index 3ec57d041e41..1526e98516c0 100644 --- a/icu4j/main/localespi/pom.xml +++ b/icu4j/main/localespi/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.0.1-SNAPSHOT + 76.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/main/regiondata/pom.xml b/icu4j/main/regiondata/pom.xml index b1d689827e95..858200ed5988 100644 --- a/icu4j/main/regiondata/pom.xml +++ b/icu4j/main/regiondata/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.0.1-SNAPSHOT + 76.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/main/translit/pom.xml b/icu4j/main/translit/pom.xml index b8f90ee778a8..7219f4bf3835 100644 --- a/icu4j/main/translit/pom.xml +++ b/icu4j/main/translit/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.0.1-SNAPSHOT + 76.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/perf-tests/pom.xml b/icu4j/perf-tests/pom.xml index cdb7fd4c50af..31ab0491de91 100644 --- a/icu4j/perf-tests/pom.xml +++ b/icu4j/perf-tests/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.0.1-SNAPSHOT + 76.1-SNAPSHOT perf-tests diff --git a/icu4j/pom.xml b/icu4j/pom.xml index c04f14611bbf..844b8d866768 100644 --- a/icu4j/pom.xml +++ b/icu4j/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.0.1-SNAPSHOT + 76.1-SNAPSHOT pom ${proj-title} (${project.artifactId}) diff --git a/icu4j/releases_tools/shared.sh b/icu4j/releases_tools/shared.sh index 6845762b600b..1b9b39272b2a 100755 --- a/icu4j/releases_tools/shared.sh +++ b/icu4j/releases_tools/shared.sh @@ -5,8 +5,8 @@ export MAVEN_ARGS='--no-transfer-progress' # Version update! -export artifact_version='76.0.1-SNAPSHOT' -export github_rel_version='76_0_1' +export artifact_version='76.1-SNAPSHOT' +export github_rel_version='76rc' export api_report_version='76' export api_report_prev_version='75' export out_dir=target diff --git a/icu4j/samples/pom.xml b/icu4j/samples/pom.xml index 6de776d04d04..910be88c6acf 100644 --- a/icu4j/samples/pom.xml +++ b/icu4j/samples/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.0.1-SNAPSHOT + 76.1-SNAPSHOT samples diff --git a/icu4j/tools/build/pom.xml b/icu4j/tools/build/pom.xml index c1975788ec82..6113e7e452f7 100644 --- a/icu4j/tools/build/pom.xml +++ b/icu4j/tools/build/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.0.1-SNAPSHOT + 76.1-SNAPSHOT ../../pom.xml diff --git a/icu4j/tools/misc/pom.xml b/icu4j/tools/misc/pom.xml index 0e4ffae4ae88..61cd0a9a8416 100644 --- a/icu4j/tools/misc/pom.xml +++ b/icu4j/tools/misc/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 76.0.1-SNAPSHOT + 76.1-SNAPSHOT ../../pom.xml diff --git a/tools/cldr/cldr-to-icu/build-icu-data.xml b/tools/cldr/cldr-to-icu/build-icu-data.xml index f9bd00343d06..69bf7f577cb0 100644 --- a/tools/cldr/cldr-to-icu/build-icu-data.xml +++ b/tools/cldr/cldr-to-icu/build-icu-data.xml @@ -61,10 +61,10 @@ - + - + diff --git a/tools/cldr/cldr-to-icu/pom.xml b/tools/cldr/cldr-to-icu/pom.xml index e6feaec84601..0d8f6634dcb5 100644 --- a/tools/cldr/cldr-to-icu/pom.xml +++ b/tools/cldr/cldr-to-icu/pom.xml @@ -83,7 +83,7 @@ com.ibm.icu icu4j - 76.0.1-SNAPSHOT + 76.1-SNAPSHOT