Skip to content

Commit

Permalink
Merge pull request #537 from humivo/release1.30Updates
Browse files Browse the repository at this point in the history
Update dependencies and Otel to v1.30.0
  • Loading branch information
humivo authored Sep 14, 2023
2 parents 5bfff7d + 30ecbbf commit 7dd69af
Show file tree
Hide file tree
Showing 78 changed files with 320 additions and 299 deletions.
12 changes: 6 additions & 6 deletions dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,25 @@ 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.29.0"
val otelSnapshotVersion = "1.30.0"
val otelVersion = "1.30.0"
val otelSnapshotVersion = "1.31.0"
val otelAlphaVersion = if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
val otelJavaAgentVersion = if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"
// 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.543",
"com.amazonaws:aws-java-sdk-bom:1.12.550",
"com.fasterxml.jackson:jackson-bom:2.15.2",
"com.google.guava:guava-bom:32.1.2-jre",
"com.google.protobuf:protobuf-bom:3.24.1",
"com.google.protobuf:protobuf-bom:3.24.3",
"com.linecorp.armeria:armeria-bom:1.25.2",
"io.grpc:grpc-bom:1.58.0",
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:$otelAlphaVersion",
"org.apache.logging.log4j:log4j-bom:2.20.0",
"org.junit:junit-bom:5.10.0",
"org.springframework.boot:spring-boot-dependencies:2.7.15",
"org.testcontainers:testcontainers-bom:1.19.0",
"software.amazon.awssdk:bom:2.20.140",
"software.amazon.awssdk:bom:2.20.147",
)

val DEPENDENCY_SETS = listOf(
Expand Down Expand Up @@ -77,7 +77,7 @@ val DEPENDENCIES = listOf(
"io.opentelemetry.contrib:opentelemetry-aws-resources:1.29.0-alpha",
"io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha",
"io.opentelemetry.javaagent:opentelemetry-javaagent:$otelJavaAgentVersion",
"net.bytebuddy:byte-buddy:1.14.7",
"net.bytebuddy:byte-buddy:1.14.8",
)

javaPlatform {
Expand Down
548 changes: 277 additions & 271 deletions licenses/licenses.md

Large diffs are not rendered by default.

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.

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.

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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.

0 comments on commit 7dd69af

Please sign in to comment.