From dfc8b8b746a132aed7d2c63c7940cbb95ae2a611 Mon Sep 17 00:00:00 2001
From: David Beaumont <dbeaumont@google.com>
Date: Tue, 14 Jul 2020 14:41:33 +0000
Subject: [PATCH] ICU-20697 Delete now unused files and documentation for the
 old ICU LDML tooling.

---
 icu4c/source/data/build.xml                 | 397 ----------
 icu4c/source/data/cldr-icu-readme.txt       |  69 +-
 icu4c/source/data/icu-coll-deprecates.xml   |  43 --
 icu4c/source/data/icu-config.xml            | 799 --------------------
 icu4c/source/data/icu-locale-deprecates.xml |  65 --
 icu4c/source/data/icu-rbnf-deprecates.xml   |  34 -
 6 files changed, 7 insertions(+), 1400 deletions(-)
 delete mode 100644 icu4c/source/data/icu-coll-deprecates.xml
 delete mode 100644 icu4c/source/data/icu-config.xml
 delete mode 100644 icu4c/source/data/icu-locale-deprecates.xml
 delete mode 100644 icu4c/source/data/icu-rbnf-deprecates.xml

diff --git a/icu4c/source/data/build.xml b/icu4c/source/data/build.xml
index 4b6f092900e..ffee73d34b8 100644
--- a/icu4c/source/data/build.xml
+++ b/icu4c/source/data/build.xml
@@ -56,14 +56,6 @@
         <echo message="cldr.prod.dir (production data): ${cldr.prod.dir}"/>
     </target>
     <target name="setup" depends="init">
-        <taskdef name="cldr-build" classname="org.unicode.cldr.ant.CLDRBuild">
-            <classpath>
-                <pathelement path="${java.class.path}/"/>
-                <pathelement path="${env.CLDR_CLASSES}"/>
-                <pathelement location="${cldrtools.jar}"/>
-                <fileset dir="${cldrtools.dir}/libs" includes="*.jar"/>
-            </classpath>
-        </taskdef>
         <mkdir dir="${env.CLDR_TMP_DIR}"/> <!-- make sure parent dir exists -->
         <condition property="cldrprod.exists">
             <available file="${cldr.prod.dir}" type="dir"/>
@@ -84,393 +76,4 @@
                  could set '-s' / '-d' for explicit source/dest -->
         </java>
     </target>
-
-    <!-- target for generating ICU data -->
-    <target name="all" depends="locales, collation, rbnf, supplementalData, metadata, metaZones, windowsZones, likelySubtags, plurals, pluralRanges, numberingSystems, translit, brkitr, keyTypeData, genderList, dayPeriods" />
-    <!-- parallel target -->
-    <target name="pall" depends="init,setup,proddata">
-        <parallel threadsPerProcessor ="1">
-          <sequential>
-            <ant target='locales' />
-          </sequential>
-          <sequential>
-            <ant target='collation'>
-            </ant>
-          </sequential>
-          <sequential>
-            <ant target='rbnf'>
-            </ant>
-          </sequential>
-          <ant target='supplementalData'>
-          </ant>
-          <sequential>
-            <ant target='brkitr'>
-            </ant>
-          </sequential>
-          <sequential>
-            <ant target='translit'>
-            </ant>
-            <!--<ant target='trnsfiles'></ant> Not ANT-built - see
-            note below. -->
-          </sequential>
-          <sequential>
-          	<ant target='keyTypeData'/>
-          </sequential>
-          <sequential>
-          	<ant target='genderList'/>
-          </sequential>
-          <sequential>
-          	<ant target='dayPeriods'/>
-          </sequential>
-        </parallel>
-     </target>
-
-    <target name="locales" depends="init,setup,proddata" description="builds locale files in ICU text format">
-        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" srcFile=".*xml" destFile=".*txt">
-            <!-- launch the tool and generate the data after reading the config file -->
-            <run>
-                <args>
-                    <arg name="--sourcedir"       value="${cldr.prod.dir}/common/main" />
-                    <arg name="--destdir"         value="${env.ICU4C_DIR}/source/data/locales"/>
-                    <arg name="--specialsdir"     value="${env.ICU4C_DIR}/source/data/xml/main"/>
-                    <arg name="--supplementaldir" value="${cldr.prod.dir}/common/supplemental" />
-                    <arg name="--type" value="locales"/>
-                    <arg name="--depgraphfile" value="../../python/icutools/databuilder/locale_dependencies.py"/>
-                </args>
-		<remapper>
-		  <remap sourcePath="/Keys" targetDir="lang" />
-		  <remap sourcePath="/Languages" targetDir="lang" />
-		  <remap sourcePath="/Languages%long" targetDir="lang" />
-		  <remap sourcePath="/Languages%menu" targetDir="lang" />
-		  <remap sourcePath="/Languages%short" targetDir="lang" />
-		  <remap sourcePath="/Languages%secondary" targetDir="lang" />
-		  <remap sourcePath="/Languages%variant" targetDir="lang" />
-		  <remap sourcePath="/Scripts" targetDir="lang" />
-		  <remap sourcePath="/Scripts%secondary" targetDir="lang" />
-		  <remap sourcePath="/Scripts%short" targetDir="lang" />
-		  <remap sourcePath="/Scripts%stand-alone" targetDir="lang" />
-		  <remap sourcePath="/Scripts%variant" targetDir="lang" />
-		  <remap sourcePath="/Types" targetDir="lang" />
-		  <remap sourcePath="/Types%short" targetDir="lang" />
-		  <remap sourcePath="/Variants" targetDir="lang" />
-		  <remap sourcePath="/Variants%secondary" targetDir="lang" />
-		  <remap sourcePath="/characterLabelPattern" targetDir="lang" />
-		  <remap sourcePath="/codePatterns" targetDir="lang" />
-		  <remap sourcePath="/localeDisplayPattern" targetDir="lang" />
-		  <remap sourcePath="/Countries" targetDir="region" />
-		  <remap sourcePath="/Countries%variant" targetDir="region" />
-		  <remap sourcePath="/Countries%short" targetDir="region" />
-		  <remap sourcePath="/Currencies" targetDir="curr" />
-		  <remap sourcePath="/Currencies%formal" targetDir="curr" />
-		  <remap sourcePath="/Currencies%narrow" targetDir="curr" />
-		  <remap sourcePath="/Currencies%variant" targetDir="curr" />
-		  <remap sourcePath="/CurrencyPlurals" targetDir="curr" />
-		  <remap sourcePath="/CurrencyUnitPatterns" targetDir="curr" />
-		  <remap sourcePath="/currencySpacing" targetDir="curr" />
-		  <remap sourcePath="/zoneStrings" targetDir="zone" />
-		  <remap sourcePath="/durationUnits" targetDir="unit" />
-		  <remap sourcePath="/units" targetDir="unit" />
-		  <remap sourcePath="/unitsShort" targetDir="unit" />
-		  <remap sourcePath="/unitsNarrow" targetDir="unit" />
-		</remapper>
-                <!-- http://ant.apache.org/faq.html#xml-entity-include -->
-                &icu-config;
-        		&icu-locale-deprecates;
-            </run>
-        </cldr-build>
-    </target>
-    <target name="collation" depends="init,setup,proddata" description="builds collation files in ICU text format">
-        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" srcFile=".*xml" destFile=".*txt">
-            <run>
-                <args>
-                    <arg name="--sourcedir"       value="${cldr.prod.dir}/common/collation" />
-                    <arg name="--destdir"         value="${env.ICU4C_DIR}/source/data/coll"/>
-                    <arg name="--specialsdir"     value="${env.ICU4C_DIR}/source/data/xml/collation"/>
-                    <arg name="--type"            value="collation"/>
-                </args>
-                <!-- http://ant.apache.org/faq.html#xml-entity-include -->
-                &icu-config;
-                &icu-coll-deprecates;
-            </run>
-        </cldr-build>
-    </target>
-    <target name="rbnf" depends="init,setup,proddata" description="builds rbnf files in ICU text format">
-        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" srcFile=".*xml" destFile=".*txt">
-            <run>
-                <args>
-                    <arg name="--sourcedir"       value="${cldr.prod.dir}/common/rbnf" />
-                    <arg name="--destdir"         value="${env.ICU4C_DIR}/source/data/rbnf"/>
-                    <arg name="--specialsdir"     value="${env.ICU4C_DIR}/source/data/xml/rbnf"/>
-                    <arg name="--type" value="rbnf" />
-                </args>
-                <!-- http://ant.apache.org/faq.html#xml-entity-include -->
-                &icu-config;
-                &icu-rbnf-deprecates;
-            </run>
-        </cldr-build>
-    </target>
-    <target name="supplementalData" depends="init,setup,proddata" description="builds supplementalData.txt from supplementalData.xml">
-        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="supplementalData.txt" noArgs="true">
-            <!-- launch the tool and generate the data after reading the config file -->
-            <run>
-                <args>
-                    <arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
-                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
-                    <arg name="-t" value="supplementalData"/>
-                </args>
-		<remapper>
-		  <remap sourcePath="/CurrencyMap" targetDir="curr" />
-		  <remap sourcePath="/CurrencyMeta" targetDir="curr" />
-		</remapper>
-            </run>
-        </cldr-build>
-    </target>
-    <target name="metadata" depends="init,setup,proddata" description="builds metadata.txt from supplementalMetadata.xml">
-        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="metadata.txt" noArgs="true">
-            <!-- launch the tool and generate the data after reading the config file -->
-            <run>
-                <args>
-                    <arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
-                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
-                    <arg name="-t" value="metadata"/>
-                </args>
-            </run>
-        </cldr-build>
-    </target>
-    <target name="metaZones" depends="init,setup,proddata" description="builds metaZones.txt from metaZones.xml">
-        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="metaZones.txt" noArgs="true">
-            <!-- launch the tool and generate the data after reading the config file -->
-            <run>
-                <args>
-                    <arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
-                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
-                    <arg name="-t" value="metaZones"/>
-                </args>
-            </run>
-        </cldr-build>
-    </target>
-    <target name="windowsZones" depends="init,setup,proddata" description="builds windowsZones.txt from windowsZones.xml">
-        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="windowsZones.txt" noArgs="true">
-            <!-- launch the tool and generate the data after reading the config file -->
-            <run>
-                <args>
-                    <arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
-                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
-                    <arg name="-t" value="windowsZones"/>
-                </args>
-            </run>
-        </cldr-build>
-    </target>
-    <target name="likelySubtags" depends="init,setup,proddata" description="builds likelySubtags.txt from likelySubtags.xml">
-        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="likelySubtags.txt" noArgs="true">
-            <!-- launch the tool and generate the data after reading the config file -->
-            <run>
-                <args>
-                    <arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
-                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
-                    <arg name="-t" value="likelySubtags"/>
-                </args>
-            </run>
-        </cldr-build>
-    </target>
-    <target name="plurals" depends="init,setup,proddata" description="builds plurals.txt from plurals.xml">
-        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="plurals.txt" noArgs="true">
-            <!-- launch the tool and generate the data after reading the config file -->
-            <run>
-                <args>
-                    <arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
-                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
-                    <arg name="-t" value="plurals"/>
-                </args>
-            </run>
-        </cldr-build>
-    </target>
-    <target name="pluralRanges" depends="init,setup,proddata" description="builds pluralRanges.txt from pluralRanges.xml">
-        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="pluralRanges.txt" noArgs="true">
-            <!-- launch the tool and generate the data after reading the config file -->
-            <run>
-                <args>
-                    <arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
-                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
-                    <arg name="-t" value="pluralRanges"/>
-                </args>
-            </run>
-        </cldr-build>
-    </target>
-    <target name="numberingSystems" depends="init,setup,proddata" description="builds numberingSystems.txt from numberingSystems.xml">
-        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="numberingSystems.txt" noArgs="true">
-            <!-- launch the tool and generate the data after reading the config file -->
-            <run>
-                <args>
-                    <arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
-                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
-                    <arg name="-t" value="numberingSystems"/>
-                </args>
-            </run>
-        </cldr-build>
-    </target>
-    <target name="genderList" depends="init,setup,proddata" description="builds genderList.txt from genderList.xml">
-        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="genderList.txt" noArgs="true">
-            <!-- launch the tool and generate the data after reading the config file -->
-            <run>
-                <args>
-                    <arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
-                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
-                    <arg name="-t" value="genderList"/>
-                </args>
-            </run>
-        </cldr-build>
-    </target>
-    <target name="dayPeriods" depends="init,setup,proddata" description="builds dayPeriods.txt from dayPeriods.xml">
-        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="dayPeriods.txt" noArgs="true">
-            <!-- launch the tool and generate the data after reading the config file -->
-            <run>
-                <args>
-                    <arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
-                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
-                    <arg name="-t" value="dayPeriods"/>
-                </args>
-            </run>
-        </cldr-build>
-    </target>
-    <target name="brkitr" depends="init,setup,proddata" description="builds break iterator files in ICU text format">
-        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" srcFile=".*xml" destFile=".*txt">
-            <run>
-                <args>
-                    <arg name="--sourcedir"       value="${cldr.prod.dir}/common/segments"/>
-					<arg name="--specialsdir"       value="${env.ICU4C_DIR}/source/data/xml/brkitr"/>
-                    <arg name="--destdir"         value="${env.ICU4C_DIR}/source/data/brkitr"/>
-                    <arg name="--type" value="brkitr" />
-                </args>
-                <!-- The entity include is not required for this target -->
-                <!-- http://ant.apache.org/faq.html#xml-entity-include
-                &icu-config;
-                -->
-            </run>
-        </cldr-build>
-    </target>
-
-    <target name="keyTypeData" depends="init,setup,proddata" description="builds keyTypeData.txt and timezoneTypes.txt from bcp47/*.xml">
-        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" noArgs="true">
-            <run>
-                <args>
-                    <arg name="-s" value="${cldr.prod.dir}/common/bcp47" />
-                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
-                    <arg name="-t" value="keyTypeData"/>
-                </args>
-            </run>
-        </cldr-build>
-    </target>
-
-    <target name="translit" depends="init,setup,proddata" description="builds collation files in ICU text format">
-        <cldr-build toolName="org.unicode.cldr.icu.ConvertTransforms" srcFile=".*xml" destFile=".*txt">
-            <run>
-                <args>
-                    <arg name="-m" value="((?!.*(Canadian|Ethiopic|ug-Latin).*).*)" />
-                    <arg name="--sourcedir" value="${cldr.prod.dir}/common/transforms" />
-                    <arg name="--destdir"   value="${env.ICU4C_DIR}/source/data/translit"/>
-                    <arg name="--commentSkip"/>
-                    <arg name="--approvedOnly"/>
-                </args>
-                <!-- http://ant.apache.org/faq.html#xml-entity-include -->
-
-            </run>
-        </cldr-build>
-    </target>
-    <!-- we don't generate en.txt or el.txt - so don't change trnsfiles.mk for now. -->
-<!--   
-     <target name="trnsfiles" depends="init, setup,proddata" description="builds trnsfiles.mk">
-        <cldr-build toolName="org.unicode.cldr.icu.ConvertTransforms" srcFile=".*xml" destFile="trnsfiles.mk" noArgs="true">
-            <run>
-                <args>   [ double hyphen not allowed in comments - transpose -" to fix below ]
-                    <arg name=-"-sourcedir" value="${cldr.prod.dir}/common/transforms" />
-                    <arg name=-"-destdir"   value="${env.ICU4C_DIR}/source/data/translit"/>
-                    <arg name=-"-commentSkip"/>
-                    <arg name=-"-writeIndex"/>
-                </args>
-            </run>
-        </cldr-build>
-    </target> -->
-    <target name="clean" depends="init, setup, cleanprod" description="deletes all txt files and mk files from coll and locales directories">
-        <delete>
-            <fileset id="locales" dir="${env.ICU4C_DIR}/source/data/locales">
-                <include name="*.txt" />
-            </fileset>
-            <fileset id="resfiles" dir="${env.ICU4C_DIR}/source/data/locales">
-                <include name="resfiles.mk" />
-            </fileset>
-            <fileset id="dependencies_py" dir="${env.ICU4C_DIR}/source/python/icutools/databuilder">
-                <include name="locale_dependencies.py" />
-            </fileset>
-            <fileset id="locales_split" dir="${env.ICU4C_DIR}/source/data">
-               <include name="curr/*.txt" /> 
-               <include name="curr/resfiles.mk" /> 
-               <include name="lang/*.txt" /> 
-               <include name="lang/resfiles.mk" /> 
-               <include name="region/*.txt" /> 
-               <include name="region/resfiles.mk" /> 
-               <include name="zone/*.txt" /> 
-               <include name="zone/resfiles.mk" /> 
-               <exclude name="zone/tzdbNames.txt" /> 
-               <include name="unit/*.txt" /> 
-               <include name="unit/resfiles.mk" /> 
-            </fileset>
-            <fileset id="collation" dir="${env.ICU4C_DIR}/source/data/coll">
-                <include name="*.txt" />
-            </fileset>
-            <fileset id="colfiles" dir="${env.ICU4C_DIR}/source/data/coll">
-                <include name="colfiles.mk" />
-            </fileset>
-            <fileset id="translit" dir="${env.ICU4C_DIR}/source/data/translit">
-                <include name="*_*.txt" />
-                <include name="root.txt" />
-            </fileset>
-            <fileset id="brkitr" dir="${env.ICU4C_DIR}/source/data/brkitr">
-                <include name="*.txt"/>
-            </fileset>
-            <fileset id="brkfiles" dir="${env.ICU4C_DIR}/source/data/brkitr">
-                <include name="brkfiles.mk" />
-            </fileset>
-            <fileset id="supplementalData" dir="${env.ICU4C_DIR}/source/data/misc">
-                <include name="supplementalData.txt" />
-            </fileset>
-            <fileset id="rbnf" dir="${env.ICU4C_DIR}/source/data/rbnf">
-                <include name="*.txt" />
-            </fileset>
-            <fileset id="rbnffiles" dir="${env.ICU4C_DIR}/source/data/rbnf">
-                <include name="rbnffiles.mk" />
-            </fileset>
-            <fileset id="metadata" dir="${env.ICU4C_DIR}/source/data/misc">
-                <include name="metadata.txt" />
-            </fileset>
-            <fileset id="metaZones" dir="${env.ICU4C_DIR}/source/data/misc">
-                <include name="metaZones.txt" />
-            </fileset>
-            <fileset id="windowsZones" dir="${env.ICU4C_DIR}/source/data/misc">
-                <include name="windowsZones.txt" />
-            </fileset>
-            <fileset id="likelySubtags" dir="${env.ICU4C_DIR}/source/data/misc">
-                <include name="likelySubtags.txt" />
-            </fileset>
-            <fileset id="plurals" dir="${env.ICU4C_DIR}/source/data/misc">
-                <include name="plurals.txt" />
-            </fileset>
-            <fileset id="pluralRanges" dir="${env.ICU4C_DIR}/source/data/misc">
-                <include name="pluralRanges.txt" />
-            </fileset>
-            <fileset id="numberingSystems" dir="${env.ICU4C_DIR}/source/data/misc">
-                <include name="numberingSystems.txt" />
-            </fileset>
-            <fileset id="keyTypeData" dir="${env.ICU4C_DIR}/source/data/misc">
-                <include name="keyTypeData.txt" />
-                <include name="timezoneTypes.txt" />
-            </fileset>
-            <fileset id="genderList" dir="${env.ICU4C_DIR}/source/data/misc">
-                <include name="genderList.txt" />
-            </fileset>
-            <fileset id="dayPeriods" dir="${env.ICU4C_DIR}/source/data/misc">
-                <include name="dayPeriods.txt" />
-            </fileset>
-        </delete>
-    </target>
 </project>
diff --git a/icu4c/source/data/cldr-icu-readme.txt b/icu4c/source/data/cldr-icu-readme.txt
index 1e8b1491452..fed367e34f4 100644
--- a/icu4c/source/data/cldr-icu-readme.txt
+++ b/icu4c/source/data/cldr-icu-readme.txt
@@ -97,34 +97,6 @@
 #
 #    $TOOLS_ROOT/cldr/cldr-to-icu/build-icu-data.xml
 #
-# The files used in previous versions are the following. These are not used in
-# the ICU-67-and-later process, but for now they should be kept up to date to
-# enable parallel use of the older build process for verification.
-#
-#    $ICU4C_DIR/source/data/icu-config.xml - Update <locales> to add or remove
-#                CLDR locales for inclusion in ICU. Update <paths> to prefer
-#                alt forms for certain paths, or to exclude certain paths; note
-#                that <paths> items can only have draft or alt attributes.
-#
-#                Note that if a language-only locale (e.g. "de") is included in
-#                <locales>, then all region sublocales for that language that
-#                are present in CLDR data (e.g. "de_AT", "de_BE", "de_CH", etc.)
-#                should also be included in <locales>, per PMC policy decision
-#                2012-05-02 (see http://bugs.icu-project.org/trac/ticket/9298).
-#
-#    $ICU4C_DIR/source/data/build.xml - If you are adding or removing break
-#                iterators, you need to update  <fileset id="brkitr" ...> under
-#                <target name="clean" ...> to clean the correct set of files.
-#
-#                If there are new CLDR resource bundle types, you may need to
-#                updated the <remapper> sections to put these in the correct
-#                data subfolder for ICU.
-#
-#    $ICU4C_DIR/source/data/xml/      - If you are adding a new locale, break
-#                iterator, collation tailoring, or rule-based number formatter,
-#                you may need to add a corresponding xml file in (respectively)
-#                the main/, brkitr/, collation/, or rbnf/ subdirectory here.
-#
 #----
 #
 # For an official CLDR data integration into ICU, there are some additional
@@ -166,39 +138,12 @@ export ICU4C_DIR=$HOME/icu-myfork/icu4c
 export ICU4J_ROOT=$HOME/icu-myfork/icu4j
 export TOOLS_ROOT=$HOME/icu-myfork/tools
 
+# 2. Build and install the CLDR jar
 
-# 2. Build the CLDR Java tools and jar
+cd $TOOLS_ROOT/cldr/lib
+./install-cldr-jars.sh "$CLDR_DIR"
 
-cd $CLDR_DIR/tools/java
-ant clean
-ant all
-ant jar
-
-# 2a. Copy the CLDR jars into $TOOLS_ROOT/cldr/cldr-to-icu/lib/ maven repository;
-# see $TOOLS_ROOT/cldr/cldr-to-icu/lib/README.txt
-
-cd $TOOLS_ROOT/cldr/cldr-to-icu/lib/
-mvn install:install-file \
-  -DgroupId=org.unicode.cldr \
-  -DartifactId=cldr-api \
-  -Dversion=0.1-SNAPSHOT \
-  -Dpackaging=jar \
-  -DgeneratePom=true \
-  -DlocalRepositoryPath=. \
-  -Dfile=$CLDR_DIR/tools/java/cldr.jar
-
-cd $TOOLS_ROOT/cldr/cldr-to-icu/lib/
-mvn install:install-file \
-  -DgroupId=com.ibm.icu \
-  -DartifactId=icu-utilities \
-  -Dversion=0.1-SNAPSHOT \
-  -Dpackaging=jar \
-  -DgeneratePom=true \
-  -DlocalRepositoryPath=. \
-  -Dfile=$CLDR_DIR/tools/java/libs/utilities.jar
-
-cd $TOOLS_ROOT/cldr/cldr-to-icu/
-mvn dependency:purge-local-repository -DsnapshotsOnly=true
+See the README.txt file in this directory for more information.
 
 # 3. Configure ICU4C, build and test without new data first, to verify that
 # there are no pre-existing errors. Here <platform> is the runConfigureICU
@@ -239,10 +184,10 @@ ant proddata 2>&1 | tee /tmp/cldr-newData-proddataLog.txt
 # be ones that it would generate, except for pasts listed in <retain> elements such as
 # coll/de__PHONEBOOK.txt, coll/de_.txt, etc.
 #
-# Before this step, make any necessary changes to
-# build-icu-data.xml$TOOLS_ROOT/cldr/cldr-to-icu/ to add new locales, etc.
+# Before running Ant to regenerate the data, make any necessary changes to the
+# build-icu-data.xml file, such as adding new locales etc.
 
-cd $TOOLS_ROOT/cldr/cldr-to-icu/
+cd $TOOLS_ROOT/cldr/cldr-to-icu
 CLDR_DIR=$CLDR_TMP_DIR/production ant -f build-icu-data.xml | tee /tmp/cldr-newData-builddataLog.txt
 
 # 5. Check which data files have modifications, which have been added or removed
diff --git a/icu4c/source/data/icu-coll-deprecates.xml b/icu4c/source/data/icu-coll-deprecates.xml
deleted file mode 100644
index 09efac23674..00000000000
--- a/icu4c/source/data/icu-coll-deprecates.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-/*
-* Copyright (C) 2016 and later: Unicode, Inc. and others.
-* License & terms of use: http://www.unicode.org/copyright.html
-*******************************************************************************
-* Copyright (C) 2015, International Business Machines Corporation and         *
-* others. All Rights Reserved.                                                *
-*******************************************************************************
-*/
--->
-<deprecates>
-	<alias from="ars" to="ar"/>
-	<alias from="de__PHONEBOOK" to="de"  rbpath="/collations/default" value="phonebook"/>
-	<alias from="es__TRADITIONAL" to="es" rbpath="/collations/default" value="traditional"/>
-	<alias from="in" to="id" />
-	<alias from="in_ID" to="id_ID" />
-	<alias from="iw" to="he" />
-	<alias from="iw_IL" to="he_IL" />
-	<alias from="mo" to="ro" />
-	<alias from="no" to="nb" />
-	<alias from="no_NO" to="nb_NO" />
-	<alias from="pa_IN" to="pa_Guru_IN" />
-	<alias from="sh" to="sr_Latn" />
-	<alias from="sh_BA" to="sr_Latn_BA" />
-	<alias from="sh_CS" to="sr_Latn_RS" />
-	<alias from="sh_YU" to="sr_Latn_RS" />
-	<alias from="sr_BA" to="sr_Cyrl_BA" />
-	<alias from="sr_ME" to="sr_Cyrl_ME" />
-	<alias from="sr_RS" to="sr_Cyrl_RS" />
-	<alias from="yue" to="zh_Hant" />
-	<alias from="yue_CN" to="zh_Hans" />
-	<alias from="yue_Hans" to="zh_Hans" />
-	<alias from="zh_CN" to="zh_Hans_CN" />
-	<alias from="zh_SG" to="zh_Hans_SG" />
-	<alias from="zh_HK" to="zh_Hant_HK" />
-	<alias from="zh_MO" to="zh_Hant_MO" />
-	<alias from="zh_TW" to="zh_Hant_TW" />
-	<emptyLocale locale="de_" />
-	<emptyLocale locale="es_" />
-	<emptyLocale locale="pa_Guru" />
-	<emptyLocale locale="sr_Cyrl" />
-	<emptyLocale locale="zh_Hans" />
-</deprecates>
diff --git a/icu4c/source/data/icu-config.xml b/icu4c/source/data/icu-config.xml
deleted file mode 100644
index 0bb8a871448..00000000000
--- a/icu4c/source/data/icu-config.xml
+++ /dev/null
@@ -1,799 +0,0 @@
-<!--
-/*
-* Copyright (C) 2016 and later: Unicode, Inc. and others.
-* License & terms of use: http://www.unicode.org/copyright.html
-*******************************************************************************
-* Copyright (C) 2005-2016, International Business Machines Corporation and    *
-* others. All Rights Reserved.	                                         *
-*******************************************************************************
-*/
--->
-<config type="icu-config">
-	<!-- This is used by CLDRBuild.java and CLDRConverterTool.java in org/unicode/cldr/ant/ -->
-	<locales>
-		<include locales="af"/>
-		<include locales="af_NA"/>
-		<include locales="af_ZA"/>
-		<include locales="agq"/>
-		<include locales="agq_CM"/>
-		<include locales="ak"/>
-		<include locales="ak_GH"/>
-		<include locales="am"/>
-		<include locales="am_ET"/>
-		<include locales="ar"/>
-		<include locales="ar_001"/>
-		<include locales="ar_AE"/>
-		<include locales="ar_BH"/>
-		<include locales="ar_DJ"/>
-		<include locales="ar_DZ"/>
-		<include locales="ar_EG"/>
-		<include locales="ar_EH"/>
-		<include locales="ar_ER"/>
-		<include locales="ar_IL"/>
-		<include locales="ar_IQ"/>
-		<include locales="ar_JO"/>
-		<include locales="ar_KM"/>
-		<include locales="ar_KW"/>
-		<include locales="ar_LB"/>
-		<include locales="ar_LY"/>
-		<include locales="ar_MA"/>
-		<include locales="ar_MR"/>
-		<include locales="ar_OM"/>
-		<include locales="ar_PS"/>
-		<include locales="ar_QA"/>
-		<include locales="ar_SA"/>
-		<include locales="ar_SD"/>
-		<include locales="ar_SO"/>
-		<include locales="ar_SS"/>
-		<include locales="ar_SY"/>
-		<include locales="ar_TD"/>
-		<include locales="ar_TN"/>
-		<include locales="ar_YE"/>
-		<include locales="as"/>
-		<include locales="as_IN"/>
-		<include locales="asa"/>
-		<include locales="asa_TZ"/>
-		<include locales="ast"/>
-		<include locales="ast_ES"/>
-		<include locales="az"/>
-		<include locales="az_Cyrl"/>
-		<include locales="az_Cyrl_AZ"/>
-		<include locales="az_Latn"/>
-		<include locales="az_Latn_AZ"/>
-		<include locales="bas"/>
-		<include locales="bas_CM"/>
-		<include locales="be"/>
-		<include locales="be_BY"/>
-		<include locales="bem"/>
-		<include locales="bem_ZM"/>
-		<include locales="bez"/>
-		<include locales="bez_TZ"/>
-		<include locales="bg"/>
-		<include locales="bg_BG"/>
-		<include locales="bm"/>
-		<include locales="bm_ML"/>
-		<include locales="bn"/>
-		<include locales="bn_BD"/>
-		<include locales="bn_IN"/>
-		<include locales="bo"/>
-		<include locales="bo_CN"/>
-		<include locales="bo_IN"/>
-		<include locales="br"/>
-		<include locales="br_FR"/>
-		<include locales="brx"/>
-		<include locales="brx_IN"/>
-		<include locales="bs"/>
-		<include locales="bs_Cyrl"/>
-		<include locales="bs_Cyrl_BA"/>
-		<include locales="bs_Latn"/>
-		<include locales="bs_Latn_BA"/>
-		<include locales="ca"/>
-		<include locales="ca_AD"/>
-		<include locales="ca_ES"/>
-		<include locales="ca_ES_VALENCIA"/>
-		<include locales="ca_FR"/>
-		<include locales="ca_IT"/>
-		<include locales="ccp"/>
-		<include locales="ccp_BD"/>
-		<include locales="ccp_IN"/>
-		<include locales="ce"/>
-		<include locales="ce_RU"/>
-		<include locales="ceb"/>
-		<include locales="ceb_PH"/>
-		<include locales="cgg"/>
-		<include locales="cgg_UG"/>
-		<include locales="chr"/>
-		<include locales="chr_US"/>
-		<include locales="ckb"/>
-		<include locales="ckb_IQ"/>
-		<include locales="ckb_IR"/>
-		<include locales="cs"/>
-		<include locales="cs_CZ"/>
-		<include locales="cy"/>
-		<include locales="cy_GB"/>
-		<include locales="da"/>
-		<include locales="da_DK"/>
-		<include locales="da_GL"/>
-		<include locales="dav"/>
-		<include locales="dav_KE"/>
-		<include locales="de"/>
-		<include locales="de_AT"/>
-		<include locales="de_BE"/>
-		<include locales="de_CH"/>
-		<include locales="de_DE"/>
-		<include locales="de_IT"/>
-		<include locales="de_LI"/>
-		<include locales="de_LU"/>
-		<include locales="dje"/>
-		<include locales="dje_NE"/>
-		<include locales="dsb"/>
-		<include locales="dsb_DE"/>
-		<include locales="dua"/>
-		<include locales="dua_CM"/>
-		<include locales="dyo"/>
-		<include locales="dyo_SN"/>
-		<include locales="dz"/>
-		<include locales="dz_BT"/>
-		<include locales="ebu"/>
-		<include locales="ebu_KE"/>
-		<include locales="ee"/>
-		<include locales="ee_GH"/>
-		<include locales="ee_TG"/>
-		<include locales="el"/>
-		<include locales="el_CY"/>
-		<include locales="el_GR"/>
-		<include locales="en"/>
-		<include locales="en_001"/>
-		<include locales="en_150"/>
-		<include locales="en_AE"/>
-		<include locales="en_AG"/>
-		<include locales="en_AI"/>
-		<include locales="en_AS"/>
-		<include locales="en_AT"/>
-		<include locales="en_AU"/>
-		<include locales="en_BB"/>
-		<include locales="en_BE"/>
-		<include locales="en_BI"/>
-		<include locales="en_BM"/>
-		<include locales="en_BS"/>
-		<include locales="en_BW"/>
-		<include locales="en_BZ"/>
-		<include locales="en_CA"/>
-		<include locales="en_CC"/>
-		<include locales="en_CH"/>
-		<include locales="en_CK"/>
-		<include locales="en_CM"/>
-		<include locales="en_CX"/>
-		<include locales="en_CY"/>
-		<include locales="en_DE"/>
-		<include locales="en_DG"/>
-		<include locales="en_DK"/>
-		<include locales="en_DM"/>
-		<include locales="en_ER"/>
-		<include locales="en_FI"/>
-		<include locales="en_FJ"/>
-		<include locales="en_FK"/>
-		<include locales="en_FM"/>
-		<include locales="en_GB"/>
-		<include locales="en_GD"/>
-		<include locales="en_GG"/>
-		<include locales="en_GH"/>
-		<include locales="en_GI"/>
-		<include locales="en_GM"/>
-		<include locales="en_GU"/>
-		<include locales="en_GY"/>
-		<include locales="en_HK"/>
-		<include locales="en_IE"/>
-		<include locales="en_IL"/>
-		<include locales="en_IM"/>
-		<include locales="en_IN"/>
-		<include locales="en_IO"/>
-		<include locales="en_JE"/>
-		<include locales="en_JM"/>
-		<include locales="en_KE"/>
-		<include locales="en_KI"/>
-		<include locales="en_KN"/>
-		<include locales="en_KY"/>
-		<include locales="en_LC"/>
-		<include locales="en_LR"/>
-		<include locales="en_LS"/>
-		<include locales="en_MG"/>
-		<include locales="en_MH"/>
-		<include locales="en_MO"/>
-		<include locales="en_MP"/>
-		<include locales="en_MS"/>
-		<include locales="en_MT"/>
-		<include locales="en_MU"/>
-		<include locales="en_MW"/>
-		<include locales="en_MY"/>
-		<include locales="en_NA"/>
-		<include locales="en_NF"/>
-		<include locales="en_NG"/>
-		<include locales="en_NL"/>
-		<include locales="en_NR"/>
-		<include locales="en_NU"/>
-		<include locales="en_NZ"/>
-		<include locales="en_PG"/>
-		<include locales="en_PH"/>
-		<include locales="en_PK"/>
-		<include locales="en_PN"/>
-		<include locales="en_PR"/>
-		<include locales="en_PW"/>
-		<include locales="en_RW"/>
-		<include locales="en_SB"/>
-		<include locales="en_SC"/>
-		<include locales="en_SD"/>
-		<include locales="en_SE"/>
-		<include locales="en_SG"/>
-		<include locales="en_SH"/>
-		<include locales="en_SI"/>
-		<include locales="en_SL"/>
-		<include locales="en_SS"/>
-		<include locales="en_SX"/>
-		<include locales="en_SZ"/>
-		<include locales="en_TC"/>
-		<include locales="en_TK"/>
-		<include locales="en_TO"/>
-		<include locales="en_TT"/>
-		<include locales="en_TV"/>
-		<include locales="en_TZ"/>
-		<include locales="en_UG"/>
-		<include locales="en_UM"/>
-		<include locales="en_US"/>
-		<include locales="en_US_POSIX"/>
-		<include locales="en_VC"/>
-		<include locales="en_VG"/>
-		<include locales="en_VI"/>
-		<include locales="en_VU"/>
-		<include locales="en_WS"/>
-		<include locales="en_ZA"/>
-		<include locales="en_ZM"/>
-		<include locales="en_ZW"/>
-		<include locales="eo"/>
-		<include locales="eo_001"/>
-		<include locales="es"/>
-		<include locales="es_003"/>
-		<include locales="es_419"/>
-		<include locales="es_AR"/>
-		<include locales="es_BO"/>
-		<include locales="es_BR"/>
-		<include locales="es_BZ"/>
-		<include locales="es_CL"/>
-		<include locales="es_CO"/>
-		<include locales="es_CR"/>
-		<include locales="es_CU"/>
-		<include locales="es_DO"/>
-		<include locales="es_EA"/>
-		<include locales="es_EC"/>
-		<include locales="es_ES"/>
-		<include locales="es_GQ"/>
-		<include locales="es_GT"/>
-		<include locales="es_HN"/>
-		<include locales="es_IC"/>
-		<include locales="es_MX"/>
-		<include locales="es_NI"/>
-		<include locales="es_PA"/>
-		<include locales="es_PE"/>
-		<include locales="es_PH"/>
-		<include locales="es_PR"/>
-		<include locales="es_PY"/>
-		<include locales="es_SV"/>
-		<include locales="es_US"/>
-		<include locales="es_UY"/>
-		<include locales="es_VE"/>
-		<include locales="et"/>
-		<include locales="et_EE"/>
-		<include locales="eu"/>
-		<include locales="eu_ES"/>
-		<include locales="ewo"/>
-		<include locales="ewo_CM"/>
-		<include locales="fa"/>
-		<include locales="fa_AF"/>
-		<include locales="fa_IR"/>
-		<include locales="ff"/>
-		<include locales="ff_Adlm"/>
-		<include locales="ff_Adlm_BF"/>
-		<include locales="ff_Adlm_CM"/>
-		<include locales="ff_Adlm_GH"/>
-		<include locales="ff_Adlm_GM"/>
-		<include locales="ff_Adlm_GN"/>
-		<include locales="ff_Adlm_GW"/>
-		<include locales="ff_Adlm_LR"/>
-		<include locales="ff_Adlm_MR"/>
-		<include locales="ff_Adlm_NE"/>
-		<include locales="ff_Adlm_NG"/>
-		<include locales="ff_Adlm_SL"/>
-		<include locales="ff_Adlm_SN"/>
-		<include locales="ff_Latn"/>
-		<include locales="ff_Latn_BF"/>
-		<include locales="ff_Latn_CM"/>
-		<include locales="ff_Latn_GH"/>
-		<include locales="ff_Latn_GM"/>
-		<include locales="ff_Latn_GN"/>
-		<include locales="ff_Latn_GW"/>
-		<include locales="ff_Latn_LR"/>
-		<include locales="ff_Latn_MR"/>
-		<include locales="ff_Latn_NE"/>
-		<include locales="ff_Latn_NG"/>
-		<include locales="ff_Latn_SL"/>
-		<include locales="ff_Latn_SN"/>
-		<include locales="fi"/>
-		<include locales="fi_FI"/>
-		<include locales="fil"/>
-		<include locales="fil_PH"/>
-		<include locales="fo"/>
-		<include locales="fo_DK"/>
-		<include locales="fo_FO"/>
-		<include locales="fr"/>
-		<include locales="fr_BE"/>
-		<include locales="fr_BF"/>
-		<include locales="fr_BI"/>
-		<include locales="fr_BJ"/>
-		<include locales="fr_BL"/>
-		<include locales="fr_CA"/>
-		<include locales="fr_CD"/>
-		<include locales="fr_CF"/>
-		<include locales="fr_CG"/>
-		<include locales="fr_CH"/>
-		<include locales="fr_CI"/>
-		<include locales="fr_CM"/>
-		<include locales="fr_DJ"/>
-		<include locales="fr_DZ"/>
-		<include locales="fr_FR"/>
-		<include locales="fr_GA"/>
-		<include locales="fr_GF"/>
-		<include locales="fr_GN"/>
-		<include locales="fr_GP"/>
-		<include locales="fr_GQ"/>
-		<include locales="fr_HT"/>
-		<include locales="fr_KM"/>
-		<include locales="fr_LU"/>
-		<include locales="fr_MA"/>
-		<include locales="fr_MC"/>
-		<include locales="fr_MF"/>
-		<include locales="fr_MG"/>
-		<include locales="fr_ML"/>
-		<include locales="fr_MQ"/>
-		<include locales="fr_MR"/>
-		<include locales="fr_MU"/>
-		<include locales="fr_NC"/>
-		<include locales="fr_NE"/>
-		<include locales="fr_PF"/>
-		<include locales="fr_PM"/>
-		<include locales="fr_RE"/>
-		<include locales="fr_RW"/>
-		<include locales="fr_SC"/>
-		<include locales="fr_SN"/>
-		<include locales="fr_SY"/>
-		<include locales="fr_TD"/>
-		<include locales="fr_TG"/>
-		<include locales="fr_TN"/>
-		<include locales="fr_VU"/>
-		<include locales="fr_WF"/>
-		<include locales="fr_YT"/>
-		<include locales="fur"/>
-		<include locales="fur_IT"/>
-		<include locales="fy"/>
-		<include locales="fy_NL"/>
-		<include locales="ga"/>
-		<include locales="ga_GB"/>
-		<include locales="ga_IE"/>
-		<include locales="gd"/>
-		<include locales="gd_GB"/>
-		<include locales="gl"/>
-		<include locales="gl_ES"/>
-		<include locales="gsw"/>
-		<include locales="gsw_CH"/>
-		<include locales="gsw_FR"/>
-		<include locales="gsw_LI"/>
-		<include locales="gu"/>
-		<include locales="gu_IN"/>
-		<include locales="guz"/>
-		<include locales="guz_KE"/>
-		<include locales="gv"/>
-		<include locales="gv_IM"/>
-		<include locales="ha"/>
-		<include locales="ha_GH"/>
-		<include locales="ha_NE"/>
-		<include locales="ha_NG"/>
-		<include locales="haw"/>
-		<include locales="haw_US"/>
-		<include locales="he"/>
-		<include locales="he_IL"/>
-		<include locales="hi"/>
-		<include locales="hi_IN"/>
-		<include locales="hr"/>
-		<include locales="hr_BA"/>
-		<include locales="hr_HR"/>
-		<include locales="hsb"/>
-		<include locales="hsb_DE"/>
-		<include locales="hu"/>
-		<include locales="hu_HU"/>
-		<include locales="hy"/>
-		<include locales="hy_AM"/>
-		<include locales="ia"/>
-		<include locales="ia_001"/>
-		<include locales="id"/>
-		<include locales="id_ID"/>
-		<include locales="ig"/>
-		<include locales="ig_NG"/>
-		<include locales="ii"/>
-		<include locales="ii_CN"/>
-		<include locales="is"/>
-		<include locales="is_IS"/>
-		<include locales="it"/>
-		<include locales="it_CH"/>
-		<include locales="it_IT"/>
-		<include locales="it_SM"/>
-		<include locales="it_VA"/>
-		<include locales="ja"/>
-		<include locales="ja_JP"/>
-		<include locales="jgo"/>
-		<include locales="jgo_CM"/>
-		<include locales="jmc"/>
-		<include locales="jmc_TZ"/>
-		<include locales="jv"/>
-		<include locales="jv_ID"/>
-		<include locales="ka"/>
-		<include locales="ka_GE"/>
-		<include locales="kab"/>
-		<include locales="kab_DZ"/>
-		<include locales="kam"/>
-		<include locales="kam_KE"/>
-		<include locales="kde"/>
-		<include locales="kde_TZ"/>
-		<include locales="kea"/>
-		<include locales="kea_CV"/>
-		<include locales="khq"/>
-		<include locales="khq_ML"/>
-		<include locales="ki"/>
-		<include locales="ki_KE"/>
-		<include locales="kk"/>
-		<include locales="kk_KZ"/>
-		<include locales="kkj"/>
-		<include locales="kkj_CM"/>
-		<include locales="kl"/>
-		<include locales="kl_GL"/>
-		<include locales="kln"/>
-		<include locales="kln_KE"/>
-		<include locales="km"/>
-		<include locales="km_KH"/>
-		<include locales="kn"/>
-		<include locales="kn_IN"/>
-		<include locales="ko"/>
-		<include locales="ko_KP"/>
-		<include locales="ko_KR"/>
-		<include locales="kok"/>
-		<include locales="kok_IN"/>
-		<include locales="ks"/>
-		<include locales="ks_Arab"/>
-		<include locales="ks_Arab_IN"/>
-		<include locales="ksb"/>
-		<include locales="ksb_TZ"/>
-		<include locales="ksf"/>
-		<include locales="ksf_CM"/>
-		<include locales="ksh"/>
-		<include locales="ksh_DE"/>
-		<include locales="ku"/>
-		<include locales="ku_TR"/>
-		<include locales="kw"/>
-		<include locales="kw_GB"/>
-		<include locales="ky"/>
-		<include locales="ky_KG"/>
-		<include locales="lag"/>
-		<include locales="lag_TZ"/>
-		<include locales="lb"/>
-		<include locales="lb_LU"/>
-		<include locales="lg"/>
-		<include locales="lg_UG"/>
-		<include locales="lkt"/>
-		<include locales="lkt_US"/>
-		<include locales="ln"/>
-		<include locales="ln_AO"/>
-		<include locales="ln_CD"/>
-		<include locales="ln_CF"/>
-		<include locales="ln_CG"/>
-		<include locales="lo"/>
-		<include locales="lo_LA"/>
-		<include locales="lrc"/>
-		<include locales="lrc_IQ"/>
-		<include locales="lrc_IR"/>
-		<include locales="lt"/>
-		<include locales="lt_LT"/>
-		<include locales="lu"/>
-		<include locales="lu_CD"/>
-		<include locales="luo"/>
-		<include locales="luo_KE"/>
-		<include locales="luy"/>
-		<include locales="luy_KE"/>
-		<include locales="lv"/>
-		<include locales="lv_LV"/>
-		<include locales="mai"/>
-		<include locales="mai_IN"/>
-		<include locales="mas"/>
-		<include locales="mas_KE"/>
-		<include locales="mas_TZ"/>
-		<include locales="mer"/>
-		<include locales="mer_KE"/>
-		<include locales="mfe"/>
-		<include locales="mfe_MU"/>
-		<include locales="mg"/>
-		<include locales="mg_MG"/>
-		<include locales="mgh"/>
-		<include locales="mgh_MZ"/>
-		<include locales="mgo"/>
-		<include locales="mgo_CM"/>
-		<include locales="mi"/>
-		<include locales="mi_NZ"/>
-		<include locales="mk"/>
-		<include locales="mk_MK"/>
-		<include locales="ml"/>
-		<include locales="ml_IN"/>
-		<include locales="mn"/>
-		<include locales="mn_MN"/>
-		<include locales="mni"/>
-		<include locales="mni_Beng"/>
-		<include locales="mni_Beng_IN"/>
-		<include locales="mr"/>
-		<include locales="mr_IN"/>
-		<include locales="ms"/>
-		<include locales="ms_BN"/>
-		<include locales="ms_MY"/>
-		<include locales="ms_SG"/>
-		<include locales="mt"/>
-		<include locales="mt_MT"/>
-		<include locales="mua"/>
-		<include locales="mua_CM"/>
-		<include locales="my"/>
-		<include locales="my_MM"/>
-		<include locales="mzn"/>
-		<include locales="mzn_IR"/>
-		<include locales="naq"/>
-		<include locales="naq_NA"/>
-		<include locales="nb"/>
-		<include locales="nb_NO"/>
-		<include locales="nb_SJ"/>
-		<include locales="nd"/>
-		<include locales="nd_ZW"/>
-		<include locales="nds"/>
-		<include locales="nds_DE"/>
-		<include locales="nds_NL"/>
-		<include locales="ne"/>
-		<include locales="ne_IN"/>
-		<include locales="ne_NP"/>
-		<include locales="nl"/>
-		<include locales="nl_AW"/>
-		<include locales="nl_BE"/>
-		<include locales="nl_BQ"/>
-		<include locales="nl_CW"/>
-		<include locales="nl_NL"/>
-		<include locales="nl_SR"/>
-		<include locales="nl_SX"/>
-		<include locales="nmg"/>
-		<include locales="nmg_CM"/>
-		<include locales="nn"/>
-		<include locales="nn_NO"/>
-		<include locales="nnh"/>
-		<include locales="nnh_CM"/>
-		<include locales="nus"/>
-		<include locales="nus_SS"/>
-		<include locales="nyn"/>
-		<include locales="nyn_UG"/>
-		<include locales="om"/>
-		<include locales="om_ET"/>
-		<include locales="om_KE"/>
-		<include locales="or"/>
-		<include locales="or_IN"/>
-		<include locales="os"/>
-		<include locales="os_GE"/>
-		<include locales="os_RU"/>
-		<include locales="pa"/>
-		<include locales="pa_Arab"/>
-		<include locales="pa_Arab_PK"/>
-		<include locales="pa_Guru"/>
-		<include locales="pa_Guru_IN"/>
-		<include locales="pcm"/>
-		<include locales="pcm_NG"/>
-		<include locales="pl"/>
-		<include locales="pl_PL"/>
-		<include locales="ps"/>
-		<include locales="ps_AF"/>
-		<include locales="ps_PK"/>
-		<include locales="pt"/>
-		<include locales="pt_AO"/>
-		<include locales="pt_BR"/>
-		<include locales="pt_CH"/>
-		<include locales="pt_CV"/>
-		<include locales="pt_GQ"/>
-		<include locales="pt_GW"/>
-		<include locales="pt_LU"/>
-		<include locales="pt_MO"/>
-		<include locales="pt_MZ"/>
-		<include locales="pt_PT"/>
-		<include locales="pt_ST"/>
-		<include locales="pt_TL"/>
-		<include locales="qu"/>
-		<include locales="qu_BO"/>
-		<include locales="qu_EC"/>
-		<include locales="qu_PE"/>
-		<include locales="rm"/>
-		<include locales="rm_CH"/>
-		<include locales="rn"/>
-		<include locales="rn_BI"/>
-		<include locales="ro"/>
-		<include locales="ro_MD"/>
-		<include locales="ro_RO"/>
-		<include locales="rof"/>
-		<include locales="rof_TZ"/>
-		<include locales="root"/>
-		<include locales="ru"/>
-		<include locales="ru_BY"/>
-		<include locales="ru_KG"/>
-		<include locales="ru_KZ"/>
-		<include locales="ru_MD"/>
-		<include locales="ru_RU"/>
-		<include locales="ru_UA"/>
-		<include locales="rw"/>
-		<include locales="rw_RW"/>
-		<include locales="rwk"/>
-		<include locales="rwk_TZ"/>
-		<include locales="sah"/>
-		<include locales="sah_RU"/>
-		<include locales="saq"/>
-		<include locales="saq_KE"/>
-		<include locales="sat"/>
-		<include locales="sat_Olck"/>
-		<include locales="sat_Olck_IN"/>
-		<include locales="sbp"/>
-		<include locales="sbp_TZ"/>
-		<include locales="sd"/>
-		<include locales="sd_Arab"/>
-		<include locales="sd_Arab_PK"/>
-		<include locales="sd_Deva"/>
-		<include locales="sd_Deva_IN"/>
-		<include locales="se"/>
-		<include locales="se_FI"/>
-		<include locales="se_NO"/>
-		<include locales="se_SE"/>
-		<include locales="seh"/>
-		<include locales="seh_MZ"/>
-		<include locales="ses"/>
-		<include locales="ses_ML"/>
-		<include locales="sg"/>
-		<include locales="sg_CF"/>
-		<include locales="shi"/>
-		<include locales="shi_Latn"/>
-		<include locales="shi_Latn_MA"/>
-		<include locales="shi_Tfng"/>
-		<include locales="shi_Tfng_MA"/>
-		<include locales="si"/>
-		<include locales="si_LK"/>
-		<include locales="sk"/>
-		<include locales="sk_SK"/>
-		<include locales="sl"/>
-		<include locales="sl_SI"/>
-		<include locales="smn"/>
-		<include locales="smn_FI"/>
-		<include locales="sn"/>
-		<include locales="sn_ZW"/>
-		<include locales="so"/>
-		<include locales="so_DJ"/>
-		<include locales="so_ET"/>
-		<include locales="so_KE"/>
-		<include locales="so_SO"/>
-		<include locales="sq"/>
-		<include locales="sq_AL"/>
-		<include locales="sq_MK"/>
-		<include locales="sq_XK"/>
-		<include locales="sr"/>
-		<include locales="sr_Cyrl"/>
-		<include locales="sr_Cyrl_BA"/>
-		<include locales="sr_Cyrl_ME"/>
-		<include locales="sr_Cyrl_RS"/>
-		<include locales="sr_Cyrl_XK"/>
-		<include locales="sr_Latn"/>
-		<include locales="sr_Latn_BA"/>
-		<include locales="sr_Latn_ME"/>
-		<include locales="sr_Latn_RS"/>
-		<include locales="sr_Latn_XK"/>
-		<include locales="su"/>
-		<include locales="su_Latn"/>
-		<include locales="su_Latn_ID"/>
-		<include locales="sv"/>
-		<include locales="sv_AX"/>
-		<include locales="sv_FI"/>
-		<include locales="sv_SE"/>
-		<include locales="sw"/>
-		<include locales="sw_CD"/>
-		<include locales="sw_KE"/>
-		<include locales="sw_TZ"/>
-		<include locales="sw_UG"/>
-		<include locales="ta"/>
-		<include locales="ta_IN"/>
-		<include locales="ta_LK"/>
-		<include locales="ta_MY"/>
-		<include locales="ta_SG"/>
-		<include locales="te"/>
-		<include locales="te_IN"/>
-		<include locales="teo"/>
-		<include locales="teo_KE"/>
-		<include locales="teo_UG"/>
-		<include locales="tg"/>
-		<include locales="tg_TJ"/>
-		<include locales="th"/>
-		<include locales="th_TH"/>
-		<include locales="ti"/>
-		<include locales="ti_ER"/>
-		<include locales="ti_ET"/>
-		<include locales="tk"/>
-		<include locales="tk_TM"/>
-		<include locales="to"/>
-		<include locales="to_TO"/>
-		<include locales="tr"/>
-		<include locales="tr_CY"/>
-		<include locales="tr_TR"/>
-		<include locales="tt"/>
-		<include locales="tt_RU"/>
-		<include locales="twq"/>
-		<include locales="twq_NE"/>
-		<include locales="tzm"/>
-		<include locales="tzm_MA"/>
-		<include locales="ug"/>
-		<include locales="ug_CN"/>
-		<include locales="uk"/>
-		<include locales="uk_UA"/>
-		<include locales="ur"/>
-		<include locales="ur_IN"/>
-		<include locales="ur_PK"/>
-		<include locales="uz"/>
-		<include locales="uz_Arab"/>
-		<include locales="uz_Arab_AF"/>
-		<include locales="uz_Cyrl"/>
-		<include locales="uz_Cyrl_UZ"/>
-		<include locales="uz_Latn"/>
-		<include locales="uz_Latn_UZ"/>
-		<include locales="vai"/>
-		<include locales="vai_Latn"/>
-		<include locales="vai_Latn_LR"/>
-		<include locales="vai_Vaii"/>
-		<include locales="vai_Vaii_LR"/>
-		<include locales="vi"/>
-		<include locales="vi_VN"/>
-		<include locales="vun"/>
-		<include locales="vun_TZ"/>
-		<include locales="wae"/>
-		<include locales="wae_CH"/>
-		<include locales="wo"/>
-		<include locales="wo_SN"/>
-		<include locales="xh"/>
-		<include locales="xh_ZA"/>
-		<include locales="xog"/>
-		<include locales="xog_UG"/>
-		<include locales="yav"/>
-		<include locales="yav_CM"/>
-		<include locales="yi"/>
-		<include locales="yi_001"/>
-		<include locales="yo"/>
-		<include locales="yo_BJ"/>
-		<include locales="yo_NG"/>
-		<include locales="yue"/>
-		<include locales="yue_Hans"/>
-		<include locales="yue_Hans_CN"/>
-		<include locales="yue_Hant"/>
-		<include locales="yue_Hant_HK"/>
-		<include locales="zgh"/>
-		<include locales="zgh_MA"/>
-		<include locales="zh"/>
-		<include locales="zh_Hans"/>
-		<include locales="zh_Hans_CN"/>
-		<include locales="zh_Hans_HK"/>
-		<include locales="zh_Hans_MO"/>
-		<include locales="zh_Hans_SG"/>
-		<include locales="zh_Hant"/>
-		<include locales="zh_Hant_HK"/>
-		<include locales="zh_Hant_MO"/>
-		<include locales="zh_Hant_TW"/>
-		<include locales="zu"/>
-		<include locales="zu_ZA"/>
-	</locales>
-</config>
diff --git a/icu4c/source/data/icu-locale-deprecates.xml b/icu4c/source/data/icu-locale-deprecates.xml
deleted file mode 100644
index b702dbae234..00000000000
--- a/icu4c/source/data/icu-locale-deprecates.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
-/*
-* Copyright (C) 2016 and later: Unicode, Inc. and others.
-* License & terms of use: http://www.unicode.org/copyright.html
-*******************************************************************************
-* Copyright (C) 2009-2015, International Business Machines Corporation and    *
-* others. All Rights Reserved.                                                *
-*******************************************************************************
-*/
--->
-<deprecates>
-    <alias from="ars" to="ar_SA"/>
-    <alias from="az_AZ" to="az_Latn_AZ"/>
-    <alias from="bs_BA" to="bs_Latn_BA" />
-    <alias from="en_NH" to="en_VU"/>
-    <alias from="en_RH" to="en_ZW"/>
-    <alias from="ff_CM" to="ff_Latn_CM"/>
-    <alias from="ff_GN" to="ff_Latn_GN"/>
-    <alias from="ff_MR" to="ff_Latn_MR"/>
-    <alias from="ff_SN" to="ff_Latn_SN"/>
-    <alias from="in" to="id"/>
-    <alias from="in_ID" to="id_ID"/>
-    <alias from="iw" to="he"/>
-    <alias from="iw_IL" to="he_IL"/>
-    <alias from="ja_JP_TRADITIONAL" to="ja_JP" rbpath="/calendar/default" value="japanese"/>
-    <alias from="ks_IN" to="ks_Arab_IN"/>
-    <alias from="mni_IN" to="mni_Beng_IN"/>
-    <alias from="mo" to="ro"/>
-    <alias from="no" to="nb"/>
-    <alias from="no_NO" to="nb_NO"/>
-    <alias from="no_NO_NY" to="nn_NO"/>
-    <alias from="pa_IN" to="pa_Guru_IN"/>
-    <alias from="pa_PK" to="pa_Arab_PK"/>
-    <alias from="sat_IN" to="sat_Olck_IN"/>
-    <alias from="sd_PK" to="sd_Arab_PK"/>
-    <alias from="sh" to="sr_Latn"/>
-    <alias from="sh_BA" to="sr_Latn_BA"/>
-    <alias from="sh_CS" to="sr_Latn_RS"/>
-    <alias from="sh_YU" to="sr_Latn_RS"/>
-    <alias from="shi_MA" to="shi_Tfng_MA"/>
-    <alias from="sr_BA" to="sr_Cyrl_BA"/>
-    <alias from="sr_CS" to="sr_Cyrl_RS"/>
-    <alias from="sr_ME" to="sr_Latn_ME"/>
-    <alias from="sr_RS" to="sr_Cyrl_RS"/>
-    <alias from="sr_XK" to="sr_Cyrl_XK"/>
-    <alias from="sr_YU" to="sr_Cyrl_RS"/>
-    <alias from="sr_Cyrl_YU" to="sr_Cyrl_RS"/>
-    <alias from="sr_Cyrl_CS" to="sr_Cyrl_RS"/>
-    <alias from="sr_Latn_YU" to="sr_Latn_RS"/>
-    <alias from="sr_Latn_CS" to="sr_Latn_RS"/>
-    <alias from="su_ID" to="su_Latn_ID"/>
-    <alias from="th_TH_TRADITIONAL" to="th_TH" rbpath="/calendar/default" value="buddhist"/>
-    <alias from="tl" to="fil"/>
-    <alias from="tl_PH" to="fil_PH"/>
-    <alias from="uz_AF" to="uz_Arab_AF"/>
-    <alias from="uz_UZ" to="uz_Latn_UZ"/>
-    <alias from="vai_LR" to="vai_Vaii_LR"/>
-    <alias from="yue_CN" to="yue_Hans_CN"/>
-    <alias from="yue_HK" to="yue_Hant_HK"/>
-    <alias from="zh_CN" to="zh_Hans_CN"/>
-    <alias from="zh_HK" to="zh_Hant_HK"/>
-    <alias from="zh_MO" to="zh_Hant_MO"/>
-    <alias from="zh_SG" to="zh_Hans_SG"/>
-    <alias from="zh_TW" to="zh_Hant_TW"/>
-</deprecates>
diff --git a/icu4c/source/data/icu-rbnf-deprecates.xml b/icu4c/source/data/icu-rbnf-deprecates.xml
deleted file mode 100644
index d933a2d4906..00000000000
--- a/icu4c/source/data/icu-rbnf-deprecates.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-/*
-* Copyright (C) 2016 and later: Unicode, Inc. and others.
-* License & terms of use: http://www.unicode.org/copyright.html
-*******************************************************************************
-* Copyright (C) 2015-2016, International Business Machines Corporation and    *
-* others. All Rights Reserved.                                                *
-*******************************************************************************
-*/
--->
-<!--
-TODO: Most of these aliases are CLDR parent locales. Is this separate list
-necessary and can we just use the main list in icu-locale-deprecates.xml?
--->
-<deprecates>
-   <alias from="ars" to="ar" />
-   <alias from="es_DO" to="es_419" />
-   <alias from="es_GT" to="es_419" />
-   <alias from="es_HN" to="es_419" />
-   <alias from="es_MX" to="es_419" />
-   <alias from="es_NI" to="es_419" />
-   <alias from="es_PA" to="es_419" />
-   <alias from="es_PR" to="es_419" />
-   <alias from="es_SV" to="es_419" />
-   <alias from="es_US" to="es_419" />
-   <alias from="in" to="id" />
-   <alias from="iw" to="he" />
-   <alias from="no" to="nb" />
-   <alias from="sh" to="sr_Latn" />
-   <alias from="zh_Hant_HK" to="yue" />
-   <alias from="zh_HK" to="yue" />
-   <alias from="zh_MO" to="yue" />
-   <alias from="zh_TW" to="zh_Hant" />
-</deprecates>