jdk upgrade to 25 and gradle upgrade to 9.2 (#1995)

* kotlin version upgrade

Signed-off-by: Riya Saxena <[email protected]>

* kotlin version upgrade

Signed-off-by: Riya Saxena <[email protected]>

* jdk25 upgrade and gradle upgrade

Signed-off-by: Riya Saxena <[email protected]>

* jdk25 upgrade and gradle upgrade

Signed-off-by: Riya Saxena <[email protected]>

* jdk25 upgrade and gradle upgrade

Signed-off-by: Riya Saxena <[email protected]>

* jdk25 upgrade and gradle upgrade

Signed-off-by: Riya Saxena <[email protected]>

* jdk25 upgrade and gradle upgrade

Signed-off-by: Riya Saxena <[email protected]>

* jdk25 upgrade and gradle upgrade

Signed-off-by: Riya Saxena <[email protected]>

---------

Signed-off-by: Riya Saxena <[email protected]>

Author: riysaxen-amzn

.github/workflows/multi-node-test-workflow.yml

@@ -18,7 +18,7 @@ jobs:
     needs: Get-CI-Image-Tag
     strategy:
       matrix:
-        java: [ 21, 24 ]
+        java: [ 21, 25 ]
         os:
           - ubuntu-24.04-arm  # arm64-preview
           - ubuntu-24.04  # x64

.github/workflows/test-workflow.yml

@@ -20,7 +20,7 @@ jobs:
       # This setting says that all jobs should finish, even if one fails
       fail-fast: false
       matrix:
-        java: [ 21, 24 ]
+        java: [ 21, 25 ]
         os:
           - ubuntu-24.04-arm  # arm64-preview
           - ubuntu-24.04  # x64

build-tools/pkgbuild.gradle

@@ -8,7 +8,7 @@ afterEvaluate {
         version = "${project.version}" - "-SNAPSHOT"
 
         into '/usr/share/opensearch/plugins'
-        from(zipTree(bundlePlugin.archiveFile)) {
+        from(zipTree(bundlePlugin.archiveFile.get().asFile)) {
             into opensearchplugin.name
         }
 

build.gradle

@@ -55,13 +55,27 @@ apply plugin: 'jacoco'
 apply plugin: 'opensearch.java-agent'
 apply from: 'build-tools/merged-coverage.gradle'
 
+// Add explicit repository configuration for ktlint
+repositories {
+    mavenCentral()
+}
+
+// Configure ktlint with explicit repository
 configurations {
     ktlint {
-      resolutionStrategy {
-          force "ch.qos.logback:logback-classic:1.5.16"
-          force "ch.qos.logback:logback-core:1.5.16"
-      }
-   }
+        resolutionStrategy {
+            force "ch.qos.logback:logback-classic:1.5.16"
+            force "ch.qos.logback:logback-core:1.5.16"
+        }
+    }
+}
+
+// Add repository ONLY for ktlint resolution
+configurations.ktlint.incoming.beforeResolve {
+    repositories.clear()
+    repositories {
+        mavenCentral()
+    }
 }
 
 dependencies {
@@ -74,16 +88,26 @@ dependencies {
 
 task ktlint(type: JavaExec, group: "verification") {
     description = "Check Kotlin code style."
-    main = "com.pinterest.ktlint.Main"
+    mainClass = "com.pinterest.ktlint.Main"
     classpath = configurations.ktlint
     args "alerting/**/*.kt", "elastic-api/**/*.kt", "core/**/*.kt"
+    
+    // Skip on JDK 25
+    onlyIf {
+        JavaVersion.current() < JavaVersion.VERSION_25
+    }
 }
 
 task ktlintFormat(type: JavaExec, group: "formatting") {
     description = "Fix Kotlin code style deviations."
-    main = "com.pinterest.ktlint.Main"
+    mainClass = "com.pinterest.ktlint.Main"
     classpath = configurations.ktlint
     args "-F", "alerting/**/*.kt", "elastic-api/**/*.kt", "core/**/*.kt"
+    
+    // Skip on JDK 25 until ktlint fully supports it
+    onlyIf {
+        JavaVersion.current() < JavaVersion.VERSION_25
+    }
 }
 
 check.dependsOn ktlint

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=efe9a3d147d948d7528a9887fa35abcf24ca1a43ad06439996490f77569b02d1
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
+distributionSha256Sum=16f2b95838c1ddcf7242b1c39e7bbbb43c842f1f1a1a0dc4959b6d4d68abcac3
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME