Skip to content

Commit

Permalink
ICU-22922 ICU BRS 77: front-load update version to 77.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mihnita authored and Squash Bot committed Dec 11, 2024
1 parent 515d0a7 commit 001547a
Show file tree
Hide file tree
Showing 28 changed files with 56 additions and 54 deletions.
10 changes: 6 additions & 4 deletions docs/processes/release/tasks/versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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`
Expand All @@ -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)
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/allinone/Build.Windows.IcuVersion.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- This file is used to set the ICU Major Version number, which is used as a suffix on various file names in other Visual Studio projects. -->
<PropertyGroup>
<IcuMajorVersion>76</IcuMajorVersion>
<IcuMajorVersion>77</IcuMajorVersion>
</PropertyGroup>
</Project>
14 changes: 7 additions & 7 deletions icu4c/source/common/unicode/uvernum.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
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.1"
#define U_ICU_VERSION "77.0.1"

/**
* The current ICU library major version number as a string, for library name suffixes.
Expand All @@ -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 */

/*===========================================================================
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.1.
# Generated by GNU Autoconf 2.72 for ICU 77.0.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.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/'

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.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]...
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.1:";;
short | recursive ) echo "Configuration of ICU 77.0.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.1
ICU configure 77.0.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.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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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\\"
Expand Down
4 changes: 2 additions & 2 deletions icu4c/source/data/makedata.mak
Original file line number Diff line number Diff line change
Expand Up @@ -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
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.1.0.0"}
ICUVersion{"76.1.0.0"}
DataVersion{"77.0.1.0"}
ICUVersion{"77.0.1.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.1</version>
<version>77.0.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.1</version>
<version>77.0.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.1</version>
<version>77.0.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.1</version>
<version>77.0.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.1</version>
<version>77.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ public final class VersionInfo implements Comparable<VersionInfo>
* @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.
Expand Down 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, 1, 0, 0);
ICU_VERSION = getInstance(77, 0, 1, 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.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;
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.1</version>
<version>77.0.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.1</version>
<version>77.0.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.1</version>
<version>77.0.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.1</version>
<version>77.0.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.1</version>
<version>77.0.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.1</version>
<version>77.0.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.1</version>
<version>77.0.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.1</version>
<version>77.0.1-SNAPSHOT</version>
</parent>

<artifactId>perf-tests</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions 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.1</version>
<version>77.0.1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>${proj-title} (${project.artifactId})</name>
Expand Down Expand Up @@ -72,7 +72,7 @@
<proj.scm.url>https://github.com/unicode-org/icu</proj.scm.url>

<!-- Version update! -->
<icu.major.version>76</icu.major.version>
<icu.major.version>77</icu.major.version>

<!-- Variables used to generate the javadoc -->
<!-- Version update! -->
Expand Down
8 changes: 4 additions & 4 deletions icu4j/releases_tools/shared.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
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.1</version>
<version>77.0.1-SNAPSHOT</version>
</parent>

<artifactId>samples</artifactId>
Expand Down
Loading

0 comments on commit 001547a

Please sign in to comment.