diff --git a/buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts index 1fe3ddf1fc7..d639619949b 100644 --- a/buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts @@ -78,6 +78,10 @@ tasks { // Only used in comments, but couldn't SuppressWarnings for some reason disable("UnicodeEscape") + // We make liberal use of builders returning "this" which can be safely ignored. Annotating + // every one of these methods is too noisy. + disable("CanIgnoreReturnValueSuggester") + if (name.contains("Jmh") || name.contains("Test")) { // Allow underscore in test-type method names disable("MemberName") diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 07db50db181..90a7b660509 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -14,16 +14,16 @@ rootProject.extra["versions"] = dependencyVersions val DEPENDENCY_BOMS = listOf( "com.fasterxml.jackson:jackson-bom:2.13.3", "com.google.guava:guava-bom:31.1-jre", - "com.google.protobuf:protobuf-bom:3.21.2", - "com.linecorp.armeria:armeria-bom:1.17.1", + "com.google.protobuf:protobuf-bom:3.21.5", + "com.linecorp.armeria:armeria-bom:1.18.0", "com.squareup.okhttp3:okhttp-bom:4.10.0", - "io.grpc:grpc-bom:1.47.0", - "io.micrometer:micrometer-bom:1.9.2", - "io.zipkin.brave:brave-bom:5.13.10", + "io.grpc:grpc-bom:1.49.0", + "io.micrometer:micrometer-bom:1.9.3", + "io.zipkin.brave:brave-bom:5.13.11", "io.zipkin.reporter2:zipkin-reporter-bom:2.16.3", - "org.junit:junit-bom:5.8.2", + "org.junit:junit-bom:5.9.0", "org.testcontainers:testcontainers-bom:1.17.3", - "org.yaml:snakeyaml:1.30" + "org.yaml:snakeyaml:1.31" ) val DEPENDENCY_SETS = listOf( @@ -34,7 +34,7 @@ val DEPENDENCY_SETS = listOf( ), DependencySet( "com.google.errorprone", - "2.14.0", + "2.15.0", listOf("error_prone_annotations", "error_prone_core") ), DependencySet( @@ -65,12 +65,12 @@ val DEPENDENCY_SETS = listOf( ), DependencySet( "org.mockito", - "4.6.1", + "4.7.0", listOf("mockito-core", "mockito-junit-jupiter") ), DependencySet( "org.slf4j", - "1.7.36", + "2.0.0", listOf("jul-to-slf4j", "slf4j-simple") ), ) @@ -83,7 +83,7 @@ val DEPENDENCIES = listOf( "com.lmax:disruptor:3.4.4", "com.sun.net.httpserver:http:20070405", "com.tngtech.archunit:archunit-junit5:0.23.1", - "com.uber.nullaway:nullaway:0.9.8", + "com.uber.nullaway:nullaway:0.9.9", // TODO(anuraaga): Skip 1.8 because of https://github.com/rohanpadhye/JQF/issues/172 "edu.berkeley.cs.jqf:jqf-fuzz:1.7", "eu.rekawek.toxiproxy:toxiproxy-java:2.1.7", @@ -92,11 +92,11 @@ val DEPENDENCIES = listOf( "io.opentelemetry.proto:opentelemetry-proto:0.19.0-alpha", "io.opentracing:opentracing-api:0.33.0", "junit:junit:4.13.2", - "nl.jqno.equalsverifier:equalsverifier:3.10", + "nl.jqno.equalsverifier:equalsverifier:3.10.1", "org.assertj:assertj-core:3.23.1", "org.awaitility:awaitility:4.2.0", "org.bouncycastle:bcpkix-jdk15on:1.70", - "org.codehaus.mojo:animal-sniffer-annotations:1.21", + "org.codehaus.mojo:animal-sniffer-annotations:1.22", "org.jctools:jctools-core:3.3.0", "org.junit-pioneer:junit-pioneer:1.7.1", "org.skyscreamer:jsonassert:1.5.1", diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 012d6d90445..b916c04dbb2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists