Skip to content

Commit d013b0f

Browse files
authored
Update dependencies and Otel to 1.21.0 (#303)
* Update dependencies and Otel to 1.21.0 Signed-off-by: Raphael Silva <[email protected]>
1 parent 88d9522 commit d013b0f

File tree

154 files changed

+11
-24152
lines changed

Some content is hidden

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

154 files changed

+11
-24152
lines changed

dependencyManagement/build.gradle.kts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,24 @@ 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.20.2"
31-
val otelSnapshotVersion = "1.21.0"
30+
val otelVersion = "1.21.0"
31+
val otelSnapshotVersion = "1.22.0"
3232

3333
// All versions below are only used in testing and do not affect the released artifact.
3434

3535
val DEPENDENCY_BOMS = listOf(
36-
"com.amazonaws:aws-java-sdk-bom:1.12.353",
36+
"com.amazonaws:aws-java-sdk-bom:1.12.375",
3737
"com.fasterxml.jackson:jackson-bom:2.14.1",
3838
"com.google.guava:guava-bom:31.1-jre",
39-
"com.google.protobuf:protobuf-bom:3.21.10",
40-
"com.linecorp.armeria:armeria-bom:1.20.3",
41-
"io.grpc:grpc-bom:1.51.0",
39+
"com.google.protobuf:protobuf-bom:3.21.12",
40+
"com.linecorp.armeria:armeria-bom:1.21.0",
41+
"io.grpc:grpc-bom:1.51.1",
4242
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"}",
4343
"org.apache.logging.log4j:log4j-bom:2.19.0",
4444
"org.junit:junit-bom:5.9.1",
4545
"org.springframework.boot:spring-boot-dependencies:2.7.5",
4646
"org.testcontainers:testcontainers-bom:1.17.6",
47-
"software.amazon.awssdk:bom:2.18.29"
47+
"software.amazon.awssdk:bom:2.19.7"
4848
)
4949

5050
val DEPENDENCY_SETS = listOf(
@@ -72,11 +72,11 @@ val DEPENDENCIES = listOf(
7272
"commons-logging:commons-logging:1.2",
7373
"com.sparkjava:spark-core:2.9.4",
7474
"com.squareup.okhttp3:okhttp:4.10.0",
75-
"io.opentelemetry.contrib:opentelemetry-aws-xray:1.20.1",
76-
"io.opentelemetry.contrib:opentelemetry-aws-resources:1.20.1-alpha",
75+
"io.opentelemetry.contrib:opentelemetry-aws-xray:1.21.0",
76+
"io.opentelemetry.contrib:opentelemetry-aws-resources:1.21.0-alpha",
7777
"io.opentelemetry.proto:opentelemetry-proto:0.19.0-alpha",
7878
"io.opentelemetry.javaagent:opentelemetry-javaagent:${if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"}",
79-
"net.bytebuddy:byte-buddy:1.12.19"
79+
"net.bytebuddy:byte-buddy:1.12.20"
8080
)
8181

8282
javaPlatform {
@@ -113,7 +113,7 @@ rootProject.allprojects {
113113

114114
fun isNonStable(version: String): Boolean {
115115
val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
116-
val regex = "^[0-9,.v-]+(-r)?$".toRegex()
116+
val regex = "^[0-9,.v-]+(-r|-alpha)?$".toRegex()
117117
val isGuava = version.endsWith("-jre")
118118
val isStable = stableKeyword || regex.matches(version) || isGuava
119119
return isStable.not()

licenses/annotations-2.18.29.jar/META-INF/LICENSE.txt

Lines changed: 0 additions & 206 deletions
This file was deleted.

licenses/annotations-2.18.29.jar/META-INF/NOTICE.txt

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)