From 8bb71362f2266111a71436f1fd467aa48005a0b0 Mon Sep 17 00:00:00 2001
From: Peter Edberg <pedberg@unicode.org>
Date: Thu, 11 Mar 2021 01:16:05 -0800
Subject: [PATCH] ICU-21480 integrate CLDR release-39-beta to ICU trunk

---
 icu4c/source/data/misc/plurals.txt      | 10 +++++-----
 icu4c/source/data/misc/windowsZones.txt |  6 +++---
 icu4c/source/data/zone/hi.txt           |  2 +-
 icu4j/main/shared/data/icudata.jar      |  4 ++--
 icu4j/main/shared/data/icutzdata.jar    |  4 ++--
 icu4j/main/shared/data/testdata.jar     |  2 +-
 tools/cldr/cldr-to-icu/pom.xml          | 14 ++++++++++++--
 7 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/icu4c/source/data/misc/plurals.txt b/icu4c/source/data/misc/plurals.txt
index 16bc1749f7c..ab1739f4678 100644
--- a/icu4c/source/data/misc/plurals.txt
+++ b/icu4c/source/data/misc/plurals.txt
@@ -461,14 +461,14 @@ plurals:table(nofallback){
         set20{
             many{
                 "e = 0 and i != 0 and i % 1000000 = 0 and v = 0 or e != 0..5 @integer"
-                " 1000000, 1e6, 2e6, 3e6, 4e6, 5e6, 6e6, … @decimal 1.0000001e6, 1.1e"
-                "6, 2.0000001e6, 2.1e6, 3.0000001e6, 3.1e6, …"
+                " 1000000, 1c6, 2c6, 3c6, 4c6, 5c6, 6c6, … @decimal 1.0000001c6, 1.1c"
+                "6, 2.0000001c6, 2.1c6, 3.0000001c6, 3.1c6, …"
             }
             one{"i = 0,1 @integer 0, 1 @decimal 0.0~1.5"}
             other{
-                " @integer 2~17, 100, 1000, 10000, 100000, 1e3, 2e3, 3e3, 4e3, 5e3, 6"
-                "e3, … @decimal 2.0~3.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000"
-                "000.0, 1.0001e3, 1.1e3, 2.0001e3, 2.1e3, 3.0001e3, 3.1e3, …"
+                " @integer 2~17, 100, 1000, 10000, 100000, 1c3, 2c3, 3c3, 4c3, 5c3, 6"
+                "c3, … @decimal 2.0~3.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000"
+                "000.0, 1.0001c3, 1.1c3, 2.0001c3, 2.1c3, 3.0001c3, 3.1c3, …"
             }
         }
         set21{
diff --git a/icu4c/source/data/misc/windowsZones.txt b/icu4c/source/data/misc/windowsZones.txt
index 01a3730d355..06b90f2b8d3 100644
--- a/icu4c/source/data/misc/windowsZones.txt
+++ b/icu4c/source/data/misc/windowsZones.txt
@@ -304,6 +304,7 @@ windowsZones:table(nofallback){
             BF{"Africa/Ouagadougou"}
             CI{"Africa/Abidjan"}
             GH{"Africa/Accra"}
+            GL{"America/Danmarkshavn"}
             GM{"Africa/Banjul"}
             GN{"Africa/Conakry"}
             GW{"Africa/Bissau"}
@@ -680,9 +681,8 @@ windowsZones:table(nofallback){
             ZZ{"Etc/GMT+7"}
         }
         "UTC"{
-            001{"Etc/GMT"}
-            GL{"America/Danmarkshavn"}
-            ZZ{"Etc/GMT Etc/UTC"}
+            001{"Etc/UTC"}
+            ZZ{"Etc/UTC Etc/GMT"}
         }
         "UTC+12"{
             001{"Etc/GMT-12"}
diff --git a/icu4c/source/data/zone/hi.txt b/icu4c/source/data/zone/hi.txt
index f9051bbed62..0ae2600cbec 100644
--- a/icu4c/source/data/zone/hi.txt
+++ b/icu4c/source/data/zone/hi.txt
@@ -769,7 +769,7 @@ hi{
             ec{"कुवैत"}
         }
         "Asia:Macau"{
-            ec{"मकाउ"}
+            ec{"मकाऊ"}
         }
         "Asia:Magadan"{
             ec{"मागादान"}
diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index 6f0dae4687d..276950588c7 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:fd5ad664553e56cbbd89e7eb9721d6e78dbace888a12dfabdd56e4565e92d675
-size 13302692
+oid sha256:08b8bcf3aac70c033f11615ade6aa42fcd2242f8f90df7379aa4adaa219318dd
+size 13302298
diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index 094a1bc1f74..647ac0538fe 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:5deb1e854be1bbc3c1038fc02e95e779ae5f69fb857f9ccd63f7cdccdbc7da9c
-size 95094
+oid sha256:ecb74957c99d65a50729cd1d72e7e92e7254560381362980d73675d246281371
+size 95105
diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar
index 3c6055fc3b3..61a2c94ba39 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:b39f56ea6d1f099a49aec4265c53c3355ff43a91f926d8fde1355887ae562de4
+oid sha256:382f6e65ed9855715493eb48fb11e3bba62ff84754bf36fbe11370479a4c27bc
 size 723620
diff --git a/tools/cldr/cldr-to-icu/pom.xml b/tools/cldr/cldr-to-icu/pom.xml
index 198095a4752..e157280ada1 100644
--- a/tools/cldr/cldr-to-icu/pom.xml
+++ b/tools/cldr/cldr-to-icu/pom.xml
@@ -82,8 +82,10 @@
         <!-- ICU4J - which should be kept as up-to-date as possible. -->
         <dependency>
             <groupId>com.ibm.icu</groupId>
-            <artifactId>icu4j</artifactId>
-            <version>67.1</version>
+            <artifactId>icu4j-for-cldr</artifactId>
+            <version>69.1-SNAPSHOT-cldr-2021-03-09</version>
+            <!-- Note: see https://github.com/unicode-org/icu/packages/411079/versions
+                for the icu4j-for-cldr version tag to use -->
         </dependency>
 
         <!-- Useful common libraries. Note that some of the code in the CLDR library is also
@@ -116,4 +118,12 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <repositories>
+        <repository>
+            <id>githubcldr</id>
+            <name>GitHub unicode-org/icu Apache Maven Packages</name>
+            <url>https://maven.pkg.github.com/unicode-org/icu</url>
+        </repository>
+    </repositories>
 </project>