Skip to content

Commit

Permalink
Update dependencies and Otel to v1.19.0 (#240)
Browse files Browse the repository at this point in the history
  • Loading branch information
rapphil authored Oct 17, 2022
1 parent 11a4306 commit 3e31ad4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 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 only version that affects the released artifact.
val otelVersion = "1.18.0"
val otelSnapshotVersion = "1.19.0"
val otelVersion = "1.19.0"
val otelSnapshotVersion = "1.20.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.321",
"com.fasterxml.jackson:jackson-bom:2.13.4",
"com.amazonaws:aws-java-sdk-bom:1.12.322",
"com.fasterxml.jackson:jackson-bom:2.14.0-rc2",
"com.google.guava:guava-bom:31.1-jre",
"com.google.protobuf:protobuf-bom:3.21.7",
"com.linecorp.armeria:armeria-bom:1.20.1",
"io.grpc:grpc-bom:1.49.1",
"io.grpc:grpc-bom:1.50.0",
"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.4",
"org.testcontainers:testcontainers-bom:1.17.5",
"software.amazon.awssdk:bom:2.17.292"
"software.amazon.awssdk:bom:2.17.293"
)

val DEPENDENCY_SETS = listOf(
Expand All @@ -60,7 +60,7 @@ val DEPENDENCY_SETS = listOf(
),
DependencySet(
"org.slf4j",
"1.7.36",
"2.0.3",
listOf(
"slf4j-api",
"slf4j-simple"
Expand All @@ -72,10 +72,10 @@ 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.17.0",
"io.opentelemetry.contrib:opentelemetry-aws-xray:1.19.1",
"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.17"
"net.bytebuddy:byte-buddy:1.12.18"
)

javaPlatform {
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
pluginManagement {
plugins {
id("com.diffplug.spotless") version "6.11.0"
id("com.github.ben-manes.versions") version "0.42.0"
id("com.github.ben-manes.versions") version "0.43.0"
id("com.github.jk1.dependency-license-report") version "2.1"
id("com.github.johnrengelman.shadow") version "7.1.2"
id("com.google.cloud.tools.jib") version "3.3.0"
Expand Down

0 comments on commit 3e31ad4

Please sign in to comment.