From 53f4ddf2781d8a6af1454a9794aca049c6216842 Mon Sep 17 00:00:00 2001 From: Erik Torres <ertorres@microsoft.com> Date: Thu, 17 Feb 2022 18:16:14 +0000 Subject: [PATCH] ICU-21900 BRSRC 71.0.1 Version update and regenerate configure See #1973 --- icu4c/source/common/common.vcxproj | 4 ++-- icu4c/source/common/common_uwp.vcxproj | 4 ++-- icu4c/source/common/unicode/uvernum.h | 14 +++++++------- icu4c/source/configure | 18 +++++++++--------- icu4c/source/data/makedata.mak | 4 ++-- icu4c/source/i18n/i18n.vcxproj | 4 ++-- icu4c/source/i18n/i18n_uwp.vcxproj | 16 ++++++++-------- icu4c/source/io/io.vcxproj | 4 ++-- icu4c/source/layoutex/layoutex.vcxproj | 8 ++++---- icu4c/source/stubdata/stubdata.vcxproj | 2 +- icu4c/source/tools/ctestfw/ctestfw.vcxproj | 4 ++-- icu4c/source/tools/toolutil/toolutil.vcxproj | 16 ++++++++-------- icu4j/build.properties | 10 +++++----- .../core/src/com/ibm/icu/util/VersionInfo.java | 4 ++-- icu4j/main/shared/build/common.properties | 6 +++--- 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 +- 19 files changed, 66 insertions(+), 66 deletions(-) diff --git a/icu4c/source/common/common.vcxproj b/icu4c/source/common/common.vcxproj index fdc0e8d71fd..6b0a60e46c1 100644 --- a/icu4c/source/common/common.vcxproj +++ b/icu4c/source/common/common.vcxproj @@ -58,7 +58,7 @@ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> </ClCompile> <Link> - <OutputFile>..\..\$(IcuBinOutputDir)\icuuc70d.dll</OutputFile> + <OutputFile>..\..\$(IcuBinOutputDir)\icuuc71d.dll</OutputFile> <ProgramDatabaseFile>.\..\..\$(IcuLibOutputDir)\icuucd.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\$(IcuLibOutputDir)\icuucd.lib</ImportLibrary> </Link> @@ -70,7 +70,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> </ClCompile> <Link> - <OutputFile>..\..\$(IcuBinOutputDir)\icuuc70.dll</OutputFile> + <OutputFile>..\..\$(IcuBinOutputDir)\icuuc71.dll</OutputFile> <ProgramDatabaseFile>.\..\..\$(IcuLibOutputDir)\icuuc.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\$(IcuLibOutputDir)\icuuc.lib</ImportLibrary> </Link> diff --git a/icu4c/source/common/common_uwp.vcxproj b/icu4c/source/common/common_uwp.vcxproj index 09743e6babc..dcd95b8c318 100644 --- a/icu4c/source/common/common_uwp.vcxproj +++ b/icu4c/source/common/common_uwp.vcxproj @@ -125,7 +125,7 @@ <Link> <EnableCOMDATFolding>true</EnableCOMDATFolding> <AdditionalDependencies>vccorlib.lib;msvcrt.lib;vcruntime.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>..\..\$(IcuBinOutputDir)\icuuc70.dll</OutputFile> + <OutputFile>..\..\$(IcuBinOutputDir)\icuuc71.dll</OutputFile> <ProgramDatabaseFile>.\..\..\$(IcuLibOutputDir)\icuuc.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\$(IcuLibOutputDir)\icuuc.lib</ImportLibrary> </Link> @@ -148,7 +148,7 @@ <Link> <GenerateDebugInformation>true</GenerateDebugInformation> <AdditionalDependencies>vccorlibd.lib;msvcrtd.lib;vcruntimed.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>..\..\$(IcuBinOutputDir)\icuuc70d.dll</OutputFile> + <OutputFile>..\..\$(IcuBinOutputDir)\icuuc71d.dll</OutputFile> <ProgramDatabaseFile>.\..\..\$(IcuLibOutputDir)\icuucd.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\$(IcuLibOutputDir)\icuucd.lib</ImportLibrary> </Link> diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h index 42e8865d7e3..4b69e131dd1 100644 --- a/icu4c/source/common/unicode/uvernum.h +++ b/icu4c/source/common/unicode/uvernum.h @@ -60,19 +60,19 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION_MAJOR_NUM 70 +#define U_ICU_VERSION_MAJOR_NUM 71 /** 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. @@ -86,7 +86,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ -#define U_ICU_VERSION_SUFFIX _70 +#define U_ICU_VERSION_SUFFIX _71 /** * \def U_DEF2_ICU_ENTRY_POINT_RENAME @@ -139,7 +139,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION "70.1" +#define U_ICU_VERSION "71.0.1" /** * The current ICU library major version number as a string, for library name suffixes. @@ -152,13 +152,13 @@ * * @stable ICU 2.6 */ -#define U_ICU_VERSION_SHORT "70" +#define U_ICU_VERSION_SHORT "71" #ifndef U_HIDE_INTERNAL_API /** Data version in ICU4C. * @internal ICU 4.4 Internal Use Only **/ -#define U_ICU_DATA_VERSION "70.1" +#define U_ICU_DATA_VERSION "71.0.1" #endif /* U_HIDE_INTERNAL_API */ /*=========================================================================== diff --git a/icu4c/source/configure b/icu4c/source/configure index 03284af0bc2..c183daf4fb0 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.1. +# Generated by GNU Autoconf 2.69 for ICU 71.0.1. # # Report bugs to <http://icu-project.org/bugs>. # @@ -582,8 +582,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ICU' PACKAGE_TARNAME='International Components for Unicode' -PACKAGE_VERSION='70.1' -PACKAGE_STRING='ICU 70.1' +PACKAGE_VERSION='71.0.1' +PACKAGE_STRING='ICU 71.0.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.1 to adapt to many kinds of systems. +\`configure' configures ICU 71.0.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.1:";; + short | recursive ) echo "Configuration of ICU 71.0.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.1 +ICU configure 71.0.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.1, which was +It was created by ICU $as_me 71.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -8601,7 +8601,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.1, which was +This file was extended by ICU $as_me 71.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8655,7 +8655,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.1 +ICU config.status 71.0.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak index 95d6baff562..3825da92b9b 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=icudt70 +U_ICUDATA_NAME=icudt71 ############################################################################## !IF "$(UWP)" == "UWP" # Optionally change the name of the data file for the UWP version. -U_ICUDATA_NAME=icudt70 +U_ICUDATA_NAME=icudt71 !ENDIF U_ICUDATA_ENDIAN_SUFFIX=l UNICODE_VERSION=14.0 diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj index 3471cf3e55d..23b8527cf0e 100644 --- a/icu4c/source/i18n/i18n.vcxproj +++ b/icu4c/source/i18n/i18n.vcxproj @@ -60,7 +60,7 @@ </ClCompile> <Link> <AdditionalDependencies>icuucd.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>..\..\$(IcuBinOutputDir)\icuin70d.dll</OutputFile> + <OutputFile>..\..\$(IcuBinOutputDir)\icuin71d.dll</OutputFile> <ProgramDatabaseFile>.\..\..\$(IcuLibOutputDir)\icuind.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\$(IcuLibOutputDir)\icuind.lib</ImportLibrary> </Link> @@ -73,7 +73,7 @@ </ClCompile> <Link> <AdditionalDependencies>icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>..\..\$(IcuBinOutputDir)\icuin70.dll</OutputFile> + <OutputFile>..\..\$(IcuBinOutputDir)\icuin71.dll</OutputFile> <ProgramDatabaseFile>.\..\..\$(IcuLibOutputDir)\icuin.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\$(IcuLibOutputDir)\icuin.lib</ImportLibrary> </Link> diff --git a/icu4c/source/i18n/i18n_uwp.vcxproj b/icu4c/source/i18n/i18n_uwp.vcxproj index c7358d72e59..ca0f335927b 100644 --- a/icu4c/source/i18n/i18n_uwp.vcxproj +++ b/icu4c/source/i18n/i18n_uwp.vcxproj @@ -186,7 +186,7 @@ <ProgramDataBaseFileName>.\x86\ReleaseUWP/</ProgramDataBaseFileName> </ClCompile> <Link> - <OutputFile>..\..\bin32uwp\icuin70.dll</OutputFile> + <OutputFile>..\..\bin32uwp\icuin71.dll</OutputFile> <ProgramDatabaseFile>.\..\..\lib32uwp\icuin.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\lib32uwp\icuin.lib</ImportLibrary> <AdditionalDependencies>..\..\lib32uwp\icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -203,7 +203,7 @@ <ProgramDataBaseFileName>.\x86\DebugUWP/</ProgramDataBaseFileName> </ClCompile> <Link> - <OutputFile>..\..\bin32uwp\icuin70d.dll</OutputFile> + <OutputFile>..\..\bin32uwp\icuin71d.dll</OutputFile> <ProgramDatabaseFile>.\..\..\lib32uwp\icuind.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\lib32uwp\icuind.lib</ImportLibrary> <AdditionalDependencies>..\..\lib32uwp\icuucd.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -220,7 +220,7 @@ <ProgramDataBaseFileName>.\x64\ReleaseUWP/</ProgramDataBaseFileName> </ClCompile> <Link> - <OutputFile>..\..\bin64uwp\icuin70.dll</OutputFile> + <OutputFile>..\..\bin64uwp\icuin71.dll</OutputFile> <ProgramDatabaseFile>.\..\..\lib64uwp\icuin.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\lib64uwp\icuin.lib</ImportLibrary> <AdditionalDependencies>..\..\lib64uwp\icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -237,7 +237,7 @@ <ProgramDataBaseFileName>.\x64\DebugUWP/</ProgramDataBaseFileName> </ClCompile> <Link> - <OutputFile>..\..\bin64uwp\icuin70d.dll</OutputFile> + <OutputFile>..\..\bin64uwp\icuin71d.dll</OutputFile> <ProgramDatabaseFile>.\..\..\lib64uwp\icuind.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\lib64uwp\icuind.lib</ImportLibrary> <AdditionalDependencies>..\..\lib64uwp\icuucd.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -254,7 +254,7 @@ <ProgramDataBaseFileName>.\ARM\ReleaseUWP/</ProgramDataBaseFileName> </ClCompile> <Link> - <OutputFile>..\..\binARMuwp\icuin70.dll</OutputFile> + <OutputFile>..\..\binARMuwp\icuin71.dll</OutputFile> <ProgramDatabaseFile>.\..\..\libARMuwp\icuin.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\libARMuwp\icuin.lib</ImportLibrary> <AdditionalDependencies>..\..\libARMuwp\icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -271,7 +271,7 @@ <ProgramDataBaseFileName>.\ARM\DebugUWP/</ProgramDataBaseFileName> </ClCompile> <Link> - <OutputFile>..\..\binARMuwp\icuin70d.dll</OutputFile> + <OutputFile>..\..\binARMuwp\icuin71d.dll</OutputFile> <ProgramDatabaseFile>.\..\..\libARMuwp\icuind.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\libARMuwp\icuind.lib</ImportLibrary> <AdditionalDependencies>..\..\libARMuwp\icuucd.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -288,7 +288,7 @@ <ProgramDataBaseFileName>.\ARM64\ReleaseUWP/</ProgramDataBaseFileName> </ClCompile> <Link> - <OutputFile>..\..\binARM64uwp\icuin70.dll</OutputFile> + <OutputFile>..\..\binARM64uwp\icuin71.dll</OutputFile> <ProgramDatabaseFile>.\..\..\libARM64uwp\icuin.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\libARM64uwp\icuin.lib</ImportLibrary> <AdditionalDependencies>..\..\libARM64uwp\icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -305,7 +305,7 @@ <ProgramDataBaseFileName>.\ARM64\DebugUWP/</ProgramDataBaseFileName> </ClCompile> <Link> - <OutputFile>..\..\binARM64uwp\icuin70d.dll</OutputFile> + <OutputFile>..\..\binARM64uwp\icuin71d.dll</OutputFile> <ProgramDatabaseFile>.\..\..\libARM64uwp\icuind.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\libARM64uwp\icuind.lib</ImportLibrary> <AdditionalDependencies>..\..\libARM64uwp\icuucd.lib;%(AdditionalDependencies)</AdditionalDependencies> diff --git a/icu4c/source/io/io.vcxproj b/icu4c/source/io/io.vcxproj index 56957edc8b9..34af85f6d93 100644 --- a/icu4c/source/io/io.vcxproj +++ b/icu4c/source/io/io.vcxproj @@ -60,7 +60,7 @@ </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> - <OutputFile>..\..\$(IcuBinOutputDir)\icuio70d.dll</OutputFile> + <OutputFile>..\..\$(IcuBinOutputDir)\icuio71d.dll</OutputFile> <ProgramDatabaseFile>..\..\$(IcuLibOutputDir)\icuiod.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\$(IcuLibOutputDir)\icuiod.lib</ImportLibrary> <AdditionalDependencies>icuucd.lib;icuind.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -73,7 +73,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> </ClCompile> <Link> - <OutputFile>..\..\$(IcuBinOutputDir)\icuio70.dll</OutputFile> + <OutputFile>..\..\$(IcuBinOutputDir)\icuio71.dll</OutputFile> <ProgramDatabaseFile>..\..\$(IcuLibOutputDir)\icuio.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\$(IcuLibOutputDir)\icuio.lib</ImportLibrary> <AdditionalDependencies>icuuc.lib;icuin.lib;%(AdditionalDependencies)</AdditionalDependencies> diff --git a/icu4c/source/layoutex/layoutex.vcxproj b/icu4c/source/layoutex/layoutex.vcxproj index 810bbba913c..c9cbce51e79 100644 --- a/icu4c/source/layoutex/layoutex.vcxproj +++ b/icu4c/source/layoutex/layoutex.vcxproj @@ -54,7 +54,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <OutputFile>..\..\bin\iculx70.dll</OutputFile> + <OutputFile>..\..\bin\iculx71.dll</OutputFile> <AdditionalDependencies>icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>.\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ProgramDatabaseFile>.\..\..\lib\iculx.pdb</ProgramDatabaseFile> @@ -79,7 +79,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <OutputFile>..\..\bin\iculx70d.dll</OutputFile> + <OutputFile>..\..\bin\iculx71d.dll</OutputFile> <AdditionalDependencies>icuucd.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>.\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -104,7 +104,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <OutputFile>..\..\bin64\iculx70.dll</OutputFile> + <OutputFile>..\..\bin64\iculx71.dll</OutputFile> <AdditionalDependencies>icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>.\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ProgramDatabaseFile>.\..\..\lib64\iculx.pdb</ProgramDatabaseFile> @@ -127,7 +127,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <OutputFile>..\..\bin64\iculx70d.dll</OutputFile> + <OutputFile>..\..\bin64\iculx71d.dll</OutputFile> <AdditionalDependencies>icuucd.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories>.\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/icu4c/source/stubdata/stubdata.vcxproj b/icu4c/source/stubdata/stubdata.vcxproj index 64a6ef1a03a..5607dead597 100644 --- a/icu4c/source/stubdata/stubdata.vcxproj +++ b/icu4c/source/stubdata/stubdata.vcxproj @@ -56,7 +56,7 @@ <SetChecksum>true</SetChecksum> <TurnOffAssemblyGeneration>true</TurnOffAssemblyGeneration> <!-- Note: stubdata is somewhat odd in that it doesn't suffix the Debug output DLL/LIB with a "d" like common/i18n/etc. --> - <OutputFile>..\..\$(IcuBinOutputDir)\icudt70.dll</OutputFile> + <OutputFile>..\..\$(IcuBinOutputDir)\icudt71.dll</OutputFile> <ProgramDatabaseFile>.\..\..\$(IcuLibOutputDir)\icudt.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\$(IcuLibOutputDir)\icudt.lib</ImportLibrary> </Link> diff --git a/icu4c/source/tools/ctestfw/ctestfw.vcxproj b/icu4c/source/tools/ctestfw/ctestfw.vcxproj index 1dd8e2602c5..a4bd954bf56 100644 --- a/icu4c/source/tools/ctestfw/ctestfw.vcxproj +++ b/icu4c/source/tools/ctestfw/ctestfw.vcxproj @@ -53,7 +53,7 @@ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> </ClCompile> <Link> - <OutputFile>..\..\..\$(IcuBinOutputDir)\icutest70d.exe</OutputFile> + <OutputFile>..\..\..\$(IcuBinOutputDir)\icutest71d.exe</OutputFile> <ProgramDatabaseFile>.\..\..\..\$(IcuLibOutputDir)\icutestd.pdb</ProgramDatabaseFile> <ImportLibrary>.\..\..\..\$(IcuLibOutputDir)\icutestd.lib</ImportLibrary> <AdditionalDependencies>icuucd.lib;icutud.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -66,7 +66,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> </ClCompile> <Link> - <OutputFile>..\..\..\$(IcuBinOutputDir)\icutest70.exe</OutputFile> + <OutputFile>..\..\..\$(IcuBinOutputDir)\icutest71.exe</OutputFile> <ProgramDatabaseFile>.\..\..\..\$(IcuLibOutputDir)\icutest.pdb</ProgramDatabaseFile> <ImportLibrary>.\..\..\..\$(IcuLibOutputDir)\icutest.lib</ImportLibrary> <AdditionalDependencies>icuuc.lib;icutu.lib;%(AdditionalDependencies)</AdditionalDependencies> diff --git a/icu4c/source/tools/toolutil/toolutil.vcxproj b/icu4c/source/tools/toolutil/toolutil.vcxproj index b74ac41cb0e..c7088baf676 100644 --- a/icu4c/source/tools/toolutil/toolutil.vcxproj +++ b/icu4c/source/tools/toolutil/toolutil.vcxproj @@ -74,7 +74,7 @@ <TypeLibraryName>.\..\..\..\lib\icutu.tlb</TypeLibraryName> </Midl> <Link> - <OutputFile>..\..\..\bin\icutu70.dll</OutputFile> + <OutputFile>..\..\..\bin\icutu71.dll</OutputFile> <ProgramDatabaseFile>.\..\..\..\lib\icutu.pdb</ProgramDatabaseFile> <DataExecutionPrevention> </DataExecutionPrevention> @@ -86,7 +86,7 @@ <TypeLibraryName>.\..\..\..\lib\icutud.tlb</TypeLibraryName> </Midl> <Link> - <OutputFile>..\..\..\bin\icutu70d.dll</OutputFile> + <OutputFile>..\..\..\bin\icutu71d.dll</OutputFile> <ProgramDatabaseFile>.\..\..\..\lib\icutud.pdb</ProgramDatabaseFile> <DataExecutionPrevention> </DataExecutionPrevention> @@ -113,7 +113,7 @@ <WholeProgramOptimization>true</WholeProgramOptimization> </ClCompile> <Link> - <OutputFile>..\..\..\bin64\icutu70.dll</OutputFile> + <OutputFile>..\..\..\bin64\icutu71.dll</OutputFile> <ProgramDatabaseFile>.\..\..\..\lib64\icutu.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\..\lib64\icutu.lib</ImportLibrary> </Link> @@ -123,7 +123,7 @@ <TypeLibraryName>.\..\..\..\lib64\icutud.tlb</TypeLibraryName> </Midl> <Link> - <OutputFile>..\..\..\bin64\icutu70d.dll</OutputFile> + <OutputFile>..\..\..\bin64\icutu71d.dll</OutputFile> <ProgramDatabaseFile>.\..\..\..\lib64\icutud.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\..\lib64\icutud.lib</ImportLibrary> </Link> @@ -144,7 +144,7 @@ <TypeLibraryName>..\..\..\libARM\icutu.tlb</TypeLibraryName> </Midl> <Link> - <OutputFile>..\..\..\binARM\icutu70.dll</OutputFile> + <OutputFile>..\..\..\binARM\icutu71.dll</OutputFile> <ProgramDatabaseFile>.\..\..\..\libARM\icutu.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\..\libARM\icutu.lib</ImportLibrary> </Link> @@ -157,7 +157,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <OutputFile>..\..\..\binARM\icutu70d.dll</OutputFile> + <OutputFile>..\..\..\binARM\icutu71d.dll</OutputFile> <ProgramDatabaseFile>.\..\..\..\libARM\icutud.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\..\libARM\icutud.lib</ImportLibrary> </Link> @@ -178,7 +178,7 @@ <TypeLibraryName>.\..\..\..\libARM64\icutu.tlb</TypeLibraryName> </Midl> <Link> - <OutputFile>..\..\..\binARM64\icutu70.dll</OutputFile> + <OutputFile>..\..\..\binARM64\icutu71.dll</OutputFile> <ProgramDatabaseFile>.\..\..\..\libARM64\icutu.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\..\libARM64\icutu.lib</ImportLibrary> </Link> @@ -191,7 +191,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <OutputFile>..\..\..\binARM64\icutu70d.dll</OutputFile> + <OutputFile>..\..\..\binARM64\icutu71d.dll</OutputFile> <ProgramDatabaseFile>.\..\..\..\libARM64\icutud.pdb</ProgramDatabaseFile> <ImportLibrary>..\..\..\libARM64\icutud.lib</ImportLibrary> </Link> diff --git a/icu4j/build.properties b/icu4j/build.properties index ef7b9d88512..0b39e241551 100644 --- a/icu4j/build.properties +++ b/icu4j/build.properties @@ -4,9 +4,9 @@ #* Copyright (C) 2009-2016, International Business Machines Corporation and * #* others. All Rights Reserved. * #******************************************************************************* -api.report.version = 70 -api.report.prev.version = 69 -release.file.ver = 70_1 -api.doc.version = 70.1 -maven.pom.ver = 70.1 +api.report.version = 71 +api.report.prev.version = 70 +release.file.ver = 71rc +api.doc.version = 71 Release Candidate +maven.pom.ver = 71.0.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 e710f4976ab..704a6808650 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 @@ -218,7 +218,7 @@ public final class VersionInfo implements Comparable<VersionInfo> * @deprecated This API is ICU internal only. */ @Deprecated - public static final String ICU_DATA_VERSION_PATH = "70b"; + public static final String ICU_DATA_VERSION_PATH = "71b"; /** * Data version in ICU4J. @@ -560,7 +560,7 @@ public final class VersionInfo implements Comparable<VersionInfo> UNICODE_13_0 = getInstance(13, 0, 0, 0); UNICODE_14_0 = getInstance(14, 0, 0, 0); - ICU_VERSION = getInstance(70, 1, 0, 0); + ICU_VERSION = getInstance(71, 0, 1, 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 f766441ac19..c8d81493810 100644 --- a/icu4j/main/shared/build/common.properties +++ b/icu4j/main/shared/build/common.properties @@ -6,9 +6,9 @@ #******************************************************************************* # Version numbers, etc. -icu4j.spec.version = 70 -icu4j.impl.version = 70.1 -icu4j.data.version = 70 +icu4j.spec.version = 71 +icu4j.impl.version = 71.0.1 +icu4j.data.version = 71 default.exec.env = JavaSE-1.7 copyright = \u00A9 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 40740329981..028f0ec4402 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:cc20943a393a23436ebb1ffccfdb299519c546a9628f8be13ceacee2789507e0 -size 13873153 +oid sha256:2b3e7923d7cbc94a9aa6c61dae992fa05c89bdf478037d95d734be8ce1916c9a +size 13872977 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 2d9b3a455b3..9a34272db0a 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:cb858bb84720a72c1382276b53c94454ae959b1cddd3acbf2918cb75277b4320 -size 96439 +oid sha256:f26e482f0980c1eadef4e7febb391e4495e23c3ed9c2593b08e56e3d5d2695cc +size 96449 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index 979530cdb7d..a4521cab793 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:a8fc1bdc460e1d48141c46baff1ff00e003350b892cca78a89a11152c04e6a1a -size 826063 +oid sha256:722b29559d3881c6785c3b40c8b2313e79d5ad52c99287ab328229186e171260 +size 829052 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 bc21af445b9..3f6da640621 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.1"; + public static final String ICU4C_VERSION="71.0.1"; public static final int UDebugEnumType = 0; public static final int UCalendarDateFields = 1; public static final int UCalendarMonths = 2; -- 2.40.0