Upgrade to gradle 9.2 and run CI with JDK 25 (#5786)

cwperks · web-flow · commit d6daaee7164c · 2025-11-11T12:55:25.000-05:00
Signed-off-by: Craig Perkins &lt;cwperx@amazon.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -45,7 +45,7 @@ jobs:
       matrix:
         gradle_task: ${{ fromJson(needs.generate-test-list.outputs.separateTestsNames) }}
         platform: [windows-latest]
-        jdk: [21, 24]
+        jdk: [21, 25]
     runs-on: ${{ matrix.platform }}
 
     steps:
@@ -80,7 +80,7 @@ jobs:
       matrix:
         gradle_task: ${{ fromJson(needs.generate-test-list.outputs.separateTestsNames) }}
         platform: [ubuntu-latest]
-        jdk: [21, 24]
+        jdk: [21, 25]
     runs-on: ubuntu-latest
     container:
       # using the same image which is used by opensearch-build to build the OpenSearch Distribution
@@ -144,7 +144,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: [21, 24]
+        jdk: [21, 25]
         platform: [windows-latest]
     runs-on: ${{ matrix.platform }}
 
@@ -178,7 +178,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: [21, 24]
+        jdk: [21, 25]
         platform: [ubuntu-latest]
     runs-on: ubuntu-latest
     container:
@@ -221,7 +221,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: [21,24]
+        jdk: [21, 25]
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
     container:
@@ -262,7 +262,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: [21, 24]
+        jdk: [21, 25]
         platform: [windows-latest]
     runs-on: ${{ matrix.platform }}
 
@@ -295,7 +295,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: [21, 24]
+        jdk: [21, 25]
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
 
@@ -338,7 +338,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: [11, 17]
+        jdk: [21]
         platform: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
 
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: [21, 24]
+        jdk: [21, 25]
         test-run: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
 
     steps:
diff --git a/.github/workflows/plugin_install.yml b/.github/workflows/plugin_install.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        jdk: [21, 24]
+        jdk: [21, 25]
     runs-on: ${{ matrix.os }}
 
     steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -59,6 +59,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `org.apache.ws.xmlschema:xmlschema-core` from 2.3.1 to 2.3.2 ([#5781](https://github.com/opensearch-project/security/pull/5781))
 - Bump `commons-io:commons-io` from 2.20.0 to 2.21.0 ([#5780](https://github.com/opensearch-project/security/pull/5780))
 - Bump `com.nimbusds:nimbus-jose-jwt` from 10.5 to 10.6 ([#5782](https://github.com/opensearch-project/security/pull/5782))
+- Upgrade to gradle 9.2 and run CI with JDK 25 ([#5786](https://github.com/opensearch-project/security/pull/5786))
 
 ### Documentation
 
diff --git a/build.gradle b/build.gradle
@@ -449,6 +449,29 @@ bundlePlugin {
     }
 }
 
+//create source set 'integrationTest'
+//add classes from the main source set to the compilation and runtime classpaths of the integrationTest
+sourceSets {
+    integrationTest {
+        java {
+            srcDir file ('src/integrationTest/java')
+            compileClasspath += sourceSets.main.output
+            runtimeClasspath += sourceSets.main.output
+        }
+        resources {
+            srcDir file('src/integrationTest/resources')
+        }
+        processIntegrationTestResources {
+            duplicatesStrategy(DuplicatesStrategy.INCLUDE)
+        }
+    }
+}
+
+configurations {
+    integrationTestImplementation.extendsFrom implementation
+    integrationTestRuntimeOnly.extendsFrom runtimeOnly
+}
+
 configurations {
     all {
         resolutionStrategy {
@@ -497,9 +520,24 @@ configurations {
             force "com.google.guava:failureaccess:1.0.3"
         }
     }
+}
 
-    integrationTestImplementation.extendsFrom implementation
-    integrationTestRuntimeOnly.extendsFrom runtimeOnly
+subprojects {
+    plugins.withId('java') {
+        dependencies {
+            testImplementation 'org.hamcrest:hamcrest:2.2'
+            testImplementation 'junit:junit:4.13.2'
+            testImplementation "org.opensearch:opensearch:${opensearch_version}"
+            testImplementation "org.mockito:mockito-core:5.20.0"
+        }
+
+        afterEvaluate {
+            if (project.configurations.findByName('integrationTestImplementation')) {
+                configurations.integrationTestImplementation.extendsFrom configurations.implementation
+                configurations.integrationTestRuntimeOnly.extendsFrom configurations.runtimeOnly
+            }
+        }
+    }
 }
 
 allprojects {
@@ -513,87 +551,62 @@ allprojects {
         maven { url "build.shibboleth.net/maven/releases"}
     }
 
-    configurations {
-        integrationTestImplementation.extendsFrom implementation
-        compile.extendsFrom compileOnly
-        compile.extendsFrom testImplementation
-    }
-    dependencies {
-        // unit test framework
-        testImplementation 'org.hamcrest:hamcrest:2.2'
-        testImplementation 'junit:junit:4.13.2'
-        testImplementation "org.opensearch:opensearch:${opensearch_version}"
-        testImplementation "org.mockito:mockito-core:5.20.0"
-
-        //integration test framework:
-        integrationTestImplementation('com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.3') {
-            exclude(group: 'junit', module: 'junit')
-        }
-        integrationTestImplementation 'junit:junit:4.13.2'
-        integrationTestImplementation("org.opensearch.plugin:reindex-client:${opensearch_version}"){
-            exclude(group: 'org.slf4j', module: 'slf4j-api')
-        }
-        integrationTestImplementation "org.opensearch:protobufs:${versions.opensearchprotobufs}"
-        integrationTestImplementation "io.grpc:grpc-stub:${versions.grpc}"
-        integrationTestImplementation "io.grpc:grpc-netty-shaded:${versions.grpc}"
-        integrationTestImplementation "org.opensearch.plugin:transport-grpc:${opensearch_version}"
-        integrationTestImplementation "org.opensearch.plugin:percolator-client:${opensearch_version}"
-        integrationTestImplementation 'commons-io:commons-io:2.21.0'
-        integrationTestImplementation "org.apache.logging.log4j:log4j-core:${versions.log4j}"
-        integrationTestImplementation "org.apache.logging.log4j:log4j-jul:${versions.log4j}"
-        integrationTestImplementation 'org.hamcrest:hamcrest:2.2'
-        integrationTestImplementation "org.bouncycastle:bc-fips:${versions.bouncycastle_jce}"
-        integrationTestImplementation "org.bouncycastle:bcpkix-fips:${versions.bouncycastle_pkix}"
-        integrationTestImplementation "org.bouncycastle:bcutil-fips:${versions.bouncycastle_util}"
-        integrationTestImplementation('org.awaitility:awaitility:4.3.0') {
-            exclude(group: 'org.hamcrest', module: 'hamcrest')
-        }
-        integrationTestImplementation 'com.unboundid:unboundid-ldapsdk:4.0.14'
-        integrationTestImplementation "org.opensearch.plugin:mapper-size:${opensearch_version}"
-        integrationTestImplementation "org.apache.httpcomponents:httpclient-cache:4.5.14"
-        integrationTestImplementation "org.apache.httpcomponents:httpclient:4.5.14"
-        integrationTestImplementation "org.apache.httpcomponents:fluent-hc:4.5.14"
-        integrationTestImplementation "org.apache.httpcomponents:httpcore:4.4.16"
-        integrationTestImplementation "org.apache.httpcomponents:httpasyncclient:4.1.5"
-        integrationTestImplementation "org.mockito:mockito-core:5.20.0"
-        integrationTestImplementation "org.passay:passay:1.6.6"
-        integrationTestImplementation "org.opensearch:opensearch:${opensearch_version}"
-        integrationTestImplementation "org.opensearch.plugin:transport-netty4-client:${opensearch_version}"
-        integrationTestImplementation "org.opensearch.plugin:aggs-matrix-stats-client:${opensearch_version}"
-        integrationTestImplementation "org.opensearch.plugin:parent-join-client:${opensearch_version}"
-        integrationTestImplementation "com.password4j:password4j:${versions.password4j}"
-        integrationTestImplementation "com.google.guava:guava:${guava_version}"
-        integrationTestImplementation "org.apache.commons:commons-lang3:${versions.commonslang}"
-        integrationTestImplementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
-        integrationTestImplementation 'org.greenrobot:eventbus-java:3.3.1'
-        integrationTestImplementation "org.apache.commons:commons-collections4:${versions.commonscollections4}"
-        integrationTestImplementation('com.flipkart.zjsonpatch:zjsonpatch:0.4.16'){
-            exclude(group:'com.fasterxml.jackson.core')
-            exclude(group: 'org.apache.commons', module: 'commons-collections4')
-        }
-        integrationTestImplementation 'org.slf4j:slf4j-api:2.0.12'
-        integrationTestImplementation 'com.selectivem.collections:special-collections-complete:1.4.0'
-
-        integrationTestImplementation ('com.jayway.jsonpath:json-path:2.10.0') {
-            exclude(group: 'net.minidev', module: 'json-smart')
-        }
-    }
-}
+    afterEvaluate {
+        if (project.configurations.findByName('integrationTestImplementation')) {
+            dependencies {
+                //integration test framework:
+                integrationTestImplementation('com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.3') {
+                    exclude(group: 'junit', module: 'junit')
+                }
+                integrationTestImplementation 'junit:junit:4.13.2'
+                integrationTestImplementation("org.opensearch.plugin:reindex-client:${opensearch_version}"){
+                    exclude(group: 'org.slf4j', module: 'slf4j-api')
+                }
+                integrationTestImplementation "org.opensearch:protobufs:${versions.opensearchprotobufs}"
+                integrationTestImplementation "io.grpc:grpc-stub:${versions.grpc}"
+                integrationTestImplementation "io.grpc:grpc-netty-shaded:${versions.grpc}"
+                integrationTestImplementation "org.opensearch.plugin:transport-grpc:${opensearch_version}"
+                integrationTestImplementation "org.opensearch.plugin:percolator-client:${opensearch_version}"
+                integrationTestImplementation 'commons-io:commons-io:2.21.0'
+                integrationTestImplementation "org.apache.logging.log4j:log4j-core:${versions.log4j}"
+                integrationTestImplementation "org.apache.logging.log4j:log4j-jul:${versions.log4j}"
+                integrationTestImplementation 'org.hamcrest:hamcrest:2.2'
+                integrationTestImplementation "org.bouncycastle:bc-fips:${versions.bouncycastle_jce}"
+                integrationTestImplementation "org.bouncycastle:bcpkix-fips:${versions.bouncycastle_pkix}"
+                integrationTestImplementation "org.bouncycastle:bcutil-fips:${versions.bouncycastle_util}"
+                integrationTestImplementation('org.awaitility:awaitility:4.3.0') {
+                    exclude(group: 'org.hamcrest', module: 'hamcrest')
+                }
+                integrationTestImplementation 'com.unboundid:unboundid-ldapsdk:4.0.14'
+                integrationTestImplementation "org.opensearch.plugin:mapper-size:${opensearch_version}"
+                integrationTestImplementation "org.apache.httpcomponents:httpclient-cache:4.5.14"
+                integrationTestImplementation "org.apache.httpcomponents:httpclient:4.5.14"
+                integrationTestImplementation "org.apache.httpcomponents:fluent-hc:4.5.14"
+                integrationTestImplementation "org.apache.httpcomponents:httpcore:4.4.16"
+                integrationTestImplementation "org.apache.httpcomponents:httpasyncclient:4.1.5"
+                integrationTestImplementation "org.mockito:mockito-core:5.20.0"
+                integrationTestImplementation "org.passay:passay:1.6.6"
+                integrationTestImplementation "org.opensearch:opensearch:${opensearch_version}"
+                integrationTestImplementation "org.opensearch.plugin:transport-netty4-client:${opensearch_version}"
+                integrationTestImplementation "org.opensearch.plugin:aggs-matrix-stats-client:${opensearch_version}"
+                integrationTestImplementation "org.opensearch.plugin:parent-join-client:${opensearch_version}"
+                integrationTestImplementation "com.password4j:password4j:${versions.password4j}"
+                integrationTestImplementation "com.google.guava:guava:${guava_version}"
+                integrationTestImplementation "org.apache.commons:commons-lang3:${versions.commonslang}"
+                integrationTestImplementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
+                integrationTestImplementation 'org.greenrobot:eventbus-java:3.3.1'
+                integrationTestImplementation "org.apache.commons:commons-collections4:${versions.commonscollections4}"
+                integrationTestImplementation('com.flipkart.zjsonpatch:zjsonpatch:0.4.16'){
+                    exclude(group:'com.fasterxml.jackson.core')
+                    exclude(group: 'org.apache.commons', module: 'commons-collections4')
+                }
+                integrationTestImplementation 'org.slf4j:slf4j-api:2.0.12'
+                integrationTestImplementation 'com.selectivem.collections:special-collections-complete:1.4.0'
 
-//create source set 'integrationTest'
-//add classes from the main source set to the compilation and runtime classpaths of the integrationTest
-sourceSets {
-    integrationTest {
-        java {
-            srcDir file ('src/integrationTest/java')
-            compileClasspath += sourceSets.main.output
-            runtimeClasspath += sourceSets.main.output
-        }
-        resources {
-            srcDir file('src/integrationTest/resources')
-        }
-        processIntegrationTestResources {
-            duplicatesStrategy(DuplicatesStrategy.INCLUDE)
+                integrationTestImplementation ('com.jayway.jsonpath:json-path:2.10.0') {
+                    exclude(group: 'net.minidev', module: 'json-smart')
+                }
+            }
         }
     }
 }
@@ -801,24 +814,14 @@ dependencies {
 }
 
 jar {
-    libsDirName = '.'
-    into '', {
-        from 'NOTICE.txt', "THIRD-PARTY.txt", "LICENSE"
-    }
-    processResources {
-        exclude("KEYS")
-    }
+    from('NOTICE.txt', 'THIRD-PARTY.txt', 'LICENSE')
 }
 
 tasks.register('testsJar', Jar) {
     archiveClassifier = 'tests'
     from(sourceSets.test.output)
 }
 
-testsJar {
-    libsDirName = '.'
-}
-
 task bundleSecurityAdminStandalone(dependsOn: jar, type: Zip) {
     archiveClassifier = 'securityadmin-standalone'
     from(configurations.runtimeClasspath) {
@@ -901,7 +904,7 @@ afterEvaluate {
         version = "${project.version}" - "-SNAPSHOT"
 
         into '/usr/share/opensearch/plugins'
-        from(zipTree(bundlePlugin.archivePath)) {
+        from(zipTree(bundlePlugin.archiveFile)) {
             into opensearchplugin.name
         }
 
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,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=ed1a8d686605fd7c23bdf62c7fc7add1c5b23b2bbc3721e661934ef4a4911d7c
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
+distributionSha256Sum=16f2b95838c1ddcf7242b1c39e7bbbb43c842f1f1a1a0dc4959b6d4d68abcac3
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/gradlew.bat b/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/sample-resource-plugin/build.gradle b/sample-resource-plugin/build.gradle
