Skip to content

Commit

Permalink
ICU-22723 BRS_76_RC: Update version number to 76.1-SNAPSHOT
Browse files Browse the repository at this point in the history
  • Loading branch information
rp9-next committed Sep 19, 2024
1 parent 23c641f commit 30efee0
Show file tree
Hide file tree
Showing 26 changed files with 51 additions and 42 deletions.
15 changes: 12 additions & 3 deletions docs/processes/release/tasks/versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,12 @@ Changing the version for Java starting with ICU 74 requires a few steps:
public static final String <b>ICU_DATA_VERSION_PATH = "74b";</b>
</pre>

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.
Expand All @@ -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:

Expand All @@ -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.

`<version>74.0.1-SNAPSHOT</version>`


#### Until ICU 73 (inclusive)

Expand Down
8 changes: 4 additions & 4 deletions icu4c/source/common/unicode/uvernum.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand All @@ -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 */

/*===========================================================================
Expand Down
18 changes: 9 additions & 9 deletions icu4c/source/configure
Original file line number Diff line number Diff line change
@@ -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 <https://icu.unicode.org/bugs>.
#
Expand Down Expand Up @@ -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/'

Expand Down Expand Up @@ -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]...
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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\\"
Expand Down
4 changes: 2 additions & 2 deletions icu4c/source/data/misc/icuver.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
}
2 changes: 1 addition & 1 deletion icu4j/demos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<version>76.0.1-SNAPSHOT</version>
<version>76.1-SNAPSHOT</version>
</parent>

<artifactId>demos</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion icu4j/main/charset/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<version>76.0.1-SNAPSHOT</version>
<version>76.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion icu4j/main/collate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<version>76.0.1-SNAPSHOT</version>
<version>76.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion icu4j/main/common_tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<version>76.0.1-SNAPSHOT</version>
<version>76.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion icu4j/main/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<version>76.0.1-SNAPSHOT</version>
<version>76.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion icu4j/main/currdata/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<version>76.0.1-SNAPSHOT</version>
<version>76.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion icu4j/main/framework/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<version>76.0.1-SNAPSHOT</version>
<version>76.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion icu4j/main/icu4j/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<version>76.0.1-SNAPSHOT</version>
<version>76.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion icu4j/main/langdata/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<version>76.0.1-SNAPSHOT</version>
<version>76.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion icu4j/main/localespi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<version>76.0.1-SNAPSHOT</version>
<version>76.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion icu4j/main/regiondata/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<version>76.0.1-SNAPSHOT</version>
<version>76.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion icu4j/main/translit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<version>76.0.1-SNAPSHOT</version>
<version>76.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion icu4j/perf-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<version>76.0.1-SNAPSHOT</version>
<version>76.1-SNAPSHOT</version>
</parent>

<artifactId>perf-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion icu4j/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<version>76.0.1-SNAPSHOT</version>
<version>76.1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>${proj-title} (${project.artifactId})</name>
Expand Down
4 changes: 2 additions & 2 deletions icu4j/releases_tools/shared.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion icu4j/samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<version>76.0.1-SNAPSHOT</version>
<version>76.1-SNAPSHOT</version>
</parent>

<artifactId>samples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion icu4j/tools/build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<version>76.0.1-SNAPSHOT</version>
<version>76.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion icu4j/tools/misc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-root</artifactId>
<version>76.0.1-SNAPSHOT</version>
<version>76.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions tools/cldr/cldr-to-icu/build-icu-data.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@
<property name="specialsDir" value="${basedir}/../../../icu4c/source/data/xml"/>

<!-- Default value for ICU version (icuver.txt). Update this for each release. -->
<property name="icuVersion" value="76.0.1.0"/>
<property name="icuVersion" value="76.1.0.0"/>

<!-- Default value for ICU data version (icuver.txt). Update this for each release. -->
<property name="icuDataVersion" value="76.0.1.0"/>
<property name="icuDataVersion" value="76.1.0.0"/>

<!-- An override for the CLDR version string (icuver.txt and others). This will be
extracted from the CLDR library used for building the data if not set here. -->
Expand Down
2 changes: 1 addition & 1 deletion tools/cldr/cldr-to-icu/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
<version>76.0.1-SNAPSHOT</version>
<version>76.1-SNAPSHOT</version>
<!-- Note: see https://github.com/unicode-org/icu/packages/1954682/versions
for the icu4j.version tag to use. In general we should just use the latest
SNAPSHOT for the ICU version that we want, so this should only need updating
Expand Down

0 comments on commit 30efee0

Please sign in to comment.