ICU-21480 BRS69RC Version update and regenerate configure for v69
See #1567
diff --git a/icu4c/readme.html b/icu4c/readme.html
index 06381c5..c1aaf83 100644
--- a/icu4c/readme.html
+++ b/icu4c/readme.html
@@ -3,7 +3,7 @@
<html lang="en-US" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
<head>
- <title>ReadMe for ICU 68.2</title>
+ <title>ReadMe for ICU 69.1</title>
<meta name="COPYRIGHT" content=
"Copyright (C) 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html"/>
<!-- meta name="COPYRIGHT" content=
@@ -33,7 +33,7 @@
<span class="only-rc">Release Candidate</span>
<!-- <span class="only-milestone">(Milestone Release)</span> -->
<span class="only-milestone">(Preview Release)</span>
- <abbr title="International Components for Unicode">ICU</abbr> 68.2 ReadMe
+ <abbr title="International Components for Unicode">ICU</abbr> 69.1 ReadMe
</h1>
<!-- Most of the time we shouldn't need to comment/uncomment this paragraph, just change the body class -->
@@ -237,7 +237,7 @@
<h2><a name="News" href="#News" id="News">What Is New In This Release?</a></h2>
- <p>See the <a href="http://site.icu-project.org/download/68">ICU 68 download page</a>
+ <p>See the <a href="http://site.icu-project.org/download/69">ICU 69 download page</a>
for more information on this release, including any other changes, bug fixes, known issues,
changes to supported platforms and build environments,
and migration issues for existing applications migrating from previous ICU releases.</p>
diff --git a/icu4c/source/common/common.vcxproj b/icu4c/source/common/common.vcxproj
index d7f668e..ec2b302 100644
--- a/icu4c/source/common/common.vcxproj
+++ b/icu4c/source/common/common.vcxproj
@@ -58,7 +58,7 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
- <OutputFile>..\..\$(IcuBinOutputDir)\icuuc68d.dll</OutputFile>
+ <OutputFile>..\..\$(IcuBinOutputDir)\icuuc69d.dll</OutputFile>
<ProgramDatabaseFile>.\..\..\$(IcuLibOutputDir)\icuucd.pdb</ProgramDatabaseFile>
<ImportLibrary>..\..\$(IcuLibOutputDir)\icuucd.lib</ImportLibrary>
</Link>
@@ -70,7 +70,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
</ClCompile>
<Link>
- <OutputFile>..\..\$(IcuBinOutputDir)\icuuc68.dll</OutputFile>
+ <OutputFile>..\..\$(IcuBinOutputDir)\icuuc69.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 a579172..da2b899 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)\icuuc68.dll</OutputFile>
+ <OutputFile>..\..\$(IcuBinOutputDir)\icuuc69.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)\icuuc68d.dll</OutputFile>
+ <OutputFile>..\..\$(IcuBinOutputDir)\icuuc69d.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 a46481a..b09d494 100644
--- a/icu4c/source/common/unicode/uvernum.h
+++ b/icu4c/source/common/unicode/uvernum.h
@@ -60,13 +60,13 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.4
*/
-#define U_ICU_VERSION_MAJOR_NUM 68
+#define U_ICU_VERSION_MAJOR_NUM 69
/** 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 2
+#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
@@ -86,7 +86,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.6
*/
-#define U_ICU_VERSION_SUFFIX _68
+#define U_ICU_VERSION_SUFFIX _69
/**
* \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 "68.2"
+#define U_ICU_VERSION "69.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 "68"
+#define U_ICU_VERSION_SHORT "69"
#ifndef U_HIDE_INTERNAL_API
/** Data version in ICU4C.
* @internal ICU 4.4 Internal Use Only
**/
-#define U_ICU_DATA_VERSION "68.2"
+#define U_ICU_DATA_VERSION "69.1"
#endif /* U_HIDE_INTERNAL_API */
/*===========================================================================
diff --git a/icu4c/source/configure b/icu4c/source/configure
index 0dea6a5..a2ff7e4 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 68.2.
+# Generated by GNU Autoconf 2.69 for ICU 69.1.
#
# Report bugs to <http://icu-project.org/bugs>.
#
@@ -582,8 +582,8 @@
# Identity of this package.
PACKAGE_NAME='ICU'
PACKAGE_TARNAME='International Components for Unicode'
-PACKAGE_VERSION='68.2'
-PACKAGE_STRING='ICU 68.2'
+PACKAGE_VERSION='69.1'
+PACKAGE_STRING='ICU 69.1'
PACKAGE_BUGREPORT='http://icu-project.org/bugs'
PACKAGE_URL='http://icu-project.org'
@@ -1364,7 +1364,7 @@
# 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 68.2 to adapt to many kinds of systems.
+\`configure' configures ICU 69.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1430,7 +1430,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ICU 68.2:";;
+ short | recursive ) echo "Configuration of ICU 69.1:";;
esac
cat <<\_ACEOF
@@ -1568,7 +1568,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ICU configure 68.2
+ICU configure 69.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2314,7 +2314,7 @@
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 68.2, which was
+It was created by ICU $as_me 69.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8544,7 +8544,7 @@
# 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 68.2, which was
+This file was extended by ICU $as_me 69.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8598,7 +8598,7 @@
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 68.2
+ICU config.status 69.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 daa66ef..286c18a 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=icudt68
+U_ICUDATA_NAME=icudt69
##############################################################################
!IF "$(UWP)" == "UWP"
# Optionally change the name of the data file for the UWP version.
-U_ICUDATA_NAME=icudt68
+U_ICUDATA_NAME=icudt69
!ENDIF
U_ICUDATA_ENDIAN_SUFFIX=l
UNICODE_VERSION=13.0
diff --git a/icu4c/source/data/misc/icuver.txt b/icu4c/source/data/misc/icuver.txt
index 70e5ae7..feb59d2 100644
--- a/icu4c/source/data/misc/icuver.txt
+++ b/icu4c/source/data/misc/icuver.txt
@@ -9,6 +9,6 @@
// ***************************************************************************
icuver:table(nofallback){
CLDRVersion{"39"}
- DataVersion{"68.2.0.0"}
- ICUVersion{"68.2.0.0"}
+ DataVersion{"69.1.0.0"}
+ ICUVersion{"69.1.0.0"}
}
diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj
index 218772f..ce8933a 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)\icuin68d.dll</OutputFile>
+ <OutputFile>..\..\$(IcuBinOutputDir)\icuin69d.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)\icuin68.dll</OutputFile>
+ <OutputFile>..\..\$(IcuBinOutputDir)\icuin69.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 f836aeb..489b460 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\icuin68.dll</OutputFile>
+ <OutputFile>..\..\bin32uwp\icuin69.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\icuin68d.dll</OutputFile>
+ <OutputFile>..\..\bin32uwp\icuin69d.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\icuin68.dll</OutputFile>
+ <OutputFile>..\..\bin64uwp\icuin69.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\icuin68d.dll</OutputFile>
+ <OutputFile>..\..\bin64uwp\icuin69d.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\icuin68.dll</OutputFile>
+ <OutputFile>..\..\binARMuwp\icuin69.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\icuin68d.dll</OutputFile>
+ <OutputFile>..\..\binARMuwp\icuin69d.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\icuin68.dll</OutputFile>
+ <OutputFile>..\..\binARM64uwp\icuin69.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\icuin68d.dll</OutputFile>
+ <OutputFile>..\..\binARM64uwp\icuin69d.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 c324236..5addb36 100644
--- a/icu4c/source/io/io.vcxproj
+++ b/icu4c/source/io/io.vcxproj
@@ -60,7 +60,7 @@
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <OutputFile>..\..\$(IcuBinOutputDir)\icuio68d.dll</OutputFile>
+ <OutputFile>..\..\$(IcuBinOutputDir)\icuio69d.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)\icuio68.dll</OutputFile>
+ <OutputFile>..\..\$(IcuBinOutputDir)\icuio69.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 0a1556e..3c7941f 100644
--- a/icu4c/source/layoutex/layoutex.vcxproj
+++ b/icu4c/source/layoutex/layoutex.vcxproj
@@ -54,7 +54,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <OutputFile>..\..\bin\iculx68.dll</OutputFile>
+ <OutputFile>..\..\bin\iculx69.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\iculx68d.dll</OutputFile>
+ <OutputFile>..\..\bin\iculx69d.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\iculx68.dll</OutputFile>
+ <OutputFile>..\..\bin64\iculx69.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\iculx68d.dll</OutputFile>
+ <OutputFile>..\..\bin64\iculx69d.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 7c58b7e..cc734df 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)\icudt68.dll</OutputFile>
+ <OutputFile>..\..\$(IcuBinOutputDir)\icudt69.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 744d773..1d6be88 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)\icutest68d.exe</OutputFile>
+ <OutputFile>..\..\..\$(IcuBinOutputDir)\icutest69d.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)\icutest68.exe</OutputFile>
+ <OutputFile>..\..\..\$(IcuBinOutputDir)\icutest69.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 5fe0035..02e1d29 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\icutu68.dll</OutputFile>
+ <OutputFile>..\..\..\bin\icutu69.dll</OutputFile>
<ProgramDatabaseFile>.\..\..\..\lib\icutu.pdb</ProgramDatabaseFile>
<DataExecutionPrevention>
</DataExecutionPrevention>
@@ -86,7 +86,7 @@
<TypeLibraryName>.\..\..\..\lib\icutud.tlb</TypeLibraryName>
</Midl>
<Link>
- <OutputFile>..\..\..\bin\icutu68d.dll</OutputFile>
+ <OutputFile>..\..\..\bin\icutu69d.dll</OutputFile>
<ProgramDatabaseFile>.\..\..\..\lib\icutud.pdb</ProgramDatabaseFile>
<DataExecutionPrevention>
</DataExecutionPrevention>
@@ -113,7 +113,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
</ClCompile>
<Link>
- <OutputFile>..\..\..\bin64\icutu68.dll</OutputFile>
+ <OutputFile>..\..\..\bin64\icutu69.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\icutu68d.dll</OutputFile>
+ <OutputFile>..\..\..\bin64\icutu69d.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\icutu68.dll</OutputFile>
+ <OutputFile>..\..\..\binARM\icutu69.dll</OutputFile>
<ProgramDatabaseFile>.\..\..\..\libARM\icutu.pdb</ProgramDatabaseFile>
<ImportLibrary>..\..\..\libARM\icutu.lib</ImportLibrary>
</Link>
@@ -157,7 +157,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>..\..\..\binARM\icutu68d.dll</OutputFile>
+ <OutputFile>..\..\..\binARM\icutu69d.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\icutu68.dll</OutputFile>
+ <OutputFile>..\..\..\binARM64\icutu69.dll</OutputFile>
<ProgramDatabaseFile>.\..\..\..\libARM64\icutu.pdb</ProgramDatabaseFile>
<ImportLibrary>..\..\..\libARM64\icutu.lib</ImportLibrary>
</Link>
@@ -191,7 +191,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>..\..\..\binARM64\icutu68d.dll</OutputFile>
+ <OutputFile>..\..\..\binARM64\icutu69d.dll</OutputFile>
<ProgramDatabaseFile>.\..\..\..\libARM64\icutud.pdb</ProgramDatabaseFile>
<ImportLibrary>..\..\..\libARM64\icutud.lib</ImportLibrary>
</Link>
diff --git a/icu4j/build.properties b/icu4j/build.properties
index f4393c6..2bd4c31 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 = 68
-api.report.prev.version = 67
-release.file.ver = 68_2
-api.doc.version = 68.2
-maven.pom.ver = 68.2
+api.report.version = 69
+api.report.prev.version = 68
+release.file.ver = 69rc
+api.doc.version = 69.1 Release Candidate
+maven.pom.ver = 69.1-SNAPSHOT
diff --git a/icu4j/eclipse-build/build.properties b/icu4j/eclipse-build/build.properties
index ef1ba42..814c0b9 100644
--- a/icu4j/eclipse-build/build.properties
+++ b/icu4j/eclipse-build/build.properties
@@ -4,6 +4,6 @@
#* Copyright (C) 2010-2016, International Business Machines Corporation and *
#* others. All Rights Reserved. *
#*******************************************************************************
-icu4j.plugin.impl.version.string=68.2.0
+icu4j.plugin.impl.version.string=69.1.0
copyright.eclipse=(C) 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html
-icu4j.data.version.number=68
+icu4j.data.version.number=69
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 158a47a..e33c517 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
@@ -212,7 +212,7 @@
* @deprecated This API is ICU internal only.
*/
@Deprecated
- public static final String ICU_DATA_VERSION_PATH = "68b";
+ public static final String ICU_DATA_VERSION_PATH = "69b";
/**
* Data version in ICU4J.
@@ -553,7 +553,7 @@
UNICODE_12_1 = getInstance(12, 1, 0, 0);
UNICODE_13_0 = getInstance(13, 0, 0, 0);
- ICU_VERSION = getInstance(68, 2, 0, 0);
+ ICU_VERSION = getInstance(69, 1, 0, 0);
ICU_DATA_VERSION = ICU_VERSION;
UNICODE_VERSION = UNICODE_13_0;
diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties
index c448fed..0ddf06d 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 = 68
-icu4j.impl.version = 68.2
-icu4j.data.version = 68
+icu4j.spec.version = 69
+icu4j.impl.version = 69.1
+icu4j.data.version = 69
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 5dd2efd..2ce2af2 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:4788511cd3c1370ba9cc1adfbef87e80ee8d844439daf66d9b121919d8c1d905
-size 13327705
+oid sha256:c657b0861d76c7177e4f79fb2f8240176711b364c76d698935496c0ebcf1ebdd
+size 13328077
diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index 00eb533..a60950c 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:0bf4a8370234ddae7ea293f1028220f0d5581f7ef447dd8fa60757419cc5de68
+oid sha256:de3e8aefff4196afc4b03359802a7f7963fb4872a5ea193b3b8945206f9deb35
size 95091
diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar
index a012855..dc23096 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:40928033c3f04dad5dc5451bce45517686ebad7e50d11ca1fa52040a272f675d
-size 723623
+oid sha256:18b9a95ba92f05a9f754b81cb4b575a55bd5f7e1ded655879a0b5c6b29231182
+size 726591
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 44d3221..9c75c5b 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="68.2";
+ public static final String ICU4C_VERSION="69.1";
public static final int UDebugEnumType = 0;
public static final int UCalendarDateFields = 1;
public static final int UCalendarMonths = 2;
diff --git a/icu4j/readme.html b/icu4j/readme.html
index 281fdcb..da14a40 100644
--- a/icu4j/readme.html
+++ b/icu4j/readme.html
@@ -14,23 +14,23 @@
<body style="background-color: rgb(255, 255, 255);" lang="EN-US"
link="#0000ff" vlink="#800080">
<h1>International Components for Unicode for Java (ICU4J)</h1>
-<h2>Read Me for ICU4J 68.2</h2>
+<h2>Read Me for ICU4J 69.1</h2>
(Last Update: 2020-Dec-02)
<hr size="2" width="100%">
<p>
<b>Note:</b> This is a major release of ICU4J. It contains bug fixes and adds implementations
of inherited API and introduces new API or functionality.
-<!-- <b>Note:</b> This is a preview release of ICU4J 68.
+<!-- <b>Note:</b> This is a preview release of ICU4J 69.
The contents of this document may not reflect the recent changes done
-for ICU 68 development. It is not recommended for production use. -->
-<!-- <b>Note:</b> This is a development milestone of ICU4J 68.
+for ICU 69 development. It is not recommended for production use. -->
+<!-- <b>Note:</b> This is a development milestone of ICU4J 69.
The contents of this document may not reflect the recent changes done
-for ICU 68 development. It is not recommended for production use. -->
-<!-- <b>Note:</b> This is a release candidate of ICU4J 68.
+for ICU 69 development. It is not recommended for production use. -->
+<!-- <b>Note:</b> This is a release candidate of ICU4J 69.
The contents of this document may not reflect the recent changes done
-for ICU 68 development. This release candidate is intended for those
-wishing to verify ICU 68 integration before final release. It is not
+for ICU 69 development. This release candidate is intended for those
+wishing to verify ICU 69 integration before final release. It is not
recommended for production use. -->
</p>
<p>For the most recent release, see the <a
@@ -143,7 +143,7 @@
<h2 class="doc"><a name="changes"></a>Changes In This Release</h2>
-<p>See the <a href="http://site.icu-project.org/download/68">ICU 68 download page</a>
+<p>See the <a href="http://site.icu-project.org/download/69">ICU 69 download page</a>
for more informantion about changes in this release.</p>
<p>The list of API changes since the previous ICU4J release is available
<a href="APIChangeReport.html">here</a>.</p>
@@ -160,11 +160,11 @@
</p>
<h2 class="doc"><a name="PlatformDependencies"></a>Platform Dependencies</h2>
<p>
-The minimum Java runtime version supported by ICU4J 68 is version 7. Java runtime version 6 is not supported.
+The minimum Java runtime version supported by ICU4J 69 is version 7. Java runtime version 6 is not supported.
</p>
<p>
ICU4J since version 63 depend on J2SE 7 functionality. Therefore, ICU4J only runs on
-JRE version 7 or later. ICU4J 68 is tested on JRE 7, 8, 9, 10 and 11.
+JRE version 7 or later. ICU4J 69 is tested on JRE 7, 8, 9, 10 and 11.
</p>
<h2 class="doc"><a name="download"></a>How to Download ICU4J</h2>
@@ -183,19 +183,19 @@
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
- <version>68.2</version>
+ <version>69.1</version>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-charset</artifactId>
- <version>68.2</version>
+ <version>69.1</version>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j-localespi</artifactId>
- <version>68.2</version>
+ <version>69.1</version>
</dependency>
</pre>
</ul>
@@ -730,54 +730,54 @@
organization
of the data in ICU4J.</p>
<ul>
- <li>The primary <b>locale data</b> is under the directory <tt>icudt68b</tt>,
+ <li>The primary <b>locale data</b> is under the directory <tt>icudt69b</tt>,
as a set of <tt>".res"</tt> files whose names are the locale identifiers.
Locale naming is documented the <code>com.ibm.icu.util.ULocale</code>
class, and the use of these names in searching for resources is documented
in <code>com.ibm.icu.util.UResourceBundle</code>.</li>
- <li>The <b>break iterator data</b> is under the directory <tt>icudt68b/brkitr</tt>,
+ <li>The <b>break iterator data</b> is under the directory <tt>icudt69b/brkitr</tt>,
as a set of <tt>".res"</tt>, <tt>".brk"</tt> and <tt>".dict"</tt> files.</li>
- <li>The <b>collation data</b> is under the directory <tt>icudt68b/coll</tt>,
+ <li>The <b>collation data</b> is under the directory <tt>icudt69b/coll</tt>,
as a set of <tt>".res"</tt> files.</li>
- <li>The <b>currency display name data</b> is under the directory <tt>icudt68b/curr</tt>,
+ <li>The <b>currency display name data</b> is under the directory <tt>icudt69b/curr</tt>,
as a set of <tt>".res"</tt> files.</li>
- <li>The <b>language display name data</b> is under the directory <tt>icudt68b/lang</tt>,
+ <li>The <b>language display name data</b> is under the directory <tt>icudt69b/lang</tt>,
as a set of <tt>".res"</tt> files.</li>
<li>The <b>rule-based number format data</b> is under the directory
- <tt>icudt68b/rbnf</tt>, as a set of <tt>".res"</tt> files.
+ <tt>icudt69b/rbnf</tt>, as a set of <tt>".res"</tt> files.
- <li>The <b>region display name data</b> is under the directory <tt>icudt68b/region</tt>,
+ <li>The <b>region display name data</b> is under the directory <tt>icudt69b/region</tt>,
as a set of <tt>".res"</tt> files.</li>
<li>The <b>rule-based transliterator data</b> is under the directory
- <tt>icudt68b/translit</tt>, as a set of <tt>".res"</tt> files.</li>
+ <tt>icudt69b/translit</tt>, as a set of <tt>".res"</tt> files.</li>
- <li>The <b>measurement unit data</b> is under the directory <tt>icudt68b/unit</tt>,
+ <li>The <b>measurement unit data</b> is under the directory <tt>icudt69b/unit</tt>,
as a set of <tt>".res"</tt> files.</li>
<li>The <b>time zone display name data</b> is under the directory
- <tt>icudt68b/zone</tt>, as a set of <tt>".res"</tt> files.</li>
+ <tt>icudt69b/zone</tt>, as a set of <tt>".res"</tt> files.</li>
<li>The <b>character property data</b> and default <b>unicode collation algorithm
- (UCA) data</b> is found under the directory <tt>icudt68b</tt>, as a set of
+ (UCA) data</b> is found under the directory <tt>icudt69b</tt>, as a set of
<tt>".icu"</tt> files. </li>
- <li>The <b>normalization data</b> is found under the directory <tt>icudt68b</tt>,
+ <li>The <b>normalization data</b> is found under the directory <tt>icudt69b</tt>,
as a set of <tt>".nrm"</tt> files. </li>
<li>The <b>character set converter data</b> is under the directory
- <tt>icudt68b</tt>, as a set of <tt>".cnv"</tt> files. These files are
+ <tt>icudt69b</tt>, as a set of <tt>".cnv"</tt> files. These files are
currently included only in icu-charset.jar.</li>
<li>The <b>time zone rule data</b> is under the directory
- <tt>icudt68b</tt>, as <tt>zoneinfo64.res</tt>.</li>
+ <tt>icudt69b</tt>, as <tt>zoneinfo64.res</tt>.</li>
- <li>The <b>holiday data</b> is under the directory <tt>icudt68b</tt>,
+ <li>The <b>holiday data</b> is under the directory <tt>icudt69b</tt>,
as a set of <tt>".class"</tt> files, named <tt>"HolidayBundle_"</tt>
followed by the locale ID.</li>
@@ -875,8 +875,8 @@
<h5> Generating Data from CLDR </h5>
<I> Note: This procedure assumes that all 3 sources are present</I>
<ol>
- <li>Checkout or download CLDR version 'release-38'</li>
- <li>Checkout ICU with tag 'release-68-2'</li>
+ <li>Checkout or download CLDR version 'release-39'</li>
+ <li>Checkout ICU with tag 'release-69-1'</li>
<li>cd to icu4c/source/data directory</li>
<li>Follow the instructions in icu4c/source/data/cldr-icu-readme.txt</li>
<li>Rebuild ICU4C with the newly generated data.</li>
diff --git a/tools/cldr/cldr-to-icu/build-icu-data.xml b/tools/cldr/cldr-to-icu/build-icu-data.xml
index ea2f6e3..4aba6bc 100644
--- a/tools/cldr/cldr-to-icu/build-icu-data.xml
+++ b/tools/cldr/cldr-to-icu/build-icu-data.xml
@@ -47,10 +47,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="68.2.0.0"/>
+ <property name="icuVersion" value="69.1.0.0"/>
<!-- Default value for ICU data version (icuver.txt). Update this for each release. -->
- <property name="icuDataVersion" value="68.2.0.0"/>
+ <property name="icuDataVersion" value="69.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. -->
