Skip to content

Commit 7c0ce4c

Browse files
authored
Update to Gradle 8.5 (#1131)
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
1 parent e5cbe93 commit 7c0ce4c

7 files changed

+22
-21
lines changed

.github/workflows/test_build_multi_platform.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
Build-ad-windows:
1717
strategy:
1818
matrix:
19-
java: [ 11, 17, 20 ]
19+
java: [ 11, 17, 21 ]
2020
name: Build and Test Anomaly Detection Plugin on Windows
2121
runs-on: windows-latest
2222
env:
@@ -49,7 +49,7 @@ jobs:
4949
needs: Get-CI-Image-Tag
5050
strategy:
5151
matrix:
52-
java: [11, 17, 20]
52+
java: [11, 17, 21]
5353
fail-fast: false
5454
name: Build and Test Anomaly detection Plugin
5555
runs-on: ubuntu-latest
@@ -89,7 +89,7 @@ jobs:
8989
Build-ad-macos:
9090
strategy:
9191
matrix:
92-
java: [11,17,20]
92+
java: [11,17,21]
9393
fail-fast: false
9494

9595
name: Build and Test Anomaly detection Plugin

.github/workflows/test_bwc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
needs: Get-CI-Image-Tag
1818
strategy:
1919
matrix:
20-
java: [11,17,20]
20+
java: [11,17,21]
2121
fail-fast: false
2222

2323
name: Test Anomaly detection BWC

.github/workflows/test_security.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
Build-ad:
1212
strategy:
1313
matrix:
14-
java: [11,17,20]
14+
java: [11,17,21]
1515
fail-fast: false
1616

1717
name: Security test workflow for Anomaly Detection

build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ buildscript {
6666

6767
plugins {
6868
id 'com.netflix.nebula.ospackage' version "11.5.0"
69-
id "com.diffplug.spotless" version "6.18.0"
69+
id "com.diffplug.spotless" version "6.24.0"
7070
id 'java-library'
71-
id 'org.gradle.test-retry' version '1.5.4'
71+
id 'org.gradle.test-retry' version '1.5.7'
7272
}
7373

7474
tasks.withType(JavaCompile) {
@@ -142,15 +142,15 @@ dependencies {
142142
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.13.0'
143143

144144

145-
implementation "org.jacoco:org.jacoco.agent:0.8.5"
146-
implementation ("org.jacoco:org.jacoco.ant:0.8.10") {
145+
implementation "org.jacoco:org.jacoco.agent:0.8.11"
146+
implementation ("org.jacoco:org.jacoco.ant:0.8.11") {
147147
exclude group: 'org.ow2.asm', module: 'asm-commons'
148148
exclude group: 'org.ow2.asm', module: 'asm'
149149
exclude group: 'org.ow2.asm', module: 'asm-tree'
150150
}
151151

152152
testImplementation group: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.1'
153-
testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.3.1'
153+
testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.9.0'
154154
testImplementation group: 'org.objenesis', name: 'objenesis', version: '3.3'
155155
testImplementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.14.9'
156156
testImplementation group: 'net.bytebuddy', name: 'byte-buddy-agent', version: '1.14.9'
@@ -184,7 +184,7 @@ allprojects {
184184
version = "${opensearch_build}"
185185

186186
plugins.withId('jacoco') {
187-
jacoco.toolVersion = '0.8.10'
187+
jacoco.toolVersion = '0.8.11'
188188
}
189189
}
190190

@@ -216,7 +216,7 @@ configurations.all {
216216
force "org.apache.httpcomponents.client5:httpclient5:${versions.httpclient5}"
217217
force "commons-codec:commons-codec:${versions.commonscodec}"
218218

219-
force "org.mockito:mockito-core:5.3.1"
219+
force "org.mockito:mockito-core:5.9.0"
220220
force "org.objenesis:objenesis:3.3"
221221
force "net.bytebuddy:byte-buddy:1.14.9"
222222
force "net.bytebuddy:byte-buddy-agent:1.14.9"

gradle/wrapper/gradle-wrapper.jar

-19.4 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

+9-8
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
8788

8889
# Use the maximum available, or set MAX_FD != -1 to use that value.
8990
MAX_FD=maximum
@@ -144,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144145
case $MAX_FD in #(
145146
max*)
146147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
148149
MAX_FD=$( ulimit -H -n ) ||
149150
warn "Could not query maximum file descriptor limit"
150151
esac
151152
case $MAX_FD in #(
152153
'' | soft) :;; #(
153154
*)
154155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
156157
ulimit -n "$MAX_FD" ||
157158
warn "Could not set maximum file descriptor limit to $MAX_FD"
158159
esac
@@ -201,11 +202,11 @@ fi
201202
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
202203
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
203204

204-
# Collect all arguments for the java command;
205-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
206-
# shell script including quotes and variable substitutions, so put them in
207-
# double quotes to make sure that they get re-expanded; and
208-
# * put everything else in single quotes, so that it's not re-expanded.
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
209210

210211
set -- \
211212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

0 commit comments

Comments
 (0)