Skip to content

Commit

Permalink
Upgrade OTel dependencies to v1.16.0 (#194)
Browse files Browse the repository at this point in the history
* Ignore class files

* Update deps

* Update licenses

* Add newline
  • Loading branch information
bryan-aguilar authored Jul 27, 2022
1 parent a759f7a commit c18a030
Show file tree
Hide file tree
Showing 143 changed files with 1,553 additions and 1,551 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,5 @@ dataSources

# JIRA plugin
atlassian-ide-plugin.xml

*.class
28 changes: 14 additions & 14 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.15.0"
val otelSnapshotVersion = "1.16.0"
val otelVersion = "1.16.0"
val otelSnapshotVersion = "1.17.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.243",
"com.amazonaws:aws-java-sdk-bom:1.12.269",
"com.fasterxml.jackson:jackson-bom:2.13.3",
"com.google.guava:guava-bom:31.1-jre",
"com.google.protobuf:protobuf-bom:3.21.1",
"com.linecorp.armeria:armeria-bom:1.16.0",
"io.grpc:grpc-bom:1.47.0",
"com.google.protobuf:protobuf-bom:3.21.4",
"com.linecorp.armeria:armeria-bom:1.17.1",
"io.grpc:grpc-bom:1.48.0",
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"}",
"org.apache.logging.log4j:log4j-bom:2.17.2",
"org.junit:junit-bom:5.8.2",
"org.springframework.boot:spring-boot-dependencies:2.7.0",
"org.testcontainers:testcontainers-bom:1.17.2",
"software.amazon.awssdk:bom:2.17.214"
"org.apache.logging.log4j:log4j-bom:2.18.0",
"org.junit:junit-bom:5.9.0",
"org.springframework.boot:spring-boot-dependencies:2.7.2",
"org.testcontainers:testcontainers-bom:1.17.3",
"software.amazon.awssdk:bom:2.17.240"
)

val DEPENDENCY_SETS = listOf(
Expand All @@ -70,12 +70,12 @@ val DEPENDENCY_SETS = listOf(

val DEPENDENCIES = listOf(
"commons-logging:commons-logging:1.2",
"com.sparkjava:spark-core:2.9.3",
"com.sparkjava:spark-core:2.9.4",
"com.squareup.okhttp3:okhttp:4.10.0",
"io.opentelemetry.contrib:opentelemetry-aws-xray:1.15.0",
"io.opentelemetry.contrib:opentelemetry-aws-xray:1.16.0",
"io.opentelemetry.proto:opentelemetry-proto:0.17.0-alpha",
"io.opentelemetry.javaagent:opentelemetry-javaagent:${if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"}",
"net.bytebuddy:byte-buddy:1.12.10"
"net.bytebuddy:byte-buddy:1.12.12"
)

javaPlatform {
Expand Down
606 changes: 303 additions & 303 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.

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.

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.

Loading

0 comments on commit c18a030

Please sign in to comment.