Skip to content

Commit 57b05cb

Browse files
authored
Update dependencies (#4728)
* Update dependencies to latest version * Upgrade to gradle 7.5.1
1 parent 45a1593 commit 57b05cb

File tree

3 files changed

+19
-15
lines changed

3 files changed

+19
-15
lines changed

buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts

+4
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ tasks {
7878
// Only used in comments, but couldn't SuppressWarnings for some reason
7979
disable("UnicodeEscape")
8080

81+
// We make liberal use of builders returning "this" which can be safely ignored. Annotating
82+
// every one of these methods is too noisy.
83+
disable("CanIgnoreReturnValueSuggester")
84+
8185
if (name.contains("Jmh") || name.contains("Test")) {
8286
// Allow underscore in test-type method names
8387
disable("MemberName")

dependencyManagement/build.gradle.kts

+13-13
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ rootProject.extra["versions"] = dependencyVersions
1414
val DEPENDENCY_BOMS = listOf(
1515
"com.fasterxml.jackson:jackson-bom:2.13.3",
1616
"com.google.guava:guava-bom:31.1-jre",
17-
"com.google.protobuf:protobuf-bom:3.21.2",
18-
"com.linecorp.armeria:armeria-bom:1.17.1",
17+
"com.google.protobuf:protobuf-bom:3.21.5",
18+
"com.linecorp.armeria:armeria-bom:1.18.0",
1919
"com.squareup.okhttp3:okhttp-bom:4.10.0",
20-
"io.grpc:grpc-bom:1.47.0",
21-
"io.micrometer:micrometer-bom:1.9.2",
22-
"io.zipkin.brave:brave-bom:5.13.10",
20+
"io.grpc:grpc-bom:1.49.0",
21+
"io.micrometer:micrometer-bom:1.9.3",
22+
"io.zipkin.brave:brave-bom:5.13.11",
2323
"io.zipkin.reporter2:zipkin-reporter-bom:2.16.3",
24-
"org.junit:junit-bom:5.8.2",
24+
"org.junit:junit-bom:5.9.0",
2525
"org.testcontainers:testcontainers-bom:1.17.3",
26-
"org.yaml:snakeyaml:1.30"
26+
"org.yaml:snakeyaml:1.31"
2727
)
2828

2929
val DEPENDENCY_SETS = listOf(
@@ -34,7 +34,7 @@ val DEPENDENCY_SETS = listOf(
3434
),
3535
DependencySet(
3636
"com.google.errorprone",
37-
"2.14.0",
37+
"2.15.0",
3838
listOf("error_prone_annotations", "error_prone_core")
3939
),
4040
DependencySet(
@@ -65,12 +65,12 @@ val DEPENDENCY_SETS = listOf(
6565
),
6666
DependencySet(
6767
"org.mockito",
68-
"4.6.1",
68+
"4.7.0",
6969
listOf("mockito-core", "mockito-junit-jupiter")
7070
),
7171
DependencySet(
7272
"org.slf4j",
73-
"1.7.36",
73+
"2.0.0",
7474
listOf("jul-to-slf4j", "slf4j-simple")
7575
),
7676
)
@@ -83,7 +83,7 @@ val DEPENDENCIES = listOf(
8383
"com.lmax:disruptor:3.4.4",
8484
"com.sun.net.httpserver:http:20070405",
8585
"com.tngtech.archunit:archunit-junit5:0.23.1",
86-
"com.uber.nullaway:nullaway:0.9.8",
86+
"com.uber.nullaway:nullaway:0.9.9",
8787
// TODO(anuraaga): Skip 1.8 because of https://github.com/rohanpadhye/JQF/issues/172
8888
"edu.berkeley.cs.jqf:jqf-fuzz:1.7",
8989
"eu.rekawek.toxiproxy:toxiproxy-java:2.1.7",
@@ -92,11 +92,11 @@ val DEPENDENCIES = listOf(
9292
"io.opentelemetry.proto:opentelemetry-proto:0.19.0-alpha",
9393
"io.opentracing:opentracing-api:0.33.0",
9494
"junit:junit:4.13.2",
95-
"nl.jqno.equalsverifier:equalsverifier:3.10",
95+
"nl.jqno.equalsverifier:equalsverifier:3.10.1",
9696
"org.assertj:assertj-core:3.23.1",
9797
"org.awaitility:awaitility:4.2.0",
9898
"org.bouncycastle:bcpkix-jdk15on:1.70",
99-
"org.codehaus.mojo:animal-sniffer-annotations:1.21",
99+
"org.codehaus.mojo:animal-sniffer-annotations:1.22",
100100
"org.jctools:jctools-core:3.3.0",
101101
"org.junit-pioneer:junit-pioneer:1.7.1",
102102
"org.skyscreamer:jsonassert:1.5.1",
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
3+
distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)