[3.4.0] Bump Gradle to 9.2.0 and GitHub Action JDK to 25 (opensearch-project#4824)

* [3.4.0] Bump Gradle to 9.2.0 and GitHub Action JDK to 25

Signed-off-by: Lantao Jin <ltjin@amazon.com>

* fix UT

Signed-off-by: Lantao Jin <ltjin@amazon.com>

* fix SpotlessCheck issue

Signed-off-by: Lantao Jin <ltjin@amazon.com>

---------

Signed-off-by: Lantao Jin <ltjin@amazon.com>

Author: LantaoJin

.github/workflows/integ-tests-with-security.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [21, 24]
+        java: [21, 25]
     runs-on: ubuntu-latest
     container:
       # using the same image which is used by opensearch-build team to build the OpenSearch Distribution
@@ -63,7 +63,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ windows-latest, macos-14 ]
-        java: [21, 24]
+        java: [21, 25]
 
     runs-on: ${{ matrix.os }}
 

.github/workflows/sql-pitest.yml

@@ -20,7 +20,7 @@ jobs:
     needs: Get-CI-Image-Tag
     strategy:
       matrix:
-        java: [21, 24]
+        java: [21, 25]
     runs-on: ubuntu-latest
     container:
       # using the same image which is used by opensearch-build team to build the OpenSearch Distribution

.github/workflows/sql-test-and-build-workflow.yml

@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [21, 24]
+        java: [21, 25]
         test-type: ['unit', 'integration', 'doc']
     runs-on: ubuntu-latest
     container:
@@ -106,16 +106,16 @@ jobs:
       matrix:
         entry:
           - { os: windows-latest, java: 21, os_build_args: -PbuildPlatform=windows }
-          - { os: windows-latest, java: 24, os_build_args: -PbuildPlatform=windows }
+          - { os: windows-latest, java: 25, os_build_args: -PbuildPlatform=windows }
           - { os: macos-14, java: 21, os_build_args: '' }
-          - { os: macos-14, java: 24, os_build_args: '' }
+          - { os: macos-14, java: 25, os_build_args: '' }
         test-type: ['unit', 'integration', 'doc']
         exclude:
           # Exclude doctest for Windows
           - test-type: doc
             entry: { os: windows-latest, java: 21, os_build_args: -PbuildPlatform=windows }
           - test-type: doc
-            entry: { os: windows-latest, java: 24, os_build_args: -PbuildPlatform=windows }
+            entry: { os: windows-latest, java: 25, os_build_args: -PbuildPlatform=windows }
     runs-on: ${{ matrix.entry.os }}
 
     steps:
@@ -184,7 +184,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [21, 24]
+        java: [21, 25]
     container:
       image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
       options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }}
@@ -230,7 +230,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [21, 24]
+        java: [21, 25]
     container:
       image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
       options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }}

.github/workflows/sql-test-workflow.yml

@@ -20,7 +20,7 @@ jobs:
     needs: Get-CI-Image-Tag
     strategy:
       matrix:
-        java: [21, 24]
+        java: [21, 25]
     runs-on: ubuntu-latest
     container:
       # using the same image which is used by opensearch-build team to build the OpenSearch Distribution

api/build.gradle

@@ -28,7 +28,7 @@ spotless {
         removeUnusedImports()
         trimTrailingWhitespace()
         endWithNewline()
-        googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
+        googleJavaFormat('1.32.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
     }
 }
 

async-query-core/build.gradle

@@ -80,7 +80,7 @@ spotless {
         removeUnusedImports()
         trimTrailingWhitespace()
         endWithNewline()
-        googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
+        googleJavaFormat('1.32.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
     }
 }
 

async-query/build.gradle

@@ -95,12 +95,22 @@ jacocoTestCoverageVerification {
         rule {
             element = 'CLASS'
             excludes = [
+                    'org.opensearch.sql.spark.asyncquery.OpenSearchAsyncQueryJobMetadataStorageService',
                     'org.opensearch.sql.spark.cluster.ClusterManagerEventListener*',
                     'org.opensearch.sql.spark.cluster.FlintIndexRetention',
+                    'org.opensearch.sql.spark.cluster.FlintStreamingJobHouseKeeperTask',
                     'org.opensearch.sql.spark.cluster.IndexCleanup',
+                    'org.opensearch.sql.spark.config.OpenSearchSparkSubmitParameterModifier',
+                    'org.opensearch.sql.spark.execution.session.*',
+                    'org.opensearch.sql.spark.execution.statement.*',
                     // ignore because XContext IOException
                     'org.opensearch.sql.spark.execution.statestore.StateStore',
+                    'org.opensearch.sql.spark.execution.statestore.OpenSearchStatementStorageService',
+                    'org.opensearch.sql.spark.execution.statestore.OpenSearchSessionStorageService',
+                    'org.opensearch.sql.spark.flint.*',
+                    'org.opensearch.sql.spark.metrics.OpenSearchMetricsService',
                     'org.opensearch.sql.spark.rest.*',
+                    'org.opensearch.sql.spark.response.OpenSearchJobExecutionResponseReader',
                     'org.opensearch.sql.spark.scheduler.parser.OpenSearchScheduleQueryJobRequestParser',
                     'org.opensearch.sql.spark.transport.model.*'
             ]

benchmarks/build.gradle

@@ -5,7 +5,7 @@
 
 plugins {
     id 'java-library'
-    id "me.champeau.jmh" version "0.6.8"
+    id "me.champeau.jmh" version "0.7.3"
 }
 
 repositories {

build.gradle

@@ -80,7 +80,7 @@ plugins {
     id 'java-library'
     id "io.freefair.lombok" version "8.14"
     id 'jacoco'
-    id 'com.diffplug.spotless' version '7.2.1'
+    id 'com.diffplug.spotless' version '8.1.0'
 }
 
 // import versions defined in https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchJavaPlugin.java#L94
@@ -113,7 +113,7 @@ spotless {
         removeUnusedImports()
         trimTrailingWhitespace()
         endWithNewline()
-        googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
+        googleJavaFormat('1.32.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
     }
 }
 
@@ -128,8 +128,16 @@ allprojects {
     }
 
     plugins.withId('java') {
-        sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21
+        java {
+            sourceCompatibility = JavaVersion.VERSION_21
+            targetCompatibility = JavaVersion.VERSION_21
+        }
+    }
+
+    tasks.withType(Test) {
+        jvmArgs '-Dnet.bytebuddy.experimental=true'
     }
+
     configurations.all {
         resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib:1.9.10"
         resolutionStrategy.force "net.minidev:json-smart:${versions.json_smart}"

common/build.gradle

@@ -80,6 +80,6 @@ spotless {
         removeUnusedImports()
         trimTrailingWhitespace()
         endWithNewline()
-        googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
+        googleJavaFormat('1.32.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
     }
 }