Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,41 +27,41 @@ data class DependencySet(val group: String, val version: String, val modules: Li
val testSnapshots = rootProject.findProperty("testUpstreamSnapshots") == "true"

// This is the version of the upstream instrumentation BOM
val otelVersion = "2.10.0-adot2"
val otelSnapshotVersion = "2.11.0"
val otelVersion = "2.15.0"
val otelSnapshotVersion = "2.15.0"
val otelAlphaVersion = if (!testSnapshots) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
val otelJavaAgentVersion = if (!testSnapshots) otelVersion else "$otelSnapshotVersion-SNAPSHOT"
// All versions below are only used in testing and do not affect the released artifact.

val dependencyBoms = listOf(
"com.amazonaws:aws-java-sdk-bom:1.12.599",
"com.fasterxml.jackson:jackson-bom:2.16.0",
"com.google.guava:guava-bom:33.0.0-jre",
"com.google.protobuf:protobuf-bom:3.25.1",
"com.linecorp.armeria:armeria-bom:1.26.4",
"io.grpc:grpc-bom:1.59.1",
"com.amazonaws:aws-java-sdk-bom:1.12.782",
"com.fasterxml.jackson:jackson-bom:2.19.0",
"com.google.guava:guava-bom:33.4.8-jre",
"com.google.protobuf:protobuf-bom:4.30.2",
"com.linecorp.armeria:armeria-bom:1.32.5",
"io.grpc:grpc-bom:1.72.0",
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:$otelAlphaVersion",
"org.apache.logging.log4j:log4j-bom:2.21.1",
"org.junit:junit-bom:5.10.1",
"org.apache.logging.log4j:log4j-bom:2.24.3",
"org.junit:junit-bom:5.12.2",
"org.springframework.boot:spring-boot-dependencies:2.7.17",
"org.testcontainers:testcontainers-bom:1.19.3",
"software.amazon.awssdk:bom:2.21.33",
"org.testcontainers:testcontainers-bom:1.21.0",
"software.amazon.awssdk:bom:2.31.33",
)

val dependencySets = listOf(
DependencySet(
"org.assertj",
"3.24.2",
"3.27.3",
listOf("assertj-core"),
),
DependencySet(
"org.curioswitch.curiostack",
"2.2.0",
"2.7.0",
listOf("protobuf-jackson"),
),
DependencySet(
"org.slf4j",
"1.7.36",
"2.0.17",
listOf(
"slf4j-api",
"slf4j-simple",
Expand All @@ -70,15 +70,15 @@ val dependencySets = listOf(
)

val dependencyLists = listOf(
"commons-logging:commons-logging:1.2",
"commons-logging:commons-logging:1.3.5",
"com.sparkjava:spark-core:2.9.4",
"com.squareup.okhttp3:okhttp:4.12.0",
"io.opentelemetry.contrib:opentelemetry-aws-xray:1.39.0",
"io.opentelemetry.contrib:opentelemetry-aws-resources:1.39.0-alpha",
"io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha",
"io.opentelemetry.contrib:opentelemetry-aws-xray:1.46.0",
"io.opentelemetry.contrib:opentelemetry-aws-resources:1.46.0-alpha",
"io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha",
"io.opentelemetry.javaagent:opentelemetry-javaagent:$otelJavaAgentVersion",
"io.opentelemetry:opentelemetry-extension-aws:1.20.1",
"net.bytebuddy:byte-buddy:1.14.10",
"net.bytebuddy:byte-buddy:1.17.5",
)

javaPlatform {
Expand Down
41 changes: 41 additions & 0 deletions licenses/HdrHistogram-2.2.2.jar/META-INF/LICENSE.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 0 additions & 22 deletions licenses/checker-qual-3.41.0.jar/META-INF/LICENSE.txt

This file was deleted.

6 changes: 0 additions & 6 deletions licenses/commons-logging-1.2.jar/META-INF/NOTICE.txt

This file was deleted.

5 changes: 5 additions & 0 deletions licenses/commons-logging-1.3.5.jar/META-INF/NOTICE.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

206 changes: 0 additions & 206 deletions licenses/http-client-spi-2.29.23.jar/META-INF/LICENSE.txt

This file was deleted.

25 changes: 0 additions & 25 deletions licenses/http-client-spi-2.29.23.jar/META-INF/NOTICE.txt

This file was deleted.

Loading
Loading