diff --git a/conventions/build.gradle.kts b/conventions/build.gradle.kts index 14898ec5c59e..b8dc3ddefb66 100644 --- a/conventions/build.gradle.kts +++ b/conventions/build.gradle.kts @@ -55,7 +55,7 @@ dependencies { // When updating, update above in plugins too implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0") - implementation("com.google.guava:guava:33.3.1-jre") + implementation("com.google.guava:guava:33.4.0-jre") implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18") implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.5") implementation("org.apache.httpcomponents:httpclient:4.5.14") diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index ff190d857ca1..be972d48470e 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -29,7 +29,7 @@ val groovyVersion = "4.0.24" val DEPENDENCY_BOMS = listOf( "com.fasterxml.jackson:jackson-bom:2.18.2", "com.squareup.okio:okio-bom:3.9.1", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637 - "com.google.guava:guava-bom:33.3.1-jre", + "com.google.guava:guava-bom:33.4.0-jre", "org.apache.groovy:groovy-bom:${groovyVersion}", "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}", "io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}", diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts index eb10e875baa3..f7206d9558cf 100644 --- a/gradle-plugins/build.gradle.kts +++ b/gradle-plugins/build.gradle.kts @@ -28,7 +28,7 @@ val byteBuddyVersion = "1.15.11" val aetherVersion = "1.1.0" dependencies { - implementation("com.google.guava:guava:33.3.1-jre") + implementation("com.google.guava:guava:33.4.0-jre") // we need to use byte buddy variant that does not shade asm implementation("net.bytebuddy:byte-buddy-gradle-plugin:${byteBuddyVersion}") { exclude(group = "net.bytebuddy", module = "byte-buddy") diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/ContainerLogFrameConsumer.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/ContainerLogFrameConsumer.java index 63c68e329575..a58c93e68447 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/ContainerLogFrameConsumer.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/ContainerLogFrameConsumer.java @@ -7,7 +7,7 @@ import com.github.dockerjava.api.async.ResultCallbackTemplate; import com.github.dockerjava.api.model.Frame; -import com.google.common.base.Charsets; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; @@ -31,7 +31,7 @@ public void onNext(Frame frame) { if (lineType != null) { byte[] bytes = frame.getPayload(); - String text = bytes == null ? "" : new String(bytes, Charsets.UTF_8); + String text = bytes == null ? "" : new String(bytes, StandardCharsets.UTF_8); for (Listener listener : listeners) { listener.accept(lineType, text);