diff --git a/build.gradle b/build.gradle index 27c3ac62719..967331f5e3b 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ // EISOP Checker Framework id "org.checkerframework" version "0.6.61" - id("org.sonarqube") version "7.2.3.7755" + id("org.sonarqube") version "7.3.0.8198" // Plugin for publishing via the new Nexus API id "io.github.gradle-nexus.publish-plugin" version "2.0.0" @@ -71,7 +71,7 @@ subprojects { compileOnly("org.jspecify:jspecify:1.0.0") testCompileOnly("org.jspecify:jspecify:1.0.0") - def eisop_version = "3.49.3-eisop1" + def eisop_version = "3.49.5-eisop1" compileOnly "io.github.eisop:checker-qual:$eisop_version" compileOnly "io.github.eisop:checker-util:$eisop_version" testCompileOnly "io.github.eisop:checker-qual:$eisop_version" @@ -82,7 +82,7 @@ subprojects { testImplementation("org.assertj:assertj-core:3.27.7") testImplementation("ch.qos.logback:logback-classic:1.5.32") - testImplementation(platform("org.junit:junit-bom:5.14.3")) + testImplementation(platform("org.junit:junit-bom:6.0.3")) testImplementation ("org.junit.jupiter:junit-jupiter-api") testImplementation ("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly ("org.junit.jupiter:junit-jupiter-engine") @@ -92,8 +92,8 @@ subprojects { testImplementation (testFixtures(project(":key.util"))) // test fixtures - testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.2") - testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.2") + testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.3") + testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.3") testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d997cfc60f4..b1b8ef56b44 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 c61a118f7dd..b52fb7e713a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 739907dfd15..b9bb139f790 100755 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/gradlew.bat b/gradlew.bat old mode 100755 new mode 100644 index e509b2dd8fe..aa5f10b069f --- a/gradlew.bat +++ b/gradlew.bat @@ -23,8 +23,8 @@ @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,7 +65,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line @@ -73,21 +73,10 @@ goto fail @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/key.core/build.gradle b/key.core/build.gradle index eb7714f746a..eedd94a7f58 100644 --- a/key.core/build.gradle +++ b/key.core/build.gradle @@ -25,7 +25,7 @@ dependencies { testImplementation(project(":key.core")) // https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml - testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.2' + testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.3' // test fixtures testFixturesApi(testFixtures(project(":key.util"))) diff --git a/key.util/build.gradle b/key.util/build.gradle index cfe26a0db9c..4d678dec38b 100644 --- a/key.util/build.gradle +++ b/key.util/build.gradle @@ -10,7 +10,7 @@ dependencies { // we also export these dependency into src/test/java. testFixturesApi(project(':key.util')) - testFixturesApi(platform("org.junit:junit-bom:5.14.3")) + testFixturesApi(platform("org.junit:junit-bom:6.0.3")) testFixturesApi("org.junit.jupiter:junit-jupiter-api") testFixturesApi("org.junit.jupiter:junit-jupiter-params") testFixturesApi("org.assertj:assertj-core:3.27.7") @@ -19,10 +19,10 @@ dependencies { testFixturesApi("ch.qos.logback:logback-classic:1.5.32") // test fixtures - testFixturesApi("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.2") - testFixturesApi("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.2") + testFixturesApi("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.3") + testFixturesApi("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.3") - def eisop_version = "3.49.3-eisop1" + def eisop_version = "3.49.5-eisop1" testFixturesCompileOnly( "io.github.eisop:checker-qual:$eisop_version") }