Update dependencies (#4620)

* Update dependencies to latest versions

* Upgrade to gradle 7.5

* Fix checksum
This commit is contained in:
jack-berg 2022-07-20 09:39:30 -05:00 committed by GitHub
parent 7a1114197d
commit 31746e0821
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 19 deletions

View File

@ -14,15 +14,15 @@ rootProject.extra["versions"] = dependencyVersions
val DEPENDENCY_BOMS = listOf( val DEPENDENCY_BOMS = listOf(
"com.fasterxml.jackson:jackson-bom:2.13.3", "com.fasterxml.jackson:jackson-bom:2.13.3",
"com.google.guava:guava-bom:31.1-jre", "com.google.guava:guava-bom:31.1-jre",
"com.google.protobuf:protobuf-bom:3.21.1", "com.google.protobuf:protobuf-bom:3.21.2",
"com.linecorp.armeria:armeria-bom:1.16.0", "com.linecorp.armeria:armeria-bom:1.17.1",
"com.squareup.okhttp3:okhttp-bom:4.9.3", "com.squareup.okhttp3:okhttp-bom:4.10.0",
"io.grpc:grpc-bom:1.47.0", "io.grpc:grpc-bom:1.47.0",
"io.micrometer:micrometer-bom:1.9.0", "io.micrometer:micrometer-bom:1.9.2",
"io.zipkin.brave:brave-bom:5.13.9", "io.zipkin.brave:brave-bom:5.13.10",
"io.zipkin.reporter2:zipkin-reporter-bom:2.16.3", "io.zipkin.reporter2:zipkin-reporter-bom:2.16.3",
"org.junit:junit-bom:5.8.2", "org.junit:junit-bom:5.8.2",
"org.testcontainers:testcontainers-bom:1.17.2", "org.testcontainers:testcontainers-bom:1.17.3",
"org.yaml:snakeyaml:1.30" "org.yaml:snakeyaml:1.30"
) )
@ -50,7 +50,7 @@ val DEPENDENCY_SETS = listOf(
), ),
DependencySet( DependencySet(
"io.prometheus", "io.prometheus",
"0.15.0", "0.16.0",
listOf("simpleclient", "simpleclient_common", "simpleclient_httpserver") listOf("simpleclient", "simpleclient_common", "simpleclient_httpserver")
), ),
DependencySet( DependencySet(
@ -77,18 +77,18 @@ val DEPENDENCY_SETS = listOf(
val DEPENDENCIES = listOf( val DEPENDENCIES = listOf(
"com.github.stefanbirkner:system-rules:1.19.0", "com.github.stefanbirkner:system-rules:1.19.0",
"com.google.api.grpc:proto-google-common-protos:2.8.3", "com.google.api.grpc:proto-google-common-protos:2.9.2",
"com.google.code.findbugs:jsr305:3.0.2", "com.google.code.findbugs:jsr305:3.0.2",
"com.google.guava:guava-beta-checker:1.0", "com.google.guava:guava-beta-checker:1.0",
"com.lmax:disruptor:3.4.4", "com.lmax:disruptor:3.4.4",
"com.sun.net.httpserver:http:20070405", "com.sun.net.httpserver:http:20070405",
"com.tngtech.archunit:archunit-junit5:0.23.1", "com.tngtech.archunit:archunit-junit5:0.23.1",
"com.uber.nullaway:nullaway:0.9.7", "com.uber.nullaway:nullaway:0.9.8",
// TODO(anuraaga): Skip 1.8 because of https://github.com/rohanpadhye/JQF/issues/172 // TODO(anuraaga): Skip 1.8 because of https://github.com/rohanpadhye/JQF/issues/172
"edu.berkeley.cs.jqf:jqf-fuzz:1.7", "edu.berkeley.cs.jqf:jqf-fuzz:1.7",
"eu.rekawek.toxiproxy:toxiproxy-java:2.1.7", "eu.rekawek.toxiproxy:toxiproxy-java:2.1.7",
"io.github.netmikey.logunit:logunit-jul:1.1.3", "io.github.netmikey.logunit:logunit-jul:1.1.3",
"io.jaegertracing:jaeger-client:1.8.0", "io.jaegertracing:jaeger-client:1.8.1",
"io.opentelemetry.proto:opentelemetry-proto:0.18.0-alpha", "io.opentelemetry.proto:opentelemetry-proto:0.18.0-alpha",
"io.opentracing:opentracing-api:0.33.0", "io.opentracing:opentracing-api:0.33.0",
"junit:junit:4.13.2", "junit:junit:4.13.2",
@ -99,7 +99,7 @@ val DEPENDENCIES = listOf(
"org.codehaus.mojo:animal-sniffer-annotations:1.21", "org.codehaus.mojo:animal-sniffer-annotations:1.21",
"org.jctools:jctools-core:3.3.0", "org.jctools:jctools-core:3.3.0",
"org.junit-pioneer:junit-pioneer:1.7.1", "org.junit-pioneer:junit-pioneer:1.7.1",
"org.skyscreamer:jsonassert:1.5.0", "org.skyscreamer:jsonassert:1.5.1",
) )
javaPlatform { javaPlatform {

Binary file not shown.

View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

6
gradlew vendored
View File

@ -205,6 +205,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \ org.gradle.wrapper.GradleWrapperMain \
"$@" "$@"
# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi
# Use "xargs" to parse quoted args. # Use "xargs" to parse quoted args.
# #
# With -n1 it outputs one arg per line, with the quotes and backslashes removed. # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

14
gradlew.bat vendored
View File

@ -14,7 +14,7 @@
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@if "%DEBUG%" == "" @echo off @if "%DEBUG%"=="" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem @rem
@rem Gradle startup script for Windows @rem Gradle startup script for Windows
@ -25,7 +25,7 @@
if "%OS%"=="Windows_NT" setlocal if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0 set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=. if "%DIRNAME%"=="" set DIRNAME=.
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute if %ERRORLEVEL% equ 0 goto execute
echo. echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd if %ERRORLEVEL% equ 0 goto mainEnd
:fail :fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code! rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 set EXIT_CODE=%ERRORLEVEL%
exit /b 1 if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd :mainEnd
if "%OS%"=="Windows_NT" endlocal if "%OS%"=="Windows_NT" endlocal