From e296ac93b57b006e5d715269cd3831d8abc2a3c3 Mon Sep 17 00:00:00 2001
From: Mihai Nita <nmihai_2000@yahoo.com>
Date: Tue, 1 Apr 2025 13:25:15 -0700
Subject: [PATCH] ICU-23072 Support from JDK 11 and up - fix bad actions

---
 .github/workflows/icu_merge_ci.yml | 50 +++++++++++++++++++++++++-----
 1 file changed, 43 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/icu_merge_ci.yml b/.github/workflows/icu_merge_ci.yml
index 6e1e3bd72db..6d57e9f3f4e 100644
--- a/.github/workflows/icu_merge_ci.yml
+++ b/.github/workflows/icu_merge_ci.yml
@@ -27,16 +27,11 @@ env:
 permissions:
   contents: read
 
-# Using Java 11 because Java version not deemed significant for downloading artifacts,
-# and is the lowest version we support, so the cached artifacts can be used by any other version.
-uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
-  with:
-    distribution: 'temurin'
-    java-version: '11'
-
 jobs:
 
   # Initialize the Maven artifact cache
+  # Using Java 11 because Java version is not deemed significant for downloading artifacts,
+  # and is the lowest version we support, so the cached artifacts can be used by any other version.
   #
   # This job is created according to the cache strategy of reuse from a single job:
   # https://github.com/actions/cache/blob/main/caching-strategies.md#make-cache-read-only--reuse-cache-from-centralized-job
@@ -54,6 +49,10 @@ jobs:
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+        with:
+          distribution: 'temurin'
+          java-version: '11'
       # Download all of the artifacts needed for the code and build plugins
       - name: Download all artifacts
         run: |
@@ -79,6 +78,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
           lookup-only: true
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+        with:
+          distribution: 'temurin'
+          java-version: '11'
       - name: ICU4J little-endian
         run: |
           cd icu4c/source;
@@ -339,6 +342,11 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
           lookup-only: true
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
       - name: Build and run unicodesetperf test
         run: |
           cd icu4j;
@@ -348,6 +356,7 @@ jobs:
           mkdir -p perf/results/j_unicodesetperf/${{ matrix.perf }};
           mvn dependency:copy-dependencies
           java -cp ./target/*:./target/dependency/* com.ibm.icu.dev.test.perf.UnicodeSetPerf ${{ matrix.perf }} -a -t 2 -p 4 [:Lt:] | tee perf/results/j_unicodesetperf/${{ matrix.perf }}/output.txt
+
       - name: Store performance test results
         uses: gregtatum/github-action-benchmark@d3f06f738e9612988d575db23fae5ca0008d3d12
         with:
@@ -391,6 +400,11 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
           lookup-only: true
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
       - name: Build and run ucharacterperf test
         run: |
           cd icu4j;
@@ -399,6 +413,7 @@ jobs:
           mkdir -p perf/results/j_ucharacterperf;
           mvn dependency:copy-dependencies
           java -cp ./target/*:./target/dependency/* com.ibm.icu.dev.test.perf.UCharacterPerf -a -t 2 -p 4 0 ffff | tee perf/results/j_ucharacterperf/output.txt
+
       - name: Store performance test results
         uses: gregtatum/github-action-benchmark@d3f06f738e9612988d575db23fae5ca0008d3d12
         with:
@@ -445,6 +460,11 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
           lookup-only: true
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
       - name: Build and run decimalformatperf
         run: |
           cd icu4j;
@@ -457,6 +477,7 @@ jobs:
           sleep $(($RANDOM % 180));
           mvn dependency:copy-dependencies
           java -cp ./target/*:./target/dependency/* com.ibm.icu.dev.test.perf.DecimalFormatPerformanceTest ${{ matrix.perf }} -a -t 2 -p 4 -L ${{ matrix.locale }} "#,###.##" "1.234,56" -r 1 | tee perf/results/j_decimalformatperf/${{ matrix.locale }}/${{ matrix.perf }}/output.txt
+
       - name: Store performance test results
         uses: gregtatum/github-action-benchmark@d3f06f738e9612988d575db23fae5ca0008d3d12
         with:
@@ -504,6 +525,11 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
           lookup-only: true
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
       - name: Build and run normperf
         env:
           DATA_FILE_PATH: data/collation
@@ -634,6 +660,11 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
           lookup-only: true
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
       - name: Build and run converterperf
         env:
           DATA_FILE_PATH: data/conversion
@@ -708,6 +739,11 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
           lookup-only: true
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
       - name: Extract identifying digit and parameter.
         run: |
           ddir='${{ matrix.parms }}';