Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: junit-team/junit-framework
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: r5.10.3
Choose a base ref
...
head repository: junit-team/junit-framework
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: r5.13.0
Choose a head ref
Loading
Showing 1,863 changed files with 66,507 additions and 19,052 deletions.
7 changes: 0 additions & 7 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
custom: https://junit.org/sponsoring
23 changes: 0 additions & 23 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

7 changes: 4 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
name: Bug report
name: Report a bug or regression
about: Create a report to help us improve

type: Bug
labels: ["type: bug"]
---

<!-- Please provide us the version of JUnit 5 you are using and, if possible, a failing unit test with your bug report. Don't forget to describe the rationale for this issue (e.g. expected vs. actual behavior). -->
<!-- Please provide us the version of JUnit 5 you are using and, if possible, a failing unit test with your bug report. Don't forget to describe the rationale for this issue (e.g. expected vs. actual behavior). Please also mention where it's a regression compared to a previous version. -->

## Steps to reproduce

8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: Ask a question
url: https://github.com/junit-team/junit5/discussions/categories/q-a
about: Please ask and answer questions here
- name: Ask a question (Stack Overflow)
url: https://stackoverflow.com/questions/tagged/junit5
about: Alternatively, ask questions here
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
---
name: Feature request
name: Request a feature or enhancement
about: Suggest an idea for this project

type: Feature
labels: ["type: new feature"]
---

<!-- Start by telling us what problem you’re trying to solve. Often a solution already exists! Please, don’t send pull requests to implement new features without first getting our support. -->
11 changes: 0 additions & 11 deletions .github/ISSUE_TEMPLATE/question.md

This file was deleted.

12 changes: 12 additions & 0 deletions .github/ISSUE_TEMPLATE/task.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
name: Create a task
about: Create a task for a specific piece of work
type: Task
labels: ["type: task"]
---

<!-- Please describe what needs to be done to consider this task completed. -->

## Deliverables

- [ ] ...
12 changes: 8 additions & 4 deletions .github/actions/main-build/action.yml
Original file line number Diff line number Diff line change
@@ -4,16 +4,20 @@ inputs:
arguments:
required: true
description: Gradle arguments
default: build
default: :platform-tooling-support-tests:test build --no-configuration-cache # Disable configuration cache due to https://github.com/diffplug/spotless/issues/2318
encryptionKey:
required: true
description: Gradle cache encryption key
runs:
using: "composite"
steps:
- uses: ./.github/actions/setup-test-jdk
- uses: ./.github/actions/run-gradle
with:
arguments: ${{ inputs.arguments }}
- uses: actions/upload-artifact@v3
encryptionKey: ${{ inputs.encryptionKey }}
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
if: ${{ always() }}
with:
name: Test Distribution trace files (${{ github.job }})
path: '**/build/test-results/*/trace.json'
name: Open Test Reports (${{ github.job }})
path: '**/build/reports/open-test-report.html'
17 changes: 17 additions & 0 deletions .github/actions/maven-central-user-token/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Prepare Maven Central user token
description: Compute the Maven Central user token from username and password
inputs:
username:
required: true
description: Maven Central username
password:
required: true
description: Maven Central password
runs:
using: "composite"
steps:
- shell: bash
run: |
USER_TOKEN=$(printf "${{ inputs.username }}:${{ inputs.password }}" | base64)
echo "::add-mask::$USER_TOKEN"
echo "MAVEN_CENTRAL_USER_TOKEN=$USER_TOKEN" >> $GITHUB_ENV
28 changes: 18 additions & 10 deletions .github/actions/run-gradle/action.yml
Original file line number Diff line number Diff line change
@@ -5,21 +5,29 @@ inputs:
required: true
description: Gradle arguments
default: build
encryptionKey:
required: true
description: Gradle cache encryption key
runs:
using: "composite"
steps:
- uses: actions/setup-java@v3
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
id: setup-gradle-jdk
with:
distribution: temurin
java-version: 17
- uses: gradle/gradle-build-action@v2
java-version: 21
check-latest: true
- uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
with:
cache-encryption-key: ${{ inputs.encryptionKey }}
- shell: bash
env:
JAVA_HOME: ${{ steps.setup-gradle-jdk.outputs.path }}
with:
arguments: |
-Porg.gradle.java.installations.auto-download=false
-Penterprise.predictiveTestSelection.enabled=${{ github.event_name == 'pull_request' }}
"-Dscan.value.GitHub job=${{ github.job }}"
javaToolchains
${{ inputs.arguments }}
run: |
./gradlew \
-Porg.gradle.java.installations.auto-download=false \
-Pjunit.develocity.predictiveTestSelection.enabled=true \
-Pjunit.develocity.predictiveTestSelection.selectRemainingTests=${{ github.event_name != 'pull_request' }} \
"-Dscan.value.GitHub job=${{ github.job }}" \
javaToolchains \
${{ inputs.arguments }}
10 changes: 8 additions & 2 deletions .github/actions/setup-test-jdk/action.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
name: Set up Test JDK
description: Sets up the JDK required to run platform-tooling-support-tests
inputs:
distribution:
required: true
description: 'The JDK distribution to use'
default: 'liberica'
runs:
using: "composite"
steps:
- uses: actions/setup-java@v3
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
distribution: temurin
distribution: ${{ inputs.distribution }}
java-version: 8
check-latest: true
- shell: bash
run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
6 changes: 5 additions & 1 deletion .codecov.yml → .github/codecov.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
comment: false

coverage:
status:
project:
default:
threshold: 1
threshold: "1"
informational: true
patch: off

codecov:
max_report_age: off
35 changes: 0 additions & 35 deletions .github/dependabot.yml

This file was deleted.

36 changes: 36 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
extends: [
'github>junit-team/renovate-config',
],
baseBranches: ["main", "/^develop\\/.*/"],
packageRules: [
{
matchCurrentValue: '/^2\\./',
allowedVersions: '(,3.0)',
matchPackageNames: [
'org.codehaus.groovy:{/,}**',
],
},
{
matchCurrentValue: '/^4\\./',
allowedVersions: '(,5.0)',
matchPackageNames: [
'org.apache.groovy:{/,}**',
],
},
{
matchCurrentValue: '/^1\\./',
allowedVersions: '/^1\\..*-groovy-2\\.*/',
matchPackageNames: [
'org.spockframework:{/,}**',
],
},
{
allowedVersions: '!/-SNAPSHOT$/',
matchPackageNames: [
'org.opentest4j.reporting:{/,}**',
],
},
],
}
30 changes: 30 additions & 0 deletions .github/scripts/checkBuildReproducibility.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/bin/bash -e

rm -f checksums-1.txt checksums-2.txt

SOURCE_DATE_EPOCH=$(date +%s)
export SOURCE_DATE_EPOCH

function calculate_checksums() {
OUTPUT=$1

./gradlew \
--configuration-cache \
--no-build-cache \
-Porg.gradle.java.installations.auto-download=false \
-Dscan.tag.Reproducibility \
clean \
assemble

find . -name '*.jar' \
| grep '/build/libs/' \
| grep --invert-match 'javadoc' \
| sort \
| xargs sha512sum > "${OUTPUT}"
}


calculate_checksums checksums-1.txt
calculate_checksums checksums-2.txt

diff checksums-1.txt checksums-2.txt
9 changes: 9 additions & 0 deletions .github/scripts/waitForUrl.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env bash

URL=$1
printf 'Waiting for %s' "$URL"
until curl --output /dev/null --silent --location --head --fail "$URL"; do
printf '.'
sleep 5
done
echo ' OK'
3 changes: 2 additions & 1 deletion .github/workflows/close-inactive-issues.yml
Original file line number Diff line number Diff line change
@@ -3,14 +3,15 @@ on:
schedule:
- cron: "30 1 * * *"
workflow_dispatch:
permissions: read-all
jobs:
close-issues:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v8
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
with:
only-labels: "status: waiting-for-feedback"
days-before-stale: 14
17 changes: 10 additions & 7 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -13,8 +13,10 @@ on:
schedule:
- cron: '0 19 * * 3'

permissions: read-all

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}

jobs:
analyze:
@@ -30,18 +32,19 @@ jobs:
- javascript
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
with:
languages: ${{ matrix.language }}
tools: latest
tools: linked
- name: Build
uses: ./.github/actions/run-gradle
with:
encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
arguments: |
--no-build-cache
-Dscan.tag.CodeQL
--no-build-cache \
-Dscan.tag.CodeQL \
allMainClasses
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
16 changes: 0 additions & 16 deletions .github/workflows/combine-prs.yml

This file was deleted.

Loading