Update CCR with gradle 8.10.2 and support JDK23 (#1496)

* Update CCR with gradle 8.10.2 and support JDK23 Signed-off-by: Peter Zhu <[email protected]> * Update bwc.yml Signed-off-by: Peter Zhu <[email protected]> * Remove dco workflow as it is replaced with dco app Signed-off-by: Peter Zhu <[email protected]> * Update runner name Signed-off-by: Peter Zhu <[email protected]> --------- Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Feb 11, 2025 · 47691b1 · 47691b1
1 parent 1c019e6
commit 47691b1
Show file tree

Hide file tree

Showing 8 changed files with 301 additions and 233 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -18,7 +18,7 @@ jobs:
   build-test-linux:
     strategy:
       matrix:
-        java: [21]
+        java: [21, 23]
 
     name: Build CCR Plugin on Linux using Container Image
     runs-on: ubuntu-latest

diff --git a/.github/workflows/bwc.yml b/.github/workflows/bwc.yml
@@ -13,12 +13,15 @@ jobs:
     # Job name
     name: Run BWC Test
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [21, 23]
     steps:
       # This step uses the setup-java Github action: https://github.com/actions/setup-java
-      - name: Set Up JDK 21
+      - name: Set Up JDK ${{ matrix.java }}
         uses: actions/setup-java@v1
         with:
-          java-version: 21
+          java-version: ${{ matrix.java }}
       # This step uses the checkout Github action: https://github.com/actions/checkout
       - name: Checkout Branch
         uses: actions/checkout@v4

diff --git a/.github/workflows/dco-check.yml b/.github/workflows/dco-check.yml
diff --git a/.github/workflows/security-knn-tests.yml b/.github/workflows/security-knn-tests.yml
@@ -55,6 +55,9 @@ jobs:
     if: ${{ 'True' == needs.req.outputs.isSecurityPluginAvailable }}
     # Job name
     name: Build and Run Security tests
+    strategy:
+      matrix:
+        java: [21, 23]
     runs-on: ubuntu-latest
     container:
       # using the same image which is used by opensearch-build team to build the OpenSearch Distribution
@@ -67,10 +70,10 @@ jobs:
       - name: Run start commands
         run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }}
       # This step uses the setup-java Github action: https://github.com/actions/setup-java
-      - name: Set Up JDK 21
+      - name: Set Up JDK ${{ matrix.java }}
         uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: ${{ matrix.java }}
           distribution: 'temurin'
       # This step uses the checkout Github action: https://github.com/actions/checkout
       - name: Checkout Branch
@@ -103,6 +106,9 @@ jobs:
     if: ${{ 'True' == needs.req.outputs.isKnnPluginAvailable }}
     # Job name
     name: Build and Run Knn tests
+    strategy:
+      matrix:
+        java: [21, 23]
     runs-on: ubuntu-latest
     container:
       # using the same image which is used by opensearch-build team to build the OpenSearch Distribution
@@ -115,10 +121,10 @@ jobs:
       - name: Run start commands
         run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }}
       # This step uses the setup-java Github action: https://github.com/actions/setup-java
-      - name: Set Up JDK 21
+      - name: Set Up JDK ${{ matrix.java }}
         uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: ${{ matrix.java }}
           distribution: 'temurin'
       # This step uses the checkout Github action: https://github.com/actions/checkout
       - name: Checkout Branch

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,16 +1,8 @@
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# The OpenSearch Contributors require contributions made to
-# this file be licensed under the Apache-2.0 license or a
-# compatible open source license.
-#
-# Modifications Copyright OpenSearch Contributors. See
-# GitHub history for details.
-#
-
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionSha256Sum=2ab88d6de2c23e6adae7363ae6e29cbdd2a709e992929b48b6530fd0c7133bd6
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists