open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <ltulmin@splunk.com>
This commit is contained in:
renovate[bot] 2024-12-17 13:04:59 +02:00 committed by GitHub
parent 9865c17db8
commit df22b0f796
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conventions/build.gradle.kts
View File

@ -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")

2
dependencyManagement/build.gradle.kts
View File

@ -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}",

2
gradle-plugins/build.gradle.kts
View File

@ -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")

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

@ -7,7 +7,7 @@ package io.opentelemetry.smoketest.windows;
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 class ContainerLogFrameConsumer
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);