Get ready for OpenSearch 3.0.0 baseline (#1397)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
opensearch-project · Feb 2, 2025 · 7c6f8f5 · 7c6f8f5
1 parent 786e58d
commit 7c6f8f5
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 37 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [ 11, 17, 21 ]
+        java: [ 21 ]
         os: [ubuntu-latest, windows-latest, macOS-13, macOS-latest]
     steps:
       - name: Checkout Java Client

diff --git a/.github/workflows/code-generation.yml b/.github/workflows/code-generation.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 21
           distribution: 'temurin'
           cache: 'gradle'
 
@@ -53,7 +53,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 21
           distribution: 'temurin'
           cache: 'gradle'
 

diff --git a/.github/workflows/publish-snapshots.yml b/.github/workflows/publish-snapshots.yml
@@ -14,10 +14,10 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'temurin'
           cache: 'gradle'
       - name: Configure AWS credentials

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -24,10 +24,10 @@ jobs:
           issue-title: 'Release opensearch-java : ${{ steps.get_data.outputs.version }}'
           issue-body: "Please approve or deny the release of opensearch-java. **VERSION**: ${{ steps.get_data.outputs.version }} **TAG**: ${{ github.ref_name }}  **COMMIT**: ${{ github.sha }}"
           exclude-workflow-initiator-as-approver: true
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'temurin'
           cache: 'gradle'
       - name: Build with Gradle

diff --git a/.github/workflows/test-integration-unreleased.yml b/.github/workflows/test-integration-unreleased.yml
@@ -15,14 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         entry:
-          - { opensearch_ref: '1.x', java: 11 }
-          # See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
-          - { opensearch_ref: '2.x', java: 11, gradle-runtime: 17 }
-          - { opensearch_ref: '2.x', java: 17 }
+          - { opensearch_ref: '1.x', java: 21 }
           - { opensearch_ref: '2.x', java: 21 }
-          # See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
-          - { opensearch_ref: 'main', java: 11, gradle-runtime: 17 }
-          - { opensearch_ref: 'main', java: 17 }
           - { opensearch_ref: 'main', java: 21 }
     steps:
       - name: Set up JDK ${{ matrix.entry.java }}

diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -9,24 +9,24 @@ jobs:
       fail-fast: false
       matrix:
         entry:
-          - { opensearch_version: 1.0.1, java: 11 }
-          - { opensearch_version: 1.1.0, java: 11 }
-          - { opensearch_version: 1.2.4, java: 11 }
-          - { opensearch_version: 1.3.13, java: 11 }
-          - { opensearch_version: 2.0.1, java: 11 }
-          - { opensearch_version: 2.1.0, java: 11 }
-          - { opensearch_version: 2.2.1, java: 11 }
-          - { opensearch_version: 2.3.0, java: 11 }
-          - { opensearch_version: 2.4.1, java: 11 }
-          - { opensearch_version: 2.5.0, java: 11 }
-          - { opensearch_version: 2.6.0, java: 11 }
-          - { opensearch_version: 2.7.0, java: 11 }
-          - { opensearch_version: 2.8.0, java: 11 }
-          - { opensearch_version: 2.9.0, java: 11 }
-          - { opensearch_version: 2.10.0, java: 11 }
-          - { opensearch_version: 2.11.1, java: 11 }
-          - { opensearch_version: 2.12.0, java: 11 }
-          - { opensearch_version: 2.13.0, java: 11 }
+          - { opensearch_version: 1.0.1, java: 21 }
+          - { opensearch_version: 1.1.0, java: 21 }
+          - { opensearch_version: 1.2.4, java: 21 }
+          - { opensearch_version: 1.3.13, java: 21 }
+          - { opensearch_version: 2.0.1, java: 21 }
+          - { opensearch_version: 2.1.0, java: 21 }
+          - { opensearch_version: 2.2.1, java: 21 }
+          - { opensearch_version: 2.3.0, java: 21 }
+          - { opensearch_version: 2.4.1, java: 21 }
+          - { opensearch_version: 2.5.0, java: 21 }
+          - { opensearch_version: 2.6.0, java: 21 }
+          - { opensearch_version: 2.7.0, java: 21 }
+          - { opensearch_version: 2.8.0, java: 21 }
+          - { opensearch_version: 2.9.0, java: 21 }
+          - { opensearch_version: 2.10.0, java: 21 }
+          - { opensearch_version: 2.11.1, java: 21 }
+          - { opensearch_version: 2.12.0, java: 21 }
+          - { opensearch_version: 2.13.0, java: 21 }
     steps:
       - name: Checkout Java Client
         uses: actions/checkout@v4

diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [ 11, 17, 21 ]
+        java: [ 21 ]
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
       - name: Checkout Java Client
@@ -47,10 +47,10 @@ jobs:
           distribution: temurin
           cache: gradle
 
-      - name: Set up JDK 11 (Tools)
+      - name: Set up JDK 21 (Tools)
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 21
           distribution: temurin
           cache: gradle
 

diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts
@@ -43,7 +43,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        "classpath"(group = "org.opensearch.gradle", name = "build-tools", version = "3.0.0-SNAPSHOT")
+        "classpath"(group = "org.opensearch.gradle", name = "build-tools", version = "3.0.0-alpha1-SNAPSHOT")
     }
 }
 

diff --git a/java-codegen/build.gradle.kts b/java-codegen/build.gradle.kts
@@ -24,7 +24,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        "classpath"(group = "org.opensearch.gradle", name = "build-tools", version = "3.0.0-SNAPSHOT")
+        "classpath"(group = "org.opensearch.gradle", name = "build-tools", version = "3.0.0-alpha1-SNAPSHOT")
     }
 }