ICU-22369 Merge maint/maint-73 into main (#2437)

.github/workflows/icu_ci.yml

@@ -30,8 +30,12 @@ jobs:
            # Regex note: (?! ... ) is a negative lookahead. Succeed if the pattern is not present. 
           set +o pipefail && make doc 2>&1 | tee doxygen.log && ( ! grep -P 'warning:(?! .* file .?Doxyfile)' doxygen.log )
 
-  # Java8 ICU4J build and unit test
-  java8-icu4j-build-and-test:
+  # ICU4J build and unit test using Ant
+  icu4j-ant-build-and-test:
+    strategy:
+      fail-fast: false
+      matrix:
+        java-version: [ '8', '11', '17' ]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout and setup
@@ -43,7 +47,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '8'
+          java-version: ${{ matrix.java-version }}
       - name: ICU4J
         run: |
           cd icu4j;
@@ -55,7 +59,7 @@ jobs:
           [ -d icu4j/out/junit-results ] && cd icu4j && cat `find out/junit-results -name "*.txt" -exec grep -l FAILED {} \;`;
         if: ${{ failure() }}
 
-  # Java8 ICU4J build and unit tests using Maven
+  # ICU4J build and unit tests using Maven
   # https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
 
   # Run `test` to execute unit tests and ensure it is possible for tests to run even without packaging submodule
@@ -70,7 +74,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [ '8', '11' ]
+        java-version: [ '8', '11', '17' ]
     steps:
       - name: Checkout and setup
         uses: actions/checkout@v2
@@ -95,7 +99,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [ '8', '11' ]
+        java-version: [ '8', '11', '17' ]
     steps:
       - name: Checkout and setup
         uses: actions/checkout@v2
@@ -116,56 +120,6 @@ jobs:
           cd icu4j/maven-build;
           mvn --batch-mode verify
 
-  # ICU4J build and unit test under Java11
-  java11-icu4j-build-and-test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout and setup
-        uses: actions/checkout@v2
-        with:
-          lfs: true
-      - name: Checkout lfs objects
-        run: git lfs pull
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '11'
-      - name: ICU4J
-        run: |
-          cd icu4j;
-          ant init;
-          ant check;
-          ant localespiCheck
-      - name: List failures (if any)
-        run: |
-          [ -d icu4j/out/junit-results ] && cd icu4j && cat `find out/junit-results -name "*.txt" -exec grep -l FAILED {} \;`;
-        if: ${{ failure() }}
-
-  # ICU4J build and unit test under Java16
-  java16-icu4j-build-and-test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout and setup
-        uses: actions/checkout@v2
-        with:
-          lfs: true
-      - name: Checkout lfs objects
-        run: git lfs pull
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '16'
-      - name: ICU4J
-        run: |
-          cd icu4j;
-          ant init;
-          ant check;
-          ant localespiCheck
-      - name: List failures (if any)
-        run: |
-          [ -d icu4j/out/junit-results ] && cd icu4j && cat `find out/junit-results -name "*.txt" -exec grep -l FAILED {} \;`;
-        if: ${{ failure() }}
-
   # ICU4J build and unit test under lstm
   lstm-icu4j-build-and-test:
     runs-on: ubuntu-latest

docs/processes/release/tasks/docs.md

@@ -326,6 +326,9 @@ javadoc files. Create icu4c-X_X_X-docs.zip
     `cd <path>/icu4c/source/doc/html/`
 4.  Create a zip file, e.g.,<br>
     `tar cvfz /tmp/icu4c72rc.tar.gz * # Note: label the file apropriately for the release.
+5.  Edit [README.md in icu-docs](https://github.com/unicode-org/icu-docs/blob/main/README.md).
+6.  Update the table under "API docs" at the top of README.md with the new version in column "C" in row "Dev" for the release candidate or "Released" for the final release.
+7.  Add the updated README.md to the pull request with the new API documentation.
 
 
 #### Create a PR for ICU4C docs using the docs zip file
@@ -396,6 +399,11 @@ See [Upload API documentations](docs.md#upload-api-documentations) below for how
 See <https://unicode-org.github.io/icu-docs/HOWTO-Update.html> for instructions
 to upload to <https://unicode-org.github.io/icu-docs/>
 
+#### Update table of API docs:
+1. Edit [README.md in icu-docs](https://github.com/unicode-org/icu-docs/blob/main/README.md).
+2. Update the table under "API docs" at the top of README.md with the new version in column "J" in row "Dev" for the release candidate or "Released" for the final release.
+3. Add the updated README.md to the pull request with the new API documentation.
+
 ### Update the Readme.html for GA
 
 If there are any last second changes:

icu4c/source/common/propname.cpp

@@ -289,7 +289,10 @@ U_NAMESPACE_END
 
 U_CAPI const char* U_EXPORT2
 u_getPropertyName(UProperty property,
-                  UPropertyNameChoice nameChoice) {
+                  UPropertyNameChoice nameChoice) UPRV_NO_SANITIZE_UNDEFINED {
+    // The nameChoice is really an integer with a couple of named constants.
+    // Unicode allows for names other than short and long ones.
+    // If present, these will be returned for U_LONG_PROPERTY_NAME + i, where i=1, 2,...
     U_NAMESPACE_USE
     return PropNameData::getPropertyName(property, nameChoice);
 }
@@ -304,9 +307,9 @@ U_CAPI const char* U_EXPORT2
 u_getPropertyValueName(UProperty property,
                        int32_t value,
                        UPropertyNameChoice nameChoice) UPRV_NO_SANITIZE_UNDEFINED {
-    if (nameChoice < 0 || U_PROPERTY_NAME_CHOICE_COUNT <= nameChoice) {
-       return nullptr;
-    }
+    // The nameChoice is really an integer with a couple of named constants.
+    // Unicode allows for names other than short and long ones.
+    // If present, these will be returned for U_LONG_PROPERTY_NAME + i, where i=1, 2,...
     U_NAMESPACE_USE
     return PropNameData::getPropertyValueName(property, value, nameChoice);
 }

icu4c/source/data/cldr-icu-readme.txt

@@ -131,6 +131,7 @@ export ANT_OPTS="-Xmx4096m"
 # CLDR_DIR=`cygpath -wp /build/cldr`
 
 export CLDR_DIR=$HOME/cldr-myfork
+export CLDR_TMP_DIR=$HOME/cldr-staging
 
 # 1c. ICU variables
 
@@ -204,6 +205,12 @@ ant cleanprod
 ant setup
 ant proddata 2>&1 | tee $NOTES/cldr-newData-proddataLog.txt
 
+#---
+# Note, for CLDR development, at this point tests are sometimes run on the production
+# data, see:
+# https://cldr.unicode.org/development/cldr-big-red-switch/brs-run-tests-on-production-data
+#---
+
 # 5b. Build the new ICU4C data files; these include .txt files and .py files.
 # These new files will replace whatever was already present in the ICU4C sources.
 # This process uses the LdmlConverter in $TOOLS_ROOT/cldr/cldr-to-icu/;
@@ -363,8 +370,8 @@ git status
 # commit
 
 # 16. For an official CLDR data integration into ICU, now tag the CLDR and
-# ICU sources with an appropriate CLDR milestone (you can check previous
-# tags for format), e.g.:
+# possibly the ICU sources with an appropriate CLDR milestone (you can check
+# previous tags for format), e.g.:
 
 cd $CLDR_DIR
 git tag ...
@@ -383,5 +390,13 @@ cd $CLDR_TMP_DIR
 git tag ...
 git push --tags
 
+# 18. You should publish the cldr and cldr-staging tags in github. For cldr, go to
+# https://github.com/unicode-org/cldr/tags and click on the tag you just created.
+# Click on the "Create release from tag" button at the upper right. Set release
+# title to be the same as the tag. Click the checkbox for "Set as a pre-release" for
+# all but the final release. For the description, see what was done for earlier tags.
+# When you are all ready, click the "Publish release" button.
+
+
 
 

icu4c/source/data/curr/supplementalData.txt

@@ -3784,8 +3784,8 @@ supplementalData:table(nofallback){
                 }
                 id{"SLL"}
                 to:intvector{
-                    391,
-                    974987263,
+                    396,
+                    -1034816513,
                 }
             }
             {

icu4c/source/data/locales/he.txt

@@ -17,7 +17,7 @@ he{
     ExemplarCharacters{"[א ב ג ד ה ו ז ח ט י כ ך ל מ ם נ ן ס ע פ ף צ ץ ק ר ש ת]"}
     ExemplarCharactersIndex{"[א ב ג ד ה ו ז ח ט י כ ל מ נ ס ע פ צ ק ר ש ת]"}
     ExemplarCharactersNumbers{"[\u200E \\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"}
-    ExemplarCharactersPunctuation{"[\\- ‐ ‑ – — , ; \\: ! ? . ' \u0022 ( ) \\[ \\] / ־ ׳ ״]"}
+    ExemplarCharactersPunctuation{"[\\- ‐ ‑ – — , ; \\: ! ? . ' ׳ \u0022 ״ ( ) \\[ \\] / ־]"}
     MoreInformation{"?"}
     NumberElements{
         adlm{