Skip to content

Commit 54d3699

Browse files
trasktrask
authored
Merge branch 'main' into copilot/fix-4256
2 parents 500bdc2 + 7ac0007 commit 54d3699

File tree

24 files changed

+146
-146
lines changed

24 files changed

+146
-146
lines changed

‎agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.azure:azure-sdk-bom:1.2.35=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
66
io.netty:netty-bom:4.2.2.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.16.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.16.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.50.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.50.0=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.17.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.51.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.51.0=runtimeClasspath
1111
org.junit:junit-bom:5.13.3=runtimeClasspath
1212
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
1313
empty=

‎agent/agent-for-testing/gradle.lockfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.azure:azure-sdk-bom:1.2.35=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
66
io.netty:netty-bom:4.2.2.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.16.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.16.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.50.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.50.0=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.17.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.51.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.51.0=runtimeClasspath
1111
org.junit:junit-bom:5.13.3=runtimeClasspath
1212
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
1313
empty=

‎agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.azure:azure-sdk-bom:1.2.35=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.36.0=runtimeClasspath
77
io.netty:netty-bom:4.2.2.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.16.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.16.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.50.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.50.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.17.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.51.0-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.51.0=runtimeClasspath
1212
org.junit:junit-bom:5.13.3=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
1414
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath

‎agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.azure:azure-sdk-bom:1.2.35=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.36.0=runtimeClasspath
77
io.netty:netty-bom:4.2.2.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.16.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.16.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.50.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.50.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.17.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.51.0-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.51.0=runtimeClasspath
1212
org.junit:junit-bom:5.13.3=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
1414
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath

‎agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.azure:azure-sdk-bom:1.2.35=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
66
io.netty:netty-bom:4.2.2.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.16.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.16.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.50.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.50.0=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.17.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.51.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.51.0=runtimeClasspath
1111
org.junit:junit-bom:5.13.3=runtimeClasspath
1212
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
1313
empty=

‎agent/agent-profiler/agent-alerting-api/gradle.lockfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.azure:azure-sdk-bom:1.2.35=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
66
io.netty:netty-bom:4.2.2.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.16.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.16.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.50.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.50.0=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.17.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.51.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.51.0=runtimeClasspath
1111
org.junit:junit-bom:5.13.3=runtimeClasspath
1212
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
1313
empty=

‎agent/agent-profiler/agent-alerting/gradle.lockfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.azure:azure-json:1.5.0=runtimeClasspath
5-
com.azure:azure-sdk-bom:1.2.35=runtimeClasspath
5+
com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
66
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
77
io.netty:netty-bom:4.2.2.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.16.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.16.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.50.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.50.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.17.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.51.0-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.51.0=runtimeClasspath
1212
org.junit:junit-bom:5.13.3=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
1414
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath

‎agent/agent-profiler/agent-diagnostics-api/gradle.lockfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.azure:azure-sdk-bom:1.2.35=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
66
io.netty:netty-bom:4.2.2.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.16.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.16.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.50.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.50.0=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.17.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.51.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.51.0=runtimeClasspath
1111
org.junit:junit-bom:5.13.3=runtimeClasspath
1212
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
1313
empty=

‎agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.azure:azure-sdk-bom:1.2.35=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
66
io.netty:netty-bom:4.2.2.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.16.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.16.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.50.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.50.0=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.17.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.51.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.51.0=runtimeClasspath
1111
org.junit:junit-bom:5.13.3=runtimeClasspath
1212
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
1313
empty=

‎agent/agent-profiler/agent-diagnostics/gradle.lockfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.azure:azure-sdk-bom:1.2.35=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
66
io.netty:netty-bom:4.2.2.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.16.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.16.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.50.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.50.0=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.17.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.51.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.51.0=runtimeClasspath
1111
org.junit:junit-bom:5.13.3=runtimeClasspath
1212
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
1313
empty=

0 commit comments

Comments
 (0)