Skip to content

Commit e60c76a

Browse files
authored
Merge branch 'main' into dependabot/gradle/com.github.oshi-oshi-core-6.11.1
2 parents e0f2835 + 4cbf322 commit e60c76a

40 files changed

Lines changed: 277 additions & 74 deletions

File tree

.github/workflows/build-common.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
${{ inputs.no-build-cache && '--no-build-cache' || '' }}
121121
122122
- name: Upload snapshot
123-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
123+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
124124
with:
125125
path: agent/agent/build/libs/applicationinsights-agent-*-SNAPSHOT.jar
126126

@@ -254,7 +254,7 @@ jobs:
254254
echo "UPLOAD_ARTIFACT_NAME=$artifact_name" >> $GITHUB_ENV
255255
256256
- name: Upload smoke test reports
257-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
257+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
258258
if: failure()
259259
with:
260260
name: ${{ env.UPLOAD_ARTIFACT_NAME }}

.github/workflows/codeql-daily.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6
3131

3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4
33+
uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
3434
with:
3535
languages: java
3636

@@ -39,7 +39,7 @@ jobs:
3939
run: ./gradlew assemble --no-build-cache
4040

4141
- name: Perform CodeQL analysis
42-
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4
42+
uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
4343
with:
4444
category: java
4545

@@ -74,7 +74,7 @@ jobs:
7474
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6
7575

7676
- name: Initialize CodeQL
77-
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4
77+
uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
7878
with:
7979
languages: cpp
8080
debug: true
@@ -118,7 +118,7 @@ jobs:
118118
)
119119
120120
- name: Perform CodeQL analysis
121-
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4
121+
uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
122122
with:
123123
category: cpp
124124

.github/workflows/owasp-dependency-check-daily.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
- name: Upload report
3030
if: always()
31-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
31+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
3232
with:
3333
path: agent/agent/build/reports
3434

Lines changed: 2 additions & 2 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.3.5=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.6=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath
66
io.netty:netty-bom:4.2.12.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath
1111
org.junit:junit-bom:5.14.3=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath
1313
empty=
Lines changed: 2 additions & 2 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.3.5=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.6=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath
66
io.netty:netty-bom:4.2.12.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath
1111
org.junit:junit-bom:5.14.3=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath
1313
empty=
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
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.3.5=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.6=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath
6-
com.google.errorprone:error_prone_annotations:2.46.0=runtimeClasspath
6+
com.google.errorprone:error_prone_annotations:2.48.0=runtimeClasspath
77
io.netty:netty-bom:4.2.12.Final=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath
99
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath
1111
io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath
1212
org.junit:junit-bom:5.14.3=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
14-
org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath
14+
org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath
1515
empty=
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
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.3.5=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.6=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath
6-
com.google.errorprone:error_prone_annotations:2.46.0=runtimeClasspath
6+
com.google.errorprone:error_prone_annotations:2.48.0=runtimeClasspath
77
io.netty:netty-bom:4.2.12.Final=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath
99
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath
1111
io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath
1212
org.junit:junit-bom:5.14.3=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
14-
org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath
14+
org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath
1515
empty=
Lines changed: 2 additions & 2 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.3.5=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.6=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath
66
io.netty:netty-bom:4.2.12.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath
1111
org.junit:junit-bom:5.14.3=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath
1313
empty=
Lines changed: 2 additions & 2 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.3.5=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.6=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath
66
io.netty:netty-bom:4.2.12.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath
1111
org.junit:junit-bom:5.14.3=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath
1313
empty=

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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.1=runtimeClasspath
5-
com.azure:azure-sdk-bom:1.3.5=runtimeClasspath
5+
com.azure:azure-sdk-bom:1.3.6=runtimeClasspath
66
com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath
77
io.netty:netty-bom:4.2.12.Final=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath
@@ -11,5 +11,5 @@ io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath
1111
io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath
1212
org.junit:junit-bom:5.14.3=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
14-
org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath
14+
org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath
1515
empty=

0 commit comments

Comments
 (0)