Skip to content

Commit 3ff16ed

Browse files
authored
Update OTel and dependencies (#165)
* Update OTel and dependencies * Update licenses
1 parent 50d6f7f commit 3ff16ed

File tree

98 files changed

+2723
-1458
lines changed

Some content is hidden

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

98 files changed

+2723
-1458
lines changed

dependencyManagement/build.gradle.kts

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,25 @@ data class DependencySet(val group: String, val version: String, val modules: Li
2626

2727
val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"
2828

29-
val otelVersion = "1.12.1"
30-
val otelSnapshotVersion = "1.13.0"
29+
// This is the only version that affects the released artifact.
30+
val otelVersion = "1.13.0"
31+
val otelSnapshotVersion = "1.14.0"
32+
33+
// All versions below are only used in testing and do not affect the released artifact.
3134

3235
val DEPENDENCY_BOMS = listOf(
33-
"com.amazonaws:aws-java-sdk-bom:1.12.185",
36+
"com.amazonaws:aws-java-sdk-bom:1.12.201",
3437
"com.fasterxml.jackson:jackson-bom:2.13.2.20220328",
3538
"com.google.guava:guava-bom:31.1-jre",
36-
"com.google.protobuf:protobuf-bom:3.19.4",
37-
"com.linecorp.armeria:armeria-bom:1.14.1",
38-
"io.grpc:grpc-bom:1.45.0",
39+
"com.google.protobuf:protobuf-bom:3.20.0",
40+
"com.linecorp.armeria:armeria-bom:1.15.0",
41+
"io.grpc:grpc-bom:1.45.1",
3942
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"}",
4043
"org.apache.logging.log4j:log4j-bom:2.17.2",
4144
"org.junit:junit-bom:5.8.2",
4245
"org.springframework.boot:spring-boot-dependencies:2.6.6",
43-
"org.testcontainers:testcontainers-bom:1.16.3",
44-
"software.amazon.awssdk:bom:2.17.156"
46+
"org.testcontainers:testcontainers-bom:1.17.1",
47+
"software.amazon.awssdk:bom:2.17.172"
4548
)
4649

4750
val DEPENDENCY_SETS = listOf(
@@ -72,7 +75,7 @@ val DEPENDENCIES = listOf(
7275
"io.opentelemetry.contrib:opentelemetry-aws-xray:1.12.0",
7376
"io.opentelemetry.proto:opentelemetry-proto:0.11.0-alpha",
7477
"io.opentelemetry.javaagent:opentelemetry-javaagent:${if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"}",
75-
"net.bytebuddy:byte-buddy:1.12.8"
78+
"net.bytebuddy:byte-buddy:1.12.9"
7679
)
7780

7881
javaPlatform {

0 commit comments

Comments
 (0)