Skip to content

Commit cb0cca6

Browse files
trasktrask
committed
Merge remote-tracking branch 'origin/main' into heya/release-3.6.2
2 parents f098591 + 40a0229 commit cb0cca6

File tree

36 files changed

+124
-100
lines changed

36 files changed

+124
-100
lines changed

‎agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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.28=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.29=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
66
io.netty:netty-bom:4.1.114.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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.28=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.29=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
66
io.netty:netty-bom:4.1.114.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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.28=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.29=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.34.0=runtimeClasspath
77
io.netty:netty-bom:4.1.114.Final=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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.28=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.29=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.34.0=runtimeClasspath
77
io.netty:netty-bom:4.1.114.Final=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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.28=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.29=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
66
io.netty:netty-bom:4.1.114.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath

‎agent/agent-gc-monitor/gc-monitor-tests/src/test/java/com/microsoft/gcmonitortests/VariousCollectorsTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.junit.jupiter.api.condition.EnabledForJreRange;
2121
import org.junit.jupiter.api.condition.EnabledOnOs;
2222

23+
@Disabled // TODO (trask) too flaky since we stopped re-running tests automatically on failure
2324
class VariousCollectorsTest {
2425

2526
@Test

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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.28=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.29=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
66
io.netty:netty-bom:4.1.114.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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.28=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.29=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
66
io.netty:netty-bom:4.1.114.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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.28=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.29=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
66
io.netty:netty-bom:4.1.114.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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.28=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.29=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
66
io.netty:netty-bom:4.1.114.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath

0 commit comments

Comments
 (0)