Skip to content

Commit 0dddcf8

Browse files
committed
Merge remote-tracking branch 'upstream/main' into unify-jdbc-tests-2
2 parents 0304d33 + ce90a0e commit 0dddcf8

File tree

131 files changed

+2231
-830
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+2231
-830
lines changed

.github/workflows/auto-license-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
5353
- name: Upload patch file
5454
if: steps.create-patch.outputs.exists == 'true'
55-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
55+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
5656
with:
5757
path: patch
5858
name: patch

.github/workflows/auto-spotless.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
5252
- name: Upload patch file
5353
if: steps.create-patch.outputs.exists == 'true'
54-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
54+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
5555
with:
5656
path: patch
5757
name: patch

.github/workflows/auto-update-pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
pull-requests: write
1919
steps:
2020
- name: Download patch
21-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
21+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
2222
with:
2323
run-id: ${{ github.event.workflow_run.id }}
2424
path: ${{ runner.temp }}

.github/workflows/build-common.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ jobs:
219219
fi
220220
221221
- name: Upload agent jar
222-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
222+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
223223
with:
224224
name: opentelemetry-javaagent.jar
225225
path: javaagent/build/libs/opentelemetry-javaagent-*-SNAPSHOT.jar
@@ -230,7 +230,7 @@ jobs:
230230
mkdir sboms
231231
cp javaagent/build/spdx/*.spdx.json sboms
232232
233-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
233+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
234234
name: Upload SBOMs
235235
with:
236236
name: opentelemetry-java-instrumentation-SBOM.zip
@@ -381,15 +381,15 @@ jobs:
381381
382382
- name: Upload deadlock detector artifacts if any
383383
if: failure()
384-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
384+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
385385
with:
386386
name: deadlock-detector-test-${{ matrix.test-java-version }}-${{ matrix.vm }}-${{ matrix.test-partition }}-indy-${{ matrix.test-indy }}
387387
path: /tmp/deadlock-detector-*
388388
if-no-files-found: ignore
389389

390390
- name: Upload jvm crash dump files if any
391391
if: failure()
392-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
392+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
393393
with:
394394
name: javacore-test-${{ matrix.test-java-version }}-${{ matrix.test-partition }}
395395
path: |
@@ -461,7 +461,7 @@ jobs:
461461

462462
- name: Upload jvm crash dump files if any
463463
if: failure()
464-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
464+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
465465
with:
466466
name: javacore-smoke-test-${{ matrix.smoke-test-suite }}-${{ matrix.os }}
467467
# we expect crash dumps either in root director or in smoke-tests

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
cache-read-only: ${{ github.event_name == 'pull_request' }}
6464

6565
- name: Initialize CodeQL
66-
uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
66+
uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
6767
with:
6868
languages: ${{ matrix.language }}
6969
# using "linked" helps to keep up with the linked Kotlin support
@@ -84,6 +84,6 @@ jobs:
8484
--no-build-cache --no-daemon
8585
8686
- name: Perform CodeQL analysis
87-
uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
87+
uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
8888
with:
8989
category: "/language:${{matrix.language}}"

.github/workflows/ossf-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
# uploads of run results in SARIF format to the repository Actions tab.
3434
# https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
3535
- name: "Upload artifact"
36-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
36+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
3737
with:
3838
name: SARIF file
3939
path: results.sarif
@@ -42,6 +42,6 @@ jobs:
4242
# Upload the results to GitHub's code scanning dashboard (optional).
4343
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
45+
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
4646
with:
4747
sarif_file: results.sarif

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

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

3939
- name: Upload report
4040
if: always()
41-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
41+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
4242
with:
4343
path: javaagent/build/reports
4444

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
cp javaagent/build/spdx/*.spdx.json sboms
124124
zip opentelemetry-java-instrumentation-SBOM.zip sboms/*
125125
126-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
126+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
127127
name: Upload SBOMs
128128
with:
129129
name: opentelemetry-java-instrumentation-SBOM

.github/workflows/reusable-native-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2828
- id: read-java
2929
run: echo "version=$(cat .java-version)" >> "$GITHUB_OUTPUT"
30-
- uses: graalvm/setup-graalvm@2a2412009026a83f51d179f92dc2b3fd4c8142df # v1.4.1.1
30+
- uses: graalvm/setup-graalvm@eec48106e0bf45f2976c2ff0c3e22395cced8243 # v1.4.2.1
3131
with:
3232
version: "latest"
3333
java-version: ${{ matrix.test-java-version }}

.github/workflows/reusable-test-latest-deps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,15 @@ jobs:
131131
132132
- name: Upload deadlock detector artifacts if any
133133
if: failure()
134-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
134+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
135135
with:
136136
name: deadlock-detector-test-latest-${{ matrix.test-java-version }}-${{ matrix.vm }}-${{ matrix.test-partition }}
137137
path: /tmp/deadlock-detector-*
138138
if-no-files-found: ignore
139139

140140
- name: Upload jvm crash dump files if any
141141
if: failure()
142-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
142+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
143143
with:
144144
name: javacore-test-latest-${{ matrix.test-java-version }}-${{ matrix.test-partition }}
145145
path: |

0 commit comments

Comments
 (0)