Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Release Branch to main @v1.27.0 #445

Merged
merged 1 commit into from
Jun 20, 2023
Merged
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
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.26.0"
val otelSnapshotVersion = "1.27.0"
val otelVersion = "1.27.0"
val otelSnapshotVersion = "1.28.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.472",
"com.fasterxml.jackson:jackson-bom:2.15.1",
"com.amazonaws:aws-java-sdk-bom:1.12.490",
"com.fasterxml.jackson:jackson-bom:2.15.2",
"com.google.guava:guava-bom:32.0.1-jre",
"com.google.protobuf:protobuf-bom:3.23.1",
"com.linecorp.armeria:armeria-bom:1.23.1",
"io.grpc:grpc-bom:1.55.1",
"com.google.protobuf:protobuf-bom:3.23.3",
"com.linecorp.armeria:armeria-bom:1.24.0",
"io.grpc:grpc-bom:1.56.0",
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"}",
"org.apache.logging.log4j:log4j-bom:2.20.0",
"org.junit:junit-bom:5.9.3",
"org.springframework.boot:spring-boot-dependencies:2.7.12",
"org.testcontainers:testcontainers-bom:1.18.1",
"software.amazon.awssdk:bom:2.20.69"
"org.testcontainers:testcontainers-bom:1.18.3",
"software.amazon.awssdk:bom:2.20.87"
)

val DEPENDENCY_SETS = listOf(
Expand Down Expand Up @@ -73,10 +73,10 @@ val DEPENDENCIES = listOf(
"com.sparkjava:spark-core:2.9.4",
"com.squareup.okhttp3:okhttp:4.11.0",
"io.opentelemetry.contrib:opentelemetry-aws-xray:1.27.0",
"io.opentelemetry.contrib:opentelemetry-aws-resources:1.26.0-alpha",
"io.opentelemetry.contrib:opentelemetry-aws-resources:1.27.0-alpha",
"io.opentelemetry.proto:opentelemetry-proto:0.20.0-alpha",
"io.opentelemetry.javaagent:opentelemetry-javaagent:${if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"}",
"net.bytebuddy:byte-buddy:1.14.4"
"net.bytebuddy:byte-buddy:1.14.5"
)

javaPlatform {
Expand Down
27 changes: 27 additions & 0 deletions licenses/jetty-client-9.4.51.v20230217.jar/about.html

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

27 changes: 27 additions & 0 deletions licenses/jetty-http-9.4.51.v20230217.jar/about.html

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

27 changes: 27 additions & 0 deletions licenses/jetty-io-9.4.51.v20230217.jar/about.html

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

27 changes: 27 additions & 0 deletions licenses/jetty-security-9.4.51.v20230217.jar/about.html

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

27 changes: 27 additions & 0 deletions licenses/jetty-server-9.4.51.v20230217.jar/about.html

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

27 changes: 27 additions & 0 deletions licenses/jetty-servlet-9.4.51.v20230217.jar/about.html

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

27 changes: 27 additions & 0 deletions licenses/jetty-util-9.4.51.v20230217.jar/about.html

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

27 changes: 27 additions & 0 deletions licenses/jetty-util-ajax-9.4.51.v20230217.jar/about.html

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

Loading