From 7a623db04868ed58c21f6cb48a6630d1004632e3 Mon Sep 17 00:00:00 2001 From: Benedikt Waldvogel Date: Fri, 23 May 2025 10:30:21 +0200 Subject: [PATCH 1/4] Update all Gradle dependencies --- buildscript-gradle.lockfile | 4 ++-- gradle.lockfile | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile index f883bf8..51cbbe9 100644 --- a/buildscript-gradle.lockfile +++ b/buildscript-gradle.lockfile @@ -20,8 +20,8 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.10=classpath org.jetbrains:annotations:13.0=classpath org.slf4j:slf4j-api:2.0.13=classpath -org.sonarqube:org.sonarqube.gradle.plugin:6.1.0.5360=classpath -org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:6.1.0.5360=classpath +org.sonarqube:org.sonarqube.gradle.plugin:6.2.0.5505=classpath +org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:6.2.0.5505=classpath org.sonarsource.scanner.lib:sonar-scanner-java-library-batch-interface:3.3.1.450=classpath org.sonarsource.scanner.lib:sonar-scanner-java-library:3.3.1.450=classpath empty= diff --git a/gradle.lockfile b/gradle.lockfile index 29aef22..c99cc7c 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -5,8 +5,8 @@ ch.qos.logback:logback-classic:1.5.18=testRuntimeClasspath ch.qos.logback:logback-core:1.5.18=testRuntimeClasspath com.jcraft:jsch:0.1.55=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.jcraft:jzlib:1.1.3=runtimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.15.11=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.17.5=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.17.5=testCompileClasspath,testRuntimeClasspath org.apache.sshd:sshd-common:2.15.0=testCompileClasspath,testRuntimeClasspath org.apache.sshd:sshd-core:2.15.0=testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath @@ -23,8 +23,8 @@ org.junit.platform:junit-platform-commons:1.12.2=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.12.2=testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.12.2=testRuntimeClasspath org.junit:junit-bom:5.12.2=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-core:5.17.0=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-junit-jupiter:5.17.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-core:5.18.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-junit-jupiter:5.18.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-commons:9.7=jacocoAnt From f22f33711d8d7e7537a065a795dcbd45e44d5955 Mon Sep 17 00:00:00 2001 From: Benedikt Waldvogel Date: Fri, 23 May 2025 10:30:34 +0200 Subject: [PATCH 2/4] Update Gradle wrapper validation action --- .github/workflows/gradle-wrapper-validation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 4b31496..86ff6a7 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -11,5 +11,5 @@ jobs: name: "Validation" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: gradle/wrapper-validation-action@v1.0.4 + - uses: actions/checkout@v4 + - uses: gradle/wrapper-validation-action@v3 From ab97626e2c727b172b39130ad9fef8a4904e2425 Mon Sep 17 00:00:00 2001 From: Benedikt Waldvogel Date: Fri, 23 May 2025 10:31:06 +0200 Subject: [PATCH 3/4] =?UTF-8?q?Update=20Gradle:=208.13=20=E2=86=92=208.14.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- gradle.lockfile | 14 +++++++------- gradle/wrapper/gradle-wrapper.jar | Bin 43705 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 4 ++-- gradlew.bat | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 7c65917..ac1bb02 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ jacocoTestReport { } wrapper { - gradleVersion = "8.13" + gradleVersion = "8.14.1" distributionType = Wrapper.DistributionType.ALL } diff --git a/gradle.lockfile b/gradle.lockfile index c99cc7c..191a8f1 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -12,10 +12,10 @@ org.apache.sshd:sshd-core:2.15.0=testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.assertj:assertj-core:3.27.3=testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcprov-jdk15on:1.70=testRuntimeClasspath -org.jacoco:org.jacoco.agent:0.8.12=jacocoAgent,jacocoAnt -org.jacoco:org.jacoco.ant:0.8.12=jacocoAnt -org.jacoco:org.jacoco.core:0.8.12=jacocoAnt -org.jacoco:org.jacoco.report:0.8.12=jacocoAnt +org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt +org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt +org.jacoco:org.jacoco.core:0.8.13=jacocoAnt +org.jacoco:org.jacoco.report:0.8.13=jacocoAnt org.junit.jupiter:junit-jupiter-api:5.12.2=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.12.2=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.12.2=testCompileClasspath,testRuntimeClasspath @@ -27,9 +27,9 @@ org.mockito:mockito-core:5.18.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:5.18.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath -org.ow2.asm:asm-commons:9.7=jacocoAnt -org.ow2.asm:asm-tree:9.7=jacocoAnt -org.ow2.asm:asm:9.7=jacocoAnt +org.ow2.asm:asm-commons:9.8=jacocoAnt +org.ow2.asm:asm-tree:9.8=jacocoAnt +org.ow2.asm:asm:9.8=jacocoAnt org.slf4j:jcl-over-slf4j:1.7.36=testCompileClasspath org.slf4j:jcl-over-slf4j:2.0.17=testRuntimeClasspath org.slf4j:slf4j-api:2.0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 9bbc975c742b298b441bfb90dbc124400a3751b9..1b33c55baabb587c669f562ae36f953de2481846 100644 GIT binary patch delta 642 zcmdmamFde>rVZJA^}0Q$xegf!xPEW^+5YDM%iT2bEgct9o+jH~+sJas#HZ=szO|** z=Pj=X_vx?W&DSwKck|WWn~hffsvnQ+42*W$b7b0$SCcOoZ`{W{^$^pk;4>8-A*-)$ z?n(Po`1$6Jn_u?t-L+tsPyZ2#X}8T6OS8pAU;kdgd+_Hw4z4TW0p9E!T+=f7-c&O% zFic^X{7^$?^Ho04eona9n#mGMxKhA=~8B%JN`M zMhm5wc-2v)$``sY$!Q`9xiU@DhI73ZxiGEKg>yIPs)NmWwMdF-ngLXpZSqV5ez36n zVkxF2rjrjWR+_xr6e6@_u@s~2uv{9vi*1pj2)BjFD+-%@&pRVP1f{O1glxTOp2-62Ph;v z`N1+vCd)9ea)af*Ol1*JCfnp$%Uu}%OuoN7g2}3C@`L5FlP#(sA=|h@iixuZC?qp^ z=L$=v$ZoI}|87Wh=&h7udff{aieKr*l+zDp?pf)_bbRvUf>kn;HCDMXNlgbbo!QRK I1x7am0No)LiU0rr delta 584 zcmexzm1*ZyrVZJAexH5Moc8h7)w{^+t*dqJ%=yhh23L$9JpFV=_k`zJ-?Q4DI*eSe z+ES)HSrVnWLtJ&)lO%hRkV9zl5qqWRt0e;bb zPPo`)y?HTAyZI&u&X<|2$FDHCf4;!v8}p=?Tm`^F0`u(|1ttf~&t$qP3KUSD>@TJQ zRwJ}Pim6NzEc8KA6)e;S6gs8=7IIL8sQL*MYEuRYO;Uj<%3UbMbV&^&!Zvx+LKmjT z8Zch6rYP7Tw?$Hn(UTJwWiS=$f{lB(C=e*%usDV})0AQIK~sat=ND@+Gg*Pyij!rR z*fa02W|%BsV++>4W{DKDGSIUEHd2$P+8ct!RF+CHDowUuTEZOZ%rJSQv*qOXOSPDN zT|sP-$p*_3ncsWB*qoD7JQcyZ9xan%cJP6Tb4-?AZpr*F6v98hoNaPJm@HV`yya5N z))6pqFXn@}P(3T0nEzM8*c_9KtE9o|_pFd&K35GBXP^9Kg(b6GH-z8S4GDzIl~T+b zdLd#meKKHu$5u))8cu$=GKINkGDPOUD)!0$C(BH(U!}!-e;Q0ok8Sc?V1zRO04>ts AA^-pY diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ed4c299..6925085 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.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index faf9300..23d15a9 100755 --- 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 index 9b42019..5eed7ee 100644 --- 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 From 03d6d7e07aa04f3851f9fe1531b37b6e1edca49f Mon Sep 17 00:00:00 2001 From: Benedikt Waldvogel Date: Fri, 23 May 2025 10:31:53 +0200 Subject: [PATCH 4/4] Build and test with Java 24 --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 60f1ba8..f6cffb1 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ '11', '17', '21', '22' ] + java: [ '11', '17', '21', '24' ] steps: - uses: actions/checkout@v2