Skip to content

Commit

Permalink
Update dependencies and Otel to 1.21.0 (#303)
Browse files Browse the repository at this point in the history
* Update dependencies and Otel to 1.21.0

Signed-off-by: Raphael Silva <[email protected]>
  • Loading branch information
rapphil authored Jan 3, 2023
1 parent 88d9522 commit d013b0f
Show file tree
Hide file tree
Showing 154 changed files with 11 additions and 24,152 deletions.
22 changes: 11 additions & 11 deletions dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,24 @@ data class DependencySet(val group: String, val version: String, val modules: Li
val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"

// This is the version of the upstream instrumentation BOM
val otelVersion = "1.20.2"
val otelSnapshotVersion = "1.21.0"
val otelVersion = "1.21.0"
val otelSnapshotVersion = "1.22.0"

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

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

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

javaPlatform {
Expand Down Expand Up @@ -113,7 +113,7 @@ rootProject.allprojects {

fun isNonStable(version: String): Boolean {
val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
val regex = "^[0-9,.v-]+(-r)?$".toRegex()
val regex = "^[0-9,.v-]+(-r|-alpha)?$".toRegex()
val isGuava = version.endsWith("-jre")
val isStable = stableKeyword || regex.matches(version) || isGuava
return isStable.not()
Expand Down
206 changes: 0 additions & 206 deletions licenses/annotations-2.18.29.jar/META-INF/LICENSE.txt

This file was deleted.

25 changes: 0 additions & 25 deletions licenses/annotations-2.18.29.jar/META-INF/NOTICE.txt

This file was deleted.

Loading

0 comments on commit d013b0f

Please sign in to comment.