Upgrade gradle to 9.2.0 and github actions JDK 25 (#1534)

* Upgrade gradle to 9.2.0 and github actions JDK 25

Signed-off-by: Hailong Cui <[email protected]>

* fix detekt

Signed-off-by: Hailong Cui <[email protected]>

* disable forbiddenApis for 3.3 for jdk 25

Signed-off-by: Hailong Cui <[email protected]>

---------

Signed-off-by: Hailong Cui <[email protected]>

Author: Hailong-am

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

@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       # This starts three jobs, setting these environment variables uniquely for the different jobs
       matrix:
-        java: [ 21, 24 ]
+        java: [ 21, 25 ]
     container:
       # using the same image which is used by opensearch-build team to build the OpenSearch Distribution
       # this image tag is subject to change as more dependencies and updates will arrive over time

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

@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       # This starts three jobs, setting these environment variables uniquely for the different jobs
       matrix:
-        java: [21, 24]
+        java: [21, 25]
         feature: [ism, non-ism]
         include:
           - feature: ism

build.gradle

@@ -4,7 +4,7 @@
  */
 
 
-import io.gitlab.arturbosch.detekt.Detekt
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.opensearch.gradle.testclusters.OpenSearchCluster
 import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
 
@@ -81,7 +81,7 @@ buildscript {
         classpath "org.opensearch.gradle:build-tools:${opensearch_version}"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
         classpath "org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}"
-        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8"
+        classpath "dev.detekt:detekt-gradle-plugin:2.0.0-alpha.1"
         classpath "org.jacoco:org.jacoco.agent:0.8.12"
     }
 }
@@ -98,7 +98,7 @@ apply plugin: 'idea'
 apply plugin: 'opensearch.opensearchplugin'
 apply plugin: 'opensearch.testclusters'
 apply plugin: 'opensearch.rest-test'
-apply plugin: 'io.gitlab.arturbosch.detekt'
+apply plugin: "dev.detekt"
 apply plugin: 'org.jetbrains.kotlin.jvm'
 apply plugin: 'org.jetbrains.kotlin.plugin.allopen'
 apply plugin: 'opensearch.pluginzip'
@@ -112,6 +112,7 @@ configurations.all {
         force "org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}"
         force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"
         force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}"
+        force "org.jetbrains:annotations:23.0.0"
         force 'junit:junit:4.13.2'
         force 'commons-beanutils:commons-beanutils:1.10.1'
         force 'com.google.guava:guava:30.1.1-jre'
@@ -180,11 +181,6 @@ detekt {
 // but with a string it should look for a task with that name instead
 check.dependsOn "detekt"
 
-// TODO Remove this once detekt supports JDK24
-tasks.withType(Detekt).configureEach {
-    jvmTarget = "22"
-}
-
 configurations.testImplementation {
     exclude module: "securemock"
 }
@@ -195,6 +191,10 @@ tasks.named('forbiddenApisTest').configure {
     bundledSignatures += 'jdk-internal'
 }
 
+// TODO remove it when upgrade to 3.4
+forbiddenApisMain.enabled = false
+forbiddenApisTest.enabled = false
+
 ext {
     projectSubstitutions = [:]
 
@@ -226,7 +226,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
-    implementation "org.jetbrains:annotations:13.0"
+    implementation "org.jetbrains:annotations:23.0.0"
     implementation project(path: ":${rootProject.name}-spi", configuration: 'shadow')
     implementation "org.opensearch:common-utils:${common_utils_version}"
     implementation "com.github.seancfoley:ipaddress:5.5.1"
@@ -303,11 +303,15 @@ publishing {
 tasks.generatePomFileForPluginZipPublication.dependsOn publishNebulaPublicationToMavenLocal
 
 plugins.withId('java') {
-    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21
+    java {
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+    }
 }
 
 plugins.withId('org.jetbrains.kotlin.jvm') {
-    compileKotlin.kotlinOptions.jvmTarget = compileTestKotlin.kotlinOptions.jvmTarget = JavaVersion.VERSION_21
+    compileKotlin.compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
+    compileTestKotlin.compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
     compileKotlin.dependsOn ktlint
 }
 

detekt.yml

@@ -1,6 +1,3 @@
-build:
-  maxIssues: 0
-
 exceptions:
   TooGenericExceptionCaught:
     active: false
@@ -24,9 +21,9 @@ complexity:
   LargeClass:
     excludes: ['**/test/**']
   LongMethod:
-    threshold: 80
+    allowedLines: 80
     excludes: ['**/test/**']
   LongParameterList:
     excludes: ['**/test/**']
   NestedBlockDepth:
-    threshold: 5
+    allowedDepth: 5

gradle/wrapper/gradle-wrapper.jar

@@ -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

gradle/wrapper/gradle-wrapper.properties

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,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.
@@ -206,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 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.

gradlew

@@ -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

gradlew.bat

@@ -2,6 +2,8 @@
  * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
+
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.opensearch.gradle.test.RestIntegTestTask
 
 plugins {
@@ -25,11 +27,15 @@ ext {
 }
 
 plugins.withId('java') {
-    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21
+    java {
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+    }
 }
 
 plugins.withId('org.jetbrains.kotlin.jvm') {
-    compileKotlin.kotlinOptions.jvmTarget = compileTestKotlin.kotlinOptions.jvmTarget = JavaVersion.VERSION_21
+    compileKotlin.compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
+    compileTestKotlin.compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
 }
 
 jacoco {
@@ -41,7 +47,7 @@ jacocoTestReport {
     reports {
         xml.required.set(false)
         csv.required.set(false)
-        html.destination file("${buildDir}/jacoco/")
+        html.outputLocation.set(file("${buildDir}/jacoco/"))
     }
 }
 

spi/build.gradle

@@ -103,7 +103,7 @@ data class ActionMetaData(
             }
         }
 
-        @Suppress("ComplexMethod")
+        @Suppress("CyclomaticComplexMethod")
         fun parse(xcp: XContentParser): ActionMetaData {
             var name: String? = null
             var startTime: Long? = null