Skip to content

Commit a6ebe7c

Browse files
mpkorstanjempkorstanje
authored
Merge branch 'main' into fix/prune-junit-start
2 parents b997b64 + 94dc7be commit a6ebe7c

File tree

38 files changed

+237
-171
lines changed

38 files changed

+237
-171
lines changed

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ jobs:
4141
build-mode: none
4242
steps:
4343
- name: Check out repository
44-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
44+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
4545
with:
4646
persist-credentials: false
4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
48+
uses: github/codeql-action/init@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
4949
with:
5050
languages: ${{ matrix.language }}
5151
build-mode: ${{ matrix.build-mode }}
@@ -60,6 +60,6 @@ jobs:
6060
-Dscan.tag.CodeQL \
6161
classes
6262
- name: Perform CodeQL Analysis
63-
uses: github/codeql-action/analyze@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
63+
uses: github/codeql-action/analyze@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
6464
with:
6565
category: "/language:${{matrix.language}}"

‎.github/workflows/cross-version.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
runs-on: ubuntu-latest
4242
steps:
4343
- name: Check out repository
44-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
44+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
4545
with:
4646
fetch-depth: 1
4747
persist-credentials: false
@@ -88,7 +88,7 @@ jobs:
8888
runs-on: ubuntu-latest
8989
steps:
9090
- name: Check out repository
91-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
91+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
9292
with:
9393
fetch-depth: 1
9494
persist-credentials: false

‎.github/workflows/gradle-dependency-submission.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
contents: write
1919
steps:
2020
- name: Check out repository
21-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
21+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2222
with:
2323
fetch-depth: 1
2424
persist-credentials: false

‎.github/workflows/main.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Check out repository
29-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
29+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
3030
with:
3131
fetch-depth: 1
3232
persist-credentials: false
@@ -54,7 +54,7 @@ jobs:
5454
runs-on: windows-latest
5555
steps:
5656
- name: Check out repository
57-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
57+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
5858
with:
5959
fetch-depth: 1
6060
persist-credentials: false
@@ -67,7 +67,7 @@ jobs:
6767
runs-on: macos-latest
6868
steps:
6969
- name: Check out repository
70-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
70+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
7171
with:
7272
fetch-depth: 1
7373
persist-credentials: false
@@ -86,7 +86,7 @@ jobs:
8686
if: github.event_name == 'push' && github.repository == 'junit-team/junit-framework' && (startsWith(github.ref, 'refs/heads/releases/') || github.ref == 'refs/heads/main')
8787
steps:
8888
- name: Check out repository
89-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
89+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
9090
with:
9191
fetch-depth: 1
9292
persist-credentials: false
@@ -114,7 +114,7 @@ jobs:
114114
runs-on: ubuntu-latest
115115
steps:
116116
- name: Check out repository
117-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
117+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
118118
with:
119119
fetch-depth: 1
120120
persist-credentials: false

‎.github/workflows/ossf-scorecard.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: "Checkout code"
24-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
24+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2525
with:
2626
persist-credentials: false
2727

@@ -57,6 +57,6 @@ jobs:
5757
# Upload the results to GitHub's code scanning dashboard (optional).
5858
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
5959
- name: "Upload to code-scanning"
60-
uses: github/codeql-action/upload-sarif@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
60+
uses: github/codeql-action/upload-sarif@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
6161
with:
6262
sarif_file: results.sarif

‎.github/workflows/release.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
id-token: write # required for build provenance attestation
3434
steps:
3535
- name: Check out repository
36-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
36+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
3737
with:
3838
fetch-depth: 1
3939
ref: "refs/tags/${{ env.RELEASE_TAG }}"
@@ -74,14 +74,14 @@ jobs:
7474
runs-on: ubuntu-latest
7575
steps:
7676
- name: Check out repository
77-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
77+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
7878
with:
7979
fetch-depth: 1
8080
ref: "refs/tags/${{ env.RELEASE_TAG }}"
8181
path: junit-framework
8282
persist-credentials: false
8383
- name: Check out examples repository
84-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
84+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
8585
with:
8686
repository: ${{ github.repository_owner }}/junit-examples
8787
token: ${{ secrets.JUNIT_BUILDS_GITHUB_TOKEN_EXAMPLES_REPO }}
@@ -118,7 +118,7 @@ jobs:
118118
issues: write
119119
steps:
120120
- name: Check out repository
121-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
121+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
122122
with:
123123
fetch-depth: 1
124124
persist-credentials: false
@@ -137,7 +137,7 @@ jobs:
137137
runs-on: ubuntu-latest
138138
steps:
139139
- name: Check out repository
140-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
140+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
141141
with:
142142
fetch-depth: 1
143143
ref: "refs/tags/${{ env.RELEASE_TAG }}"
@@ -160,7 +160,7 @@ jobs:
160160
runs-on: ubuntu-latest
161161
steps:
162162
- name: Check out repository
163-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
163+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
164164
with:
165165
fetch-depth: 1
166166
ref: "refs/tags/${{ env.RELEASE_TAG }}"
@@ -218,7 +218,7 @@ jobs:
218218
runs-on: ubuntu-latest
219219
steps:
220220
- name: Check out examples repository
221-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
221+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
222222
with:
223223
repository: ${{ github.repository_owner }}/junit-examples
224224
token: ${{ secrets.JUNIT_BUILDS_GITHUB_TOKEN_EXAMPLES_REPO }}
@@ -262,7 +262,7 @@ jobs:
262262
contents: write
263263
steps:
264264
- name: Check out repository
265-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
265+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
266266
with:
267267
fetch-depth: 1
268268
persist-credentials: false

‎.github/workflows/reproducible-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Check out repository
28-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
28+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2929
with:
3030
fetch-depth: 1
3131
persist-credentials: false

‎.github/workflows/zizmor-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
security-events: write
2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
24+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2525
with:
2626
persist-credentials: false
2727

2828
- name: Run zizmor 🌈
29-
uses: zizmorcore/zizmor-action@e673c3917a1aef3c65c972347ed84ccd013ecda4 # v0.2.0
29+
uses: zizmorcore/zizmor-action@e639db99335bc9038abc0e066dfcd72e23d26fb4 # v0.3.0

‎documentation/src/docs/asciidoc/link-attributes.adoc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ endif::[]
103103
:Events: {javadoc-root}/org.junit.platform.testkit/org/junit/platform/testkit/engine/Events.html[Events]
104104
:EventStatistics: {javadoc-root}/org.junit.platform.testkit/org/junit/platform/testkit/engine/EventStatistics.html[EventStatistics]
105105
:EventType: {javadoc-root}/org.junit.platform.testkit/org/junit/platform/testkit/engine/EventType.html[EventType]
106-
:Execution: {javadoc-root}/org.junit.platform.testkit/org/junit/platform/testkit/engine/Execution.html[Execution]
107106
:Executions: {javadoc-root}/org.junit.platform.testkit/org/junit/platform/testkit/engine/Executions.html[Executions]
108107
:TerminationInfo: {javadoc-root}/org.junit.platform.testkit/org/junit/platform/testkit/engine/TerminationInfo.html[TerminationInfo]
109108
:TestExecutionResultConditions: {javadoc-root}/org.junit.platform.testkit/org/junit/platform/testkit/engine/TestExecutionResultConditions.html[TestExecutionResultConditions]

‎documentation/src/docs/asciidoc/release-notes/index.adoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ include::{basedir}/release-notes-6.1.0-M2.adoc[]
2121

2222
include::{basedir}/release-notes-6.1.0-M1.adoc[]
2323

24+
include::{basedir}/release-notes-6.0.2.adoc[]
25+
2426
include::{basedir}/release-notes-6.0.1.adoc[]
2527

2628
include::{basedir}/release-notes-6.0.0.adoc[]

0 commit comments

Comments
 (0)