diff --git a/.github/workflows/test_build_multi_platform.yml b/.github/workflows/test_build_multi_platform.yml index ac81a3697..de5d415da 100644 --- a/.github/workflows/test_build_multi_platform.yml +++ b/.github/workflows/test_build_multi_platform.yml @@ -16,7 +16,7 @@ jobs: Build-ad-windows: strategy: matrix: - java: [ 11, 17, 20 ] + java: [ 11, 17, 21 ] name: Build and Test Anomaly Detection Plugin on Windows runs-on: windows-latest env: @@ -49,7 +49,7 @@ jobs: needs: Get-CI-Image-Tag strategy: matrix: - java: [11, 17, 20] + java: [11, 17, 21] fail-fast: false name: Build and Test Anomaly detection Plugin runs-on: ubuntu-latest @@ -89,7 +89,7 @@ jobs: Build-ad-macos: strategy: matrix: - java: [11,17,20] + java: [11,17,21] fail-fast: false name: Build and Test Anomaly detection Plugin diff --git a/.github/workflows/test_bwc.yml b/.github/workflows/test_bwc.yml index 10d41b70c..953f62009 100644 --- a/.github/workflows/test_bwc.yml +++ b/.github/workflows/test_bwc.yml @@ -17,7 +17,7 @@ jobs: needs: Get-CI-Image-Tag strategy: matrix: - java: [11,17,20] + java: [11,17,21] fail-fast: false name: Test Anomaly detection BWC diff --git a/.github/workflows/test_security.yml b/.github/workflows/test_security.yml index 861da6dc4..177035381 100644 --- a/.github/workflows/test_security.yml +++ b/.github/workflows/test_security.yml @@ -11,7 +11,7 @@ jobs: Build-ad: strategy: matrix: - java: [11,17,20] + java: [11,17,21] fail-fast: false name: Security test workflow for Anomaly Detection diff --git a/build.gradle b/build.gradle index 3c6dd9300..9eee420ed 100644 --- a/build.gradle +++ b/build.gradle @@ -66,9 +66,9 @@ buildscript { plugins { id 'com.netflix.nebula.ospackage' version "11.5.0" - id "com.diffplug.spotless" version "6.18.0" + id "com.diffplug.spotless" version "6.24.0" id 'java-library' - id 'org.gradle.test-retry' version '1.5.4' + id 'org.gradle.test-retry' version '1.5.7' } tasks.withType(JavaCompile) { @@ -142,15 +142,15 @@ dependencies { implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.13.0' - implementation "org.jacoco:org.jacoco.agent:0.8.5" - implementation ("org.jacoco:org.jacoco.ant:0.8.10") { + implementation "org.jacoco:org.jacoco.agent:0.8.11" + implementation ("org.jacoco:org.jacoco.ant:0.8.11") { exclude group: 'org.ow2.asm', module: 'asm-commons' exclude group: 'org.ow2.asm', module: 'asm' exclude group: 'org.ow2.asm', module: 'asm-tree' } testImplementation group: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.1' - testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.3.1' + testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.9.0' testImplementation group: 'org.objenesis', name: 'objenesis', version: '3.3' testImplementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.14.9' testImplementation group: 'net.bytebuddy', name: 'byte-buddy-agent', version: '1.14.9' @@ -184,7 +184,7 @@ allprojects { version = "${opensearch_build}" plugins.withId('jacoco') { - jacoco.toolVersion = '0.8.10' + jacoco.toolVersion = '0.8.11' } } @@ -216,7 +216,7 @@ configurations.all { force "org.apache.httpcomponents.client5:httpclient5:${versions.httpclient5}" force "commons-codec:commons-codec:${versions.commonscodec}" - force "org.mockito:mockito-core:5.3.1" + force "org.mockito:mockito-core:5.9.0" force "org.objenesis:objenesis:3.3" force "net.bytebuddy:byte-buddy:1.14.9" force "net.bytebuddy:byte-buddy-agent:1.14.9" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 033e24c4c..d64cd4917 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9f4197d5f..1af9e0930 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index fcb6fca14..1aa94a426 100755 --- a/gradlew +++ b/gradlew @@ -83,7 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -201,11 +202,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_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" \