diff --git a/build.gradle b/build.gradle index d6905caef..3e2b7e8ed 100755 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { - id 'com.github.ben-manes.versions' version '0.53.0' - id 'com.github.spotbugs' version '6.4.8' apply false - id 'com.gradleup.shadow' version '9.4.1' apply false + id 'com.github.ben-manes.versions' version '0.54.0' + id 'com.github.spotbugs' version '6.5.5' apply false + id 'com.gradleup.shadow' version '9.4.2' apply false id 'me.champeau.jmh' version '0.7.3' id 'com.netflix.nebula.dependency-recommender' version '14.0.0' id 'com.netflix.nebula.netflixoss' version '13.0.0' diff --git a/dependencies.properties b/dependencies.properties index 4681c4f1e..5c6cd1912 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -16,7 +16,7 @@ com.netflix.governator:governator-api = 1.17.13 com.netflix.governator:governator-core = 1.17.13 com.netflix.servo:servo-core = 0.13.2 com.typesafe:config = 1.4.6 -io.dropwizard.metrics:metrics-core = 4.2.38 +io.dropwizard.metrics:metrics-core = 4.2.39 io.dropwizard.metrics5:metrics-core = 5.0.6 io.micrometer:micrometer-core = 1.16.4 javax.inject:javax.inject = 1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d997cfc60..b1b8ef56b 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 c61a118f7..df6a6ad76 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.1-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 739907dfd..b9bb139f7 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 index e509b2dd8..aa5f10b06 100644 --- 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/spectator-ext-spark/build.gradle b/spectator-ext-spark/build.gradle index 026ff56fe..2aa6b3b80 100644 --- a/spectator-ext-spark/build.gradle +++ b/spectator-ext-spark/build.gradle @@ -8,10 +8,10 @@ dependencies { implementation project(':spectator-ext-jvm') implementation project(':spectator-reg-sidecar') implementation "com.typesafe:config" - compileOnly 'io.dropwizard.metrics:metrics-core:4.2.25' - compileOnly 'org.apache.spark:spark-core_2.12:3.3.4' + compileOnly 'io.dropwizard.metrics:metrics-core:4.2.39' + compileOnly 'org.apache.spark:spark-core_2.12:3.5.8' testImplementation 'io.dropwizard.metrics:metrics-core:3.1.5' - testImplementation 'org.apache.spark:spark-core_2.12:3.3.4' + testImplementation 'org.apache.spark:spark-core_2.12:3.5.8' } jar {