Skip to content

Commit 7dd69af

Browse files
authored
Merge pull request #537 from humivo/release1.30Updates
Update dependencies and Otel to v1.30.0
2 parents 5bfff7d + 30ecbbf commit 7dd69af

File tree

78 files changed

+320
-299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+320
-299
lines changed

dependencyManagement/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,25 @@ data class DependencySet(val group: String, val version: String, val modules: Li
2727
val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"
2828

2929
// This is the version of the upstream instrumentation BOM
30-
val otelVersion = "1.29.0"
31-
val otelSnapshotVersion = "1.30.0"
30+
val otelVersion = "1.30.0"
31+
val otelSnapshotVersion = "1.31.0"
3232
val otelAlphaVersion = if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
3333
val otelJavaAgentVersion = if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"
3434
// All versions below are only used in testing and do not affect the released artifact.
3535

3636
val DEPENDENCY_BOMS = listOf(
37-
"com.amazonaws:aws-java-sdk-bom:1.12.543",
37+
"com.amazonaws:aws-java-sdk-bom:1.12.550",
3838
"com.fasterxml.jackson:jackson-bom:2.15.2",
3939
"com.google.guava:guava-bom:32.1.2-jre",
40-
"com.google.protobuf:protobuf-bom:3.24.1",
40+
"com.google.protobuf:protobuf-bom:3.24.3",
4141
"com.linecorp.armeria:armeria-bom:1.25.2",
4242
"io.grpc:grpc-bom:1.58.0",
4343
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:$otelAlphaVersion",
4444
"org.apache.logging.log4j:log4j-bom:2.20.0",
4545
"org.junit:junit-bom:5.10.0",
4646
"org.springframework.boot:spring-boot-dependencies:2.7.15",
4747
"org.testcontainers:testcontainers-bom:1.19.0",
48-
"software.amazon.awssdk:bom:2.20.140",
48+
"software.amazon.awssdk:bom:2.20.147",
4949
)
5050

5151
val DEPENDENCY_SETS = listOf(
@@ -77,7 +77,7 @@ val DEPENDENCIES = listOf(
7777
"io.opentelemetry.contrib:opentelemetry-aws-resources:1.29.0-alpha",
7878
"io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha",
7979
"io.opentelemetry.javaagent:opentelemetry-javaagent:$otelJavaAgentVersion",
80-
"net.bytebuddy:byte-buddy:1.14.7",
80+
"net.bytebuddy:byte-buddy:1.14.8",
8181
)
8282

8383
javaPlatform {

0 commit comments

Comments
 (0)