Merge branch 'junit-team:main' into file_source_reuse

Author: lslonina

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: Ask a question
-    url: https://github.com/junit-team/junit5/discussions/categories/q-a
+    url: https://github.com/junit-team/junit-framework/discussions/categories/q-a
     about: Please ask and answer questions here
   - name: Ask a question (Stack Overflow)
     url: https://stackoverflow.com/questions/tagged/junit5

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,18 +1,16 @@
-## Overview
-
 <!-- Please describe your changes here and list any open questions you might have. -->
 
 ---
 
-I hereby agree to the terms of the [JUnit Contributor License Agreement](https://github.com/junit-team/junit5/blob/002a0052926ddee57cf90580fa49bc37e5a72427/CONTRIBUTING.md#junit-contributor-license-agreement).
+I hereby agree to the terms of the [JUnit Contributor License Agreement](https://github.com/junit-team/junit-framework/blob/002a0052926ddee57cf90580fa49bc37e5a72427/CONTRIBUTING.md#junit-contributor-license-agreement).
 
 ---
 
 ### Definition of Done
 
 - [ ] There are no TODOs left in the code
-- [ ] Method [preconditions](https://junit.org/junit5/docs/snapshot/api/org.junit.platform.commons/org/junit/platform/commons/util/Preconditions.html) are checked and documented in the method's Javadoc
-- [ ] [Coding conventions](https://github.com/junit-team/junit5/blob/HEAD/CONTRIBUTING.md#coding-conventions) (e.g. for logging) have been followed
-- [ ] Change is covered by [automated tests](https://github.com/junit-team/junit5/blob/HEAD/CONTRIBUTING.md#tests) including corner cases, errors, and exception handling
-- [ ] Public API has [Javadoc](https://github.com/junit-team/junit5/blob/HEAD/CONTRIBUTING.md#javadoc) and [`@API` annotations](https://apiguardian-team.github.io/apiguardian/docs/current/api/org/apiguardian/api/API.html)
-- [ ] Change is documented in the [User Guide](https://junit.org/junit5/docs/snapshot/user-guide/) and [Release Notes](https://junit.org/junit5/docs/snapshot/user-guide/#release-notes)
+- [ ] Method [preconditions](https://docs.junit.org/snapshot/api/org.junit.platform.commons/org/junit/platform/commons/util/Preconditions.html) are checked and documented in the method's Javadoc
+- [ ] [Coding conventions](https://github.com/junit-team/junit-framework/blob/HEAD/CONTRIBUTING.md#coding-conventions) (e.g. for logging) have been followed
+- [ ] Change is covered by [automated tests](https://github.com/junit-team/junit-framework/blob/HEAD/CONTRIBUTING.md#tests) including corner cases, errors, and exception handling
+- [ ] Public API has [Javadoc](https://github.com/junit-team/junit-framework/blob/HEAD/CONTRIBUTING.md#javadoc) and [`@API` annotations](https://apiguardian-team.github.io/apiguardian/docs/current/api/org/apiguardian/api/API.html)
+- [ ] Change is documented in the [User Guide](https://docs.junit.org/snapshot/user-guide/) and [Release Notes](https://docs.junit.org/snapshot/user-guide/#release-notes)

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

@@ -4,7 +4,7 @@ inputs:
   arguments:
     required: true
     description: Gradle arguments
-    default: :platform-tooling-support-tests:test build --no-configuration-cache # Disable configuration cache due to https://github.com/diffplug/spotless/issues/2318
+    default: :platform-tooling-support-tests:test build eclipse --no-configuration-cache # Disable configuration cache due to https://github.com/diffplug/spotless/issues/2318
   encryptionKey:
     required: true
     description: Gradle cache encryption key

.github/actions/maven-central-user-token/action.yml

@@ -11,7 +11,10 @@ runs:
   using: "composite"
   steps:
     - shell: bash
-      run: |
-        USER_TOKEN=$(printf "${{ inputs.username }}:${{ inputs.password }}" | base64)
+      run: | # zizmor: ignore[github-env]
+        USER_TOKEN=$(printf "${USERNAME}:${PASSWORD}" | base64)
         echo "::add-mask::$USER_TOKEN"
         echo "MAVEN_CENTRAL_USER_TOKEN=$USER_TOKEN" >> $GITHUB_ENV
+      env:
+        USERNAME: ${{ inputs.username }}
+        PASSWORD: ${{ inputs.password }}

.github/actions/run-gradle/action.yml

@@ -11,19 +11,19 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+    - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       id: setup-gradle-jdk
       with:
         distribution: temurin
         java-version: 24
         check-latest: true
-    - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
+    - uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
       with:
         cache-encryption-key: ${{ inputs.encryptionKey }}
     - shell: bash
       env:
         JAVA_HOME: ${{ steps.setup-gradle-jdk.outputs.path }}
-      run: |
+      run: | # zizmor: ignore[template-injection]
         ./gradlew \
         -Porg.gradle.java.installations.auto-download=false \
         -Pjunit.develocity.predictiveTestSelection.enabled=true \

.github/actions/setup-test-jdk/action.yml

@@ -8,17 +8,17 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+    - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
         distribution: ${{ inputs.distribution }}
         java-version: 8
         check-latest: true
     - shell: bash
-      run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
-    - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
+      run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV # zizmor: ignore[github-env]
+    - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
         distribution: ${{ inputs.distribution }}
         java-version: 17
         check-latest: true
     - shell: bash
-      run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
+      run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV # zizmor: ignore[github-env]

.github/renovate.json5

@@ -11,13 +11,6 @@
         'org.codehaus.groovy:{/,}**',
       ],
     },
-    {
-      matchCurrentValue: '/^4\\./',
-      allowedVersions: '(,5.0)',
-      matchPackageNames: [
-        'org.apache.groovy:{/,}**',
-      ],
-    },
     {
       matchCurrentValue: '/^1\\./',
       allowedVersions: '/^1\\..*-groovy-2\\.*/',

.github/scripts/close-github-milestone.js

@@ -0,0 +1,37 @@
+module.exports = async ({ github, context }) => {
+    const releaseVersion = process.env.RELEASE_VERSION;
+    const query = `
+                query ($owner: String!, $repo: String!, $title: String!) {
+                    repository(owner: $owner, name: $repo) {
+                        milestones(first: 100, query: $title) {
+                            nodes {
+                                title
+                                number
+                                openIssueCount
+                            }
+                        }
+                    }
+                }
+            `;
+    const {repository} = await github.graphql(query, {
+        owner: context.repo.owner,
+        repo: context.repo.repo,
+        title: releaseVersion
+    });
+    const [milestone] = repository.milestones.nodes.filter(it => it.title === releaseVersion);
+    if (!milestone) {
+        throw new Error(`Milestone "${releaseVersion}" not found`);
+    }
+    if (milestone.openIssueCount > 0) {
+        throw new Error(`Milestone "${releaseVersion}" has ${milestone.openIssueCount} open issue(s)`);
+    }
+    const requestBody = {
+        owner: context.repo.owner,
+        repo: context.repo.repo,
+        milestone_number: milestone.number,
+        state: 'closed',
+        due_on: new Date().toISOString()
+    };
+    console.log(requestBody);
+    await github.rest.issues.updateMilestone(requestBody);
+};

.github/scripts/create-github-release.js

@@ -0,0 +1,14 @@
+module.exports = async ({ github, context }) => {
+    const releaseVersion = process.env.RELEASE_VERSION;
+    const requestBody = {
+        owner: context.repo.owner,
+        repo: context.repo.repo,
+        tag_name: `r${releaseVersion}`,
+        name: `JUnit ${releaseVersion}`,
+        generate_release_notes: true,
+        body: `JUnit ${releaseVersion} = Platform ${releaseVersion} + Jupiter ${releaseVersion} + Vintage ${releaseVersion}\n\nSee [Release Notes](https://docs.junit.org/${releaseVersion}/release-notes/).`,
+        prerelease: releaseVersion.includes("-"),
+    };
+    console.log(requestBody);
+    await github.rest.repos.createRelease(requestBody);
+};

.github/workflows/close-inactive-issues.yml

@@ -3,15 +3,15 @@ on:
   schedule:
     - cron: "30 1 * * *"
   workflow_dispatch:
-permissions: read-all
+permissions: {}
 jobs:
   close-issues:
     runs-on: ubuntu-latest
     permissions:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
+      - uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
         with:
           only-labels: "status: waiting-for-feedback"
           days-before-stale: 14