Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/v1.28.x] backport okio-bom version bump to otel-java #485

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .github/patches/release/v1.28.x/opentelemetry-java.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
commit e1d7f2edc6201e26649351aef28cf7b7f17726b3
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon Jul 10 09:38:16 2023 -0500

Bump com.squareup.okio:okio-bom from 3.3.0 to 3.4.0 (#5613)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
index 917446df7..df564c863 100644
--- a/dependencyManagement/build.gradle.kts
+++ b/dependencyManagement/build.gradle.kts
@@ -17,7 +17,7 @@ val DEPENDENCY_BOMS = listOf(
"com.google.protobuf:protobuf-bom:3.23.4",
"com.linecorp.armeria:armeria-bom:1.24.2",
"com.squareup.okhttp3:okhttp-bom:4.11.0",
- "com.squareup.okio:okio-bom:3.3.0", // applies to transitive dependencies of okhttp
+ "com.squareup.okio:okio-bom:3.4.0", // applies to transitive dependencies of okhttp
"io.grpc:grpc-bom:1.56.1",
"io.netty:netty-bom:4.1.94.Final",
"io.zipkin.brave:brave-bom:5.16.0",
4 changes: 4 additions & 0 deletions .github/patches/release/v1.28.x/versions
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
OTEL_JAVA_VERSION=v1.28.0
OTEL_JAVA_INSTRUMENTATION_VERSION=v1.28.0
OTEL_JAVA_CONTRIB_VERSION=v1.28.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you will not need this.


Loading