Skip to content

merge conflict #1

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Jul 9, 2024
Merged

merge conflict #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5eac108
Bump org.eclipse.jetty:jetty-servlet from 10.0.21 to 10.0.22 (#3767)
dependabot[bot] Jul 5, 2024
817bdf4
Bump com.azure:azure-sdk-bom from 1.2.24 to 1.2.25 (#3768)
dependabot[bot] Jul 5, 2024
873bc88
Bump org.owasp:dependency-check-gradle from 10.0.1 to 10.0.2 (#3770)
dependabot[bot] Jul 8, 2024
c0406ec
Bump com.fasterxml.jackson:jackson-bom from 2.17.1 to 2.17.2 (#3769)
dependabot[bot] Jul 8, 2024
2571ea2
Merge branch 't-nsukumar/experimentation' into main
navsukumar Jul 9, 2024
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
4 changes: 2 additions & 2 deletions agent/agent-bootstrap/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.5.0=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions agent/agent-for-testing/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.5.0=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.28.0=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.28.0=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.5.0=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions agent/agent-profiler/agent-alerting-api/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.5.0=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions agent/agent-profiler/agent-alerting/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.5.0=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions agent/agent-profiler/agent-diagnostics-api/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.5.0=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.5.0=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions agent/agent-profiler/agent-diagnostics-serialization/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.5.0=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions agent/agent-profiler/agent-diagnostics/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.5.0=runtimeClasspath
Expand Down
32 changes: 16 additions & 16 deletions agent/agent-tooling/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ ch.qos.logback.contrib:logback-json-classic:0.1.5=runtimeClasspath
ch.qos.logback.contrib:logback-json-core:0.1.5=runtimeClasspath
ch.qos.logback:logback-classic:1.3.14=runtimeClasspath
ch.qos.logback:logback-core:1.3.14=runtimeClasspath
com.azure:azure-core-http-netty:1.15.0=runtimeClasspath
com.azure:azure-core:1.49.0=runtimeClasspath
com.azure:azure-core-http-netty:1.15.1=runtimeClasspath
com.azure:azure-core:1.49.1=runtimeClasspath
com.azure:azure-identity:1.13.0=runtimeClasspath
com.azure:azure-json:1.1.0=runtimeClasspath
com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.26=runtimeClasspath
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.azure:azure-storage-blob:12.26.0=runtimeClasspath
com.azure:azure-storage-common:12.25.0=runtimeClasspath
com.azure:azure-storage-internal-avro:12.11.0=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.azure:azure-storage-blob:12.26.1=runtimeClasspath
com.azure:azure-storage-common:12.25.1=runtimeClasspath
com.azure:azure-storage-internal-avro:12.11.1=runtimeClasspath
com.azure:azure-xml:1.0.0=runtimeClasspath
com.fasterxml.jackson.core:jackson-annotations:2.17.1=runtimeClasspath
com.fasterxml.jackson.core:jackson-core:2.17.1=runtimeClasspath
com.fasterxml.jackson.core:jackson-databind:2.17.1=runtimeClasspath
com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.1=runtimeClasspath
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.1=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.fasterxml.woodstox:woodstox-core:6.6.2=runtimeClasspath
com.fasterxml.jackson.core:jackson-annotations:2.17.2=runtimeClasspath
com.fasterxml.jackson.core:jackson-core:2.17.2=runtimeClasspath
com.fasterxml.jackson.core:jackson-databind:2.17.2=runtimeClasspath
com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.2=runtimeClasspath
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
com.fasterxml.woodstox:woodstox-core:6.7.0=runtimeClasspath
com.github.oshi:oshi-core:6.6.1=runtimeClasspath
com.github.stephenc.jcip:jcip-annotations:1.0-1=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.28.0=runtimeClasspath
Expand Down Expand Up @@ -71,9 +71,9 @@ io.opentelemetry:opentelemetry-sdk-logs:1.39.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-metrics:1.39.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk-trace:1.39.0=runtimeClasspath
io.opentelemetry:opentelemetry-sdk:1.39.0=runtimeClasspath
io.projectreactor.netty:reactor-netty-core:1.0.43=runtimeClasspath
io.projectreactor.netty:reactor-netty-http:1.0.43=runtimeClasspath
io.projectreactor:reactor-core:3.4.36=runtimeClasspath
io.projectreactor.netty:reactor-netty-core:1.0.45=runtimeClasspath
io.projectreactor.netty:reactor-netty-http:1.0.45=runtimeClasspath
io.projectreactor:reactor-core:3.4.38=runtimeClasspath
net.java.dev.jna:jna-platform:5.14.0=runtimeClasspath
net.java.dev.jna:jna:5.14.0=runtimeClasspath
net.minidev:accessors-smart:2.5.0=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions agent/agent/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.5.0=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.5.0=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions agent/instrumentation/azure-functions-worker-stub/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.5.0=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions agent/instrumentation/azure-functions/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.5.0=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions agent/instrumentation/methods/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.5.0=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions agent/instrumentation/micrometer-1.0/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.5.0=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions agent/runtime-attach/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.35.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies {
implementation("com.github.johnrengelman:shadow:8.1.1")
implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.17.5")

implementation("org.owasp:dependency-check-gradle:10.0.1")
implementation("org.owasp:dependency-check-gradle:10.0.2")

implementation("io.opentelemetry.instrumentation:gradle-plugins:2.5.0-alpha")

Expand Down
4 changes: 2 additions & 2 deletions classic-sdk/core/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.5.0=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions classic-sdk/web/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.5.0=runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions dependencyManagement/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ rootProject.extra["otelInstrumentationAlphaVersion"] = otelInstrumentationAlphaV
rootProject.extra["otelContribAlphaVersion"] = otelContribAlphaVersion

val DEPENDENCY_BOMS = listOf(
"com.fasterxml.jackson:jackson-bom:2.17.1",
"com.fasterxml.jackson:jackson-bom:2.17.2",
"io.opentelemetry:opentelemetry-bom:${otelVersion}",
"io.opentelemetry:opentelemetry-bom-alpha:${otelVersion}-alpha",
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${otelInstrumentationVersion}",
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationAlphaVersion}",
"com.azure:azure-sdk-bom:1.2.24",
"com.azure:azure-sdk-bom:1.2.25",
"io.netty:netty-bom:4.1.111.Final",
"org.junit:junit-bom:5.10.3",
"org.testcontainers:testcontainers-bom:1.19.8",
Expand Down
4 changes: 2 additions & 2 deletions etw/java/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.24=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.1=runtimeClasspath
com.azure:azure-sdk-bom:1.2.25=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
io.netty:netty-bom:4.1.111.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.5.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.5.0=runtimeClasspath
Expand Down
0 ...n-annotations-2.17.1.jar/META-INF/LICENSE → ...n-annotations-2.17.2.jar/META-INF/LICENSE
View file
Open in desktop
File renamed without changes.
0 ...on-annotations-2.17.1.jar/META-INF/NOTICE → ...on-annotations-2.17.2.jar/META-INF/NOTICE
View file
Open in desktop
File renamed without changes.
0 .../jackson-core-2.17.1.jar/META-INF/LICENSE → .../jackson-core-2.17.2.jar/META-INF/LICENSE
View file
Open in desktop
File renamed without changes.
0 ...s/jackson-core-2.17.1.jar/META-INF/NOTICE → ...s/jackson-core-2.17.2.jar/META-INF/NOTICE
View file
Open in desktop
File renamed without changes.
0 ...kson-databind-2.17.1.jar/META-INF/LICENSE → ...kson-databind-2.17.2.jar/META-INF/LICENSE
View file
Open in desktop
File renamed without changes.
0 ...ckson-databind-2.17.1.jar/META-INF/NOTICE → ...ckson-databind-2.17.2.jar/META-INF/NOTICE
View file
Open in desktop
File renamed without changes.
0 ...tatype-jsr310-2.17.1.jar/META-INF/LICENSE → ...tatype-jsr310-2.17.2.jar/META-INF/LICENSE
View file
Open in desktop
File renamed without changes.
0 ...atatype-jsr310-2.17.1.jar/META-INF/NOTICE → ...atatype-jsr310-2.17.2.jar/META-INF/NOTICE
View file
Open in desktop
File renamed without changes.
Loading