Skip to content

Commit df22b0f

Browse files
fix(deps): update guava packages to v33.4.0-jre (minor) (#12900)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent 9865c17 commit df22b0f

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

conventions/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ dependencies {
5555

5656
// When updating, update above in plugins too
5757
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
58-
implementation("com.google.guava:guava:33.3.1-jre")
58+
implementation("com.google.guava:guava:33.4.0-jre")
5959
implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
6060
implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.5")
6161
implementation("org.apache.httpcomponents:httpclient:4.5.14")

dependencyManagement/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ val groovyVersion = "4.0.24"
2929
val DEPENDENCY_BOMS = listOf(
3030
"com.fasterxml.jackson:jackson-bom:2.18.2",
3131
"com.squareup.okio:okio-bom:3.9.1", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
32-
"com.google.guava:guava-bom:33.3.1-jre",
32+
"com.google.guava:guava-bom:33.4.0-jre",
3333
"org.apache.groovy:groovy-bom:${groovyVersion}",
3434
"io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
3535
"io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}",

gradle-plugins/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ val byteBuddyVersion = "1.15.11"
2828
val aetherVersion = "1.1.0"
2929

3030
dependencies {
31-
implementation("com.google.guava:guava:33.3.1-jre")
31+
implementation("com.google.guava:guava:33.4.0-jre")
3232
// we need to use byte buddy variant that does not shade asm
3333
implementation("net.bytebuddy:byte-buddy-gradle-plugin:${byteBuddyVersion}") {
3434
exclude(group = "net.bytebuddy", module = "byte-buddy")

smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/ContainerLogFrameConsumer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import com.github.dockerjava.api.async.ResultCallbackTemplate;
99
import com.github.dockerjava.api.model.Frame;
10-
import com.google.common.base.Charsets;
10+
import java.nio.charset.StandardCharsets;
1111
import java.util.ArrayList;
1212
import java.util.List;
1313

@@ -31,7 +31,7 @@ public void onNext(Frame frame) {
3131

3232
if (lineType != null) {
3333
byte[] bytes = frame.getPayload();
34-
String text = bytes == null ? "" : new String(bytes, Charsets.UTF_8);
34+
String text = bytes == null ? "" : new String(bytes, StandardCharsets.UTF_8);
3535

3636
for (Listener listener : listeners) {
3737
listener.accept(lineType, text);

0 commit comments

Comments
 (0)