Skip to content

Commit 2c46e43

Browse files
authored
Merge branch 'main' into ogu1208/kotlin-value-class-support
2 parents 5729ba6 + ba24c49 commit 2c46e43

File tree

135 files changed

+3868
-773
lines changed

Some content is hidden

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

135 files changed

+3868
-773
lines changed

.github/actions/main-build/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ runs:
1616
with:
1717
arguments: ${{ inputs.arguments }}
1818
encryptionKey: ${{ inputs.encryptionKey }}
19-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
19+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
2020
if: ${{ always() }}
2121
with:
2222
name: Open Test Reports (${{ github.job }})

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
with:
4646
persist-credentials: false
4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
48+
uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
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@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
63+
uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
6464
with:
6565
category: "/language:${{matrix.language}}"

.github/workflows/cross-version.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ jobs:
3333
type: ea
3434
- version: 26
3535
type: ea
36-
release: leydenpremain
36+
release: leyden
37+
- version: 26
38+
type: ea
39+
release: valhalla
3740
name: "OpenJDK ${{ matrix.jdk.version }} (${{ matrix.jdk.release || matrix.jdk.type }})"
3841
runs-on: ubuntu-latest
3942
steps:
@@ -71,7 +74,7 @@ jobs:
7174
-Dscan.tag.JDK_${{ matrix.jdk.version }} \
7275
build \
7376
--no-configuration-cache #Disable configuration cache due to https://github.com/diffplug/spotless/issues/2318
74-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
77+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
7578
if: ${{ always() }}
7679
with:
7780
name: Open Test Reports (${{ github.job }} ${{ matrix.jdk.version }} (${{ matrix.jdk.release || matrix.jdk.type }}))
@@ -114,7 +117,7 @@ jobs:
114117
-Dscan.tag.OpenJ9 \
115118
build \
116119
--no-configuration-cache # Disable configuration cache due to https://github.com/diffplug/spotless/issues/2318
117-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
120+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
118121
if: ${{ always() }}
119122
with:
120123
name: Open Test Reports (${{ github.job }})

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
fetch-depth: 1
3232
persist-credentials: false
3333
- name: Install GraalVM
34-
uses: graalvm/setup-graalvm@2a2412009026a83f51d179f92dc2b3fd4c8142df # v1.4.1
34+
uses: graalvm/setup-graalvm@eec48106e0bf45f2976c2ff0c3e22395cced8243 # v1.4.2
3535
with:
3636
distribution: graalvm-community
3737
version: 'latest'

.github/workflows/ossf-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
4949
# format to the repository Actions tab.
5050
- name: "Upload artifact"
51-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
51+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
5252
with:
5353
name: SARIF file
5454
path: results.sarif
@@ -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@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
60+
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
6161
with:
6262
sarif_file: results.sarif

.idea/icon.png

8.01 KB
Loading

CONTRIBUTING.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,18 @@ To deprecate an item:
177177

178178
## Building the Project
179179

180-
Please refer to [the readme](README.md#building-from-source) for the most common
181-
build commands.
180+
Please refer to [the readme](README.md#building-from-source) and [the documentation readme](documentation/README.md) for
181+
the most common build commands.
182+
183+
### Build Cache
184+
185+
Local builds can reuse outputs from previous CI builds via Gradle's [Build Cache](https://docs.gradle.org/current/userguide/build_cache.html).
186+
The default build cache server is located in the US.
187+
If you're in Europe, you can configure the build to use a build cache node located in the EU by adding the following to the `gradle.properties` file in your [Gradle user home](https://docs.gradle.org/current/userguide/directory_layout.html#dir:gradle_user_home):
188+
189+
```properties
190+
junit.develocity.buildCache.server=https://eu-build-cache-ge.junit.org
191+
```
182192

183193
### Build Parameters
184194

README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
# <img src="https://junit.org/assets/img/junit6-temporary-logo.png" align="right" width="100">JUnit
1+
<h1>
2+
<picture width="200">
3+
<source media="(prefers-color-scheme: dark)" srcset="https://junit.org/assets/img/junit-logo-inverted-darker.svg">
4+
<source media="(prefers-color-scheme: light)" srcset="https://junit.org/assets/img/junit-logo.svg">
5+
<img alt="JUnit" src="https://junit.org/assets/img/junit-logo.svg" width="200">
6+
</picture>
7+
</h1>
28

39
This repository is the home of JUnit Platform, Jupiter, and Vintage.
410

@@ -12,7 +18,7 @@ This repository is the home of JUnit Platform, Jupiter, and Vintage.
1218

1319
## Latest Releases
1420

15-
- General Availability (GA): [JUnit 6.0.0](https://github.com/junit-team/junit-framework/releases/tag/r6.0.0) (September 30, 2025)
21+
- General Availability (GA): [JUnit 6.0.1](https://github.com/junit-team/junit-framework/releases/tag/r6.0.1) (October 31, 2025)
1622
- Preview (Milestone/Release Candidate): N/A
1723

1824
## Documentation

RELEASING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
### Feature releases (x.y.0)
3131

32-
- [ ] Clear `accepted-breaking-changes.txt`, change `previousVersion` in `gradle.properties` to `x.y.0` on the release branch, and commit with message "Update API baseline and clear accepted breaking changes"
32+
- [ ] Delete `accepted-breaking-changes.csv` (if it exists), change `previousVersion` in `gradle.properties` to `x.y.0` on the release branch, and commit with message "Update API baseline and clear accepted breaking changes"
3333
- [ ] Fast-forward merge the release branch to `main` and push to GitHub
3434
- [ ] Update the [security policy](https://github.com/junit-team/junit-framework/blob/main/SECURITY.md) and commit with message "Update security policy to reflect 5.x release" or similar
3535
- [ ] Create release notes for the next feature release from the template
@@ -38,6 +38,6 @@
3838
### Patch releases (x.y.z)
3939

4040
- [ ] Cherry-pick the tagged commit from the release branch to `main` and resolve the conflict in `gradle.properties` by choosing the version of the `main` branch
41-
- [ ] Clear `accepted-breaking-changes.txt`, change `previousVersion` in `gradle.properties` to `x.y.z` on the release branch, and commit with message "Update API baseline and clear accepted breaking changes"
41+
- [ ] Delete `accepted-breaking-changes.csv` (if it exists), change `previousVersion` in `gradle.properties` to `x.y.z` on the release branch, and commit with message "Update API baseline and clear accepted breaking changes"
4242
- [ ] Include the release notes of the patch release on `main` if not already present
4343
- [ ] Update [JBang catalog](https://github.com/junit-team/jbang-catalog/blob/main/jbang-catalog.json)

documentation/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This following Gradle command generates the HTML version of the User Guide as
1818
`build/docs/asciidoc/user-guide/index.html`.
1919

2020
```
21-
gradlew asciidoctor
21+
./gradlew asciidoctor
2222
```
2323

2424
On Linux operating systems, the `graphviz` package providing `/usr/bin/dot` must be
@@ -30,5 +30,5 @@ This following Gradle command generates the PDF version of the User Guide to
3030
`build/docs/asciidocPdf/user-guide/index.pdf`.
3131

3232
```
33-
gradlew asciidoctorPdf
33+
./gradlew asciidoctorPdf
3434
```

0 commit comments

Comments
 (0)