From: Frank Tang <ftang@chromium.org>
Date: Tue, 18 May 2021 21:12:34 +0000 (-0700)
Subject: ICU-21626 Add CIs to build/test Java 16.
X-Git-Tag: cldr/2021-06-15~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d7b003a4ea5a407bd4be364caeb5947137ad6a7;p=icu

ICU-21626 Add CIs to build/test Java 16.
---

diff --git a/.github/workflows/icu_ci.yml b/.github/workflows/icu_ci.yml
index 967f1460f2c..628d5db04b7 100644
--- a/.github/workflows/icu_ci.yml
+++ b/.github/workflows/icu_ci.yml
@@ -30,8 +30,8 @@ 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 )
 
-  # ICU4J build and unit test
-  icu4j-build-and-test:
+  # ICU4J build and unit test under Java11
+  java11-icu4j-build-and-test:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout and setup
@@ -53,6 +53,29 @@ jobs:
           [ -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@v1
+        with:
+          java-version: '16'
+      - name: ICU4J
+        run: |
+          cd icu4j;
+          ant init;
+          ant check;
+      - 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
diff --git a/icu4j/build.xml b/icu4j/build.xml
index c430d1f1f47..253da341312 100644
--- a/icu4j/build.xml
+++ b/icu4j/build.xml
@@ -110,6 +110,34 @@
         <matches string="${java.version}" pattern="12((-.|\.\d).*)?"/>
     </condition>
 
+    <condition property="is.java13">
+        <matches string="${java.version}" pattern="13((-.|\.\d).*)?"/>
+    </condition>
+
+    <condition property="is.java14">
+        <matches string="${java.version}" pattern="14((-.|\.\d).*)?"/>
+    </condition>
+
+    <condition property="is.java15">
+        <matches string="${java.version}" pattern="15((-.|\.\d).*)?"/>
+    </condition>
+
+    <condition property="is.java16">
+        <matches string="${java.version}" pattern="16((-.|\.\d).*)?"/>
+    </condition>
+
+    <condition property="is.java17">
+        <matches string="${java.version}" pattern="17((-.|\.\d).*)?"/>
+    </condition>
+
+    <condition property="is.java18">
+        <matches string="${java.version}" pattern="18((-.|\.\d).*)?"/>
+    </condition>
+
+    <condition property="is.java19">
+        <matches string="${java.version}" pattern="19((-.|\.\d).*)?"/>
+    </condition>
+
     <condition property="is.java8.plus">
         <or>
             <isset property="is.java8"/>
@@ -117,6 +145,13 @@
             <isset property="is.java10"/>
             <isset property="is.java11"/>
             <isset property="is.java12"/>
+            <isset property="is.java13"/>
+            <isset property="is.java14"/>
+            <isset property="is.java15"/>
+            <isset property="is.java16"/>
+            <isset property="is.java17"/>
+            <isset property="is.java18"/>
+            <isset property="is.java19"/>
         </or>
     </condition>