CLDR-13591 BRS37 Update ICU4J libs & readme, fix spec validation errs (…

…#402) (cherry picked from commit fd906e8)
unicode-org · Mar 24, 2020 · 06c10f8 · 06c10f8
1 parent 4a53541
commit 06c10f8
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 22 deletions.
diff --git a/docs/ldml/tr35-general.html b/docs/ldml/tr35-general.html
@@ -2483,7 +2483,7 @@ <h3>6.<span class='changed'>4</span> <a name="perUnitPatterns" href="#perUnitPat
     necessary).</p>
     <h3>6.<span class='changed'>5</span> <a name="Unit_Sequences" href="#Unit_Sequences" id=
     "Unit_Sequences">Unit Sequences<span class='changed'> (Mixed Units)</span></a></h3>
-    <p>Units may be used in composed sequences <span  class='changed'></span>(aka <em>mixed units</em>)</span>, such as <strong>5°
+    <p>Units may be used in composed sequences <span  class='changed'>(aka <em>mixed units</em>)</span>, such as <strong>5°
     30′</strong> for 5 degrees 30 minutes, or <strong>3 ft 2
     in.</strong> For that purpose, the appropriate width of the unit
     listPattern can be used to compose the units in a sequence.</p>
@@ -4981,7 +4981,7 @@ <h3>14.3 <a name="Typographic_Names" href="#Typographic_Names"
     </ol>
 	  <div class='changed'>
     <h2>15 <a name="Grammatical_Features" href="#Grammatical_Features"
-    id="Grammatical_Features">Grammatical Features</h2>
+    id="Grammatical_Features">Grammatical Features</a></h2>
 
 
 <p>

diff --git a/readme.html b/readme.html
@@ -12,18 +12,18 @@
   <body>
     <h2>Unicode Common Locale Data Repository (CLDR)</h2>
     <h3>ReadMe for Unicode <abbr title="Common Locale Data Repository">CLDR</abbr> version 37</h3>
-    <p>Last updated: 2020-Feb-16</p>
+    <p>Last updated: 2020-Mar-23</p>
 
     <!--<p><b>Note:</b> CLDR 37 is in development and not recommended for use at this stage.</p>-->
     <!--<p><b>Note:</b> This is the milestone 1 version of CLDR 37, intended for those wishing to do pre-release testing.
     It is not recommended for production use.</p>-->
-    <p><b>Note:</b> This is a preliminary version of CLDR 37, intended for those wishing to do pre-release testing.
-    It is not recommended for production use.</p>
-    <!--<p><b>Note:</b> This is a pre-release candidate version of CLDR 37, intended for testing.
+    <!--<p><b>Note:</b> This is a preliminary version of CLDR 37, intended for those wishing to do pre-release testing.
     It is not recommended for production use.</p>-->
+    <p><b>Note:</b> This is a pre-release candidate version of CLDR 37, intended for testing.
+    It is not recommended for production use.</p>
     <!--<p>This is the final release version of CLDR 37.</p>-->
 
-    <p><strong>Important notes for CLDR 37 and later:</strong></p>
+    <p><strong>Important notes for CLDR 36 and later:</strong></p>
     <ul>
       <li>The CLDR repository has switched from subversion to git.</li>
       <li>Data in the main CLDR repository now includes some elements with the value “↑↑↑” indicating

diff --git a/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCheckCLDR.java b/tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCheckCLDR.java
@@ -289,21 +289,25 @@ public void TestFullErrors() {
     }
 
     public void TestAllLocales() {
-
         CheckCLDR test = CheckCLDR.getCheckAll(factory, INDIVIDUAL_TESTS);
         CheckCLDR.setDisplayInformation(english);
         Set<String> unique = new HashSet<String>();
-
         LanguageTagParser ltp = new LanguageTagParser();
-        int count = 0;
+        Set<String> locales = new HashSet<String>();
         for (String locale : getInclusion() <= 5 ? eightPointLocales : factory.getAvailable()) {
-            if (!ltp.set(locale).getRegion().isEmpty()) {
-                continue;
+            /*
+             * Only test locales without regions. E.g., test "pt", skip "pt_PT"
+             */
+            if (ltp.set(locale).getRegion().isEmpty()) {
+                locales.add(locale);
             }
-            checkLocale(test, locale, null, unique);
-            ++count;
         }
-        logln("Count:\t" + count);
+        // With ICU4J libs of 2020-03-23, using locales.parallelStream().forEach below
+        // hangs, or crashes with NPE. Likely an ICU4J issue, but we don't really need 
+        // parallelStream() here anyway since we are only handling around 35 locales.
+        // (And in fact this test seems faster without it)
+        locales.forEach(locale -> checkLocale(test, locale, null, unique));
+        logln("Count:\t" + locales.size());
     }
 
     public void TestA() {

diff --git a/tools/java/libs/icu4j-src.jar b/tools/java/libs/icu4j-src.jar
diff --git a/tools/java/libs/icu4j-version.txt b/tools/java/libs/icu4j-version.txt
@@ -1 +1 @@
-icu4j ed9ea2e7accc316d4086ac377f622ca90f2c016d 2020-02-16 (master, ICU 67 development)
+icu4j d7e40df284c2557e4ca1a4a7f36b9036b20a7627 2020-03-23 (master, ICU 67 development)
diff --git a/tools/java/libs/icu4j.jar b/tools/java/libs/icu4j.jar
diff --git a/tools/java/libs/utilities-src.jar b/tools/java/libs/utilities-src.jar
diff --git a/tools/java/libs/utilities.jar b/tools/java/libs/utilities.jar