Skip to content

Commit

Permalink
cherry pick open-telemetry#10041
Browse files Browse the repository at this point in the history
  • Loading branch information
breedx-splk committed Jan 23, 2024
1 parent 8c20056 commit 4e06994
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ val dependencyVersions = hashMapOf<String, String>()
rootProject.extra["versions"] = dependencyVersions

// this line is managed by .github/scripts/update-sdk-version.sh
val otelSdkVersion = "1.32.0"
val otelSdkVersion = "1.33.0"
val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")

// Need both BOM and groovy jars
Expand Down
2 changes: 1 addition & 1 deletion examples/distro/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ subprojects {
ext {
versions = [
// this line is managed by .github/scripts/update-sdk-version.sh
opentelemetrySdk : "1.32.0",
opentelemetrySdk : "1.33.0",

// these lines are managed by .github/scripts/update-version.sh
opentelemetryJavaagent : "1.32.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/extension/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ version '1.0'
ext {
versions = [
// this line is managed by .github/scripts/update-sdk-version.sh
opentelemetrySdk : "1.32.0",
opentelemetrySdk : "1.33.0",

// these lines are managed by .github/scripts/update-version.sh
opentelemetryJavaagent : "1.32.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ val v1_32Deps by configurations.creating {
isCanBeConsumed = false
// exclude the bom added by dependencyManagement
exclude("io.opentelemetry", "opentelemetry-bom")
exclude("io.opentelemetry", "opentelemetry-bom-alpha")
}

// configuration for publishing the shadowed artifact
Expand Down

0 comments on commit 4e06994

Please sign in to comment.