Merge branch 'refs/heads/3.x' into pr/assertjgh-2823

# Conflicts:
#	assertj-tests/assertj-integration-tests/assertj-core-kotlin/src/test/kotlin/org/assertj/core/tests/kotlin/Assertions_describedAs_text_supplier_Test.kt

Author: scordio

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: [joel-costigliola, scordio]
+tidelift: maven/org.assertj:assertj-core

.github/workflows/binary-compatibility.yml

@@ -8,123 +8,59 @@ on:
     paths:
       - 'assertj-core/**'
 
+env:
+  MAVEN_ARGS: -B -V -ntp -e -Djansi.passthrough=true -Dstyle.color=always -DskipTests
+
 jobs:
   verify-with-base:
     name: Verify with target branch
     runs-on: ubuntu-latest
     if: github.base_ref != null
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: '21'
           cache: 'maven'
 
       - name: Checkout `${{ github.base_ref }}` into subfolder
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.base_ref }}
           path: ${{ github.run_id }}.${{ github.base_ref }}
       - name: Build `${{ github.base_ref }}`
-        run: >
-          ./mvnw -B -V --no-transfer-progress -e -f ${{ github.run_id }}.${{ github.base_ref }}/assertj-core/pom.xml package 
-          -DskipTests
-          -Djansi.passthrough=true
-          -Dstyle.color=always
+        run: ./mvnw $MAVEN_ARGS -f ${{ github.run_id }}.${{ github.base_ref }}/assertj-core/pom.xml package
       - name: Compare `${{ github.head_ref }}` with `${{ github.base_ref }}`
         run: >
-          ./mvnw -B -V --no-transfer-progress -e -f assertj-core/pom.xml -Pjapicmp-branch package japicmp:cmp
-          -DskipTests
+          ./mvnw $MAVEN_ARGS -f assertj-core/pom.xml -Pjapicmp-branch package japicmp:cmp
           -Djapicmp.breakBuildOnBinaryIncompatibleModifications=true
           -Djapicmp.oldVersion.basedir=${{ github.run_id }}.${{ github.base_ref }}/assertj-core
-          -Djansi.passthrough=true
-          -Dstyle.color=always
-
-      - name: Add label
-        if: failure()
-        uses: actions/github-script@v6
-        continue-on-error: true
-        with:
-          script: |
-            github.rest.issues.addLabels({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-              labels: ['binary incompatible with: base']
-            })
-
-      - name: Remove label
-        if: success()
-        uses: actions/github-script@v6
-        continue-on-error: true
-        with:
-          script: |
-            github.rest.issues.removeLabel({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-              name: 'binary incompatible with: base'
-            })
 
       - name: Add result to job summary
         if: success() || failure()
         run: |
           echo '```' >> $GITHUB_STEP_SUMMARY
           cat assertj-core/target/japicmp/default-cli.diff >> $GITHUB_STEP_SUMMARY
-      - name: Upload reports
-        if: success() || failure()
-        uses: actions/upload-artifact@v3
-        with:
-          name: japicmp
-          path: assertj-core/target/japicmp
-          if-no-files-found: error
 
   verify-with-release:
 
     name: Verify with latest release
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: '21'
           cache: 'maven'
 
       - name: Compare with the latest release
         run: >
-          ./mvnw -B -V --no-transfer-progress -e -f assertj-core/pom.xml package japicmp:cmp
-          -DskipTests
+          ./mvnw $MAVEN_ARGS -f assertj-core/pom.xml package japicmp:cmp
           -Djapicmp.breakBuildOnBinaryIncompatibleModifications=true
-          -Djansi.passthrough=true
-          -Dstyle.color=always
-
-      - name: Add label
-        if: github.base_ref != null && failure()
-        uses: actions/github-script@v6
-        with:
-          script: |
-            github.rest.issues.addLabels({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-              labels: ['binary incompatible with: release']
-            })
-      - name: Remove label
-        if: github.base_ref != null && success()
-        uses: actions/github-script@v6
-        continue-on-error: true
-        with:
-          script: |
-            github.rest.issues.removeLabel({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-              name: 'binary incompatible with: release'
-            })
 
       - name: Add result to job summary
         if: success() || failure()
@@ -133,7 +69,7 @@ jobs:
           cat assertj-core/target/japicmp/default-cli.diff >> $GITHUB_STEP_SUMMARY
       - name: Upload reports
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: japicmp
           path: assertj-core/target/japicmp

.github/workflows/cross-version.yml

@@ -2,26 +2,25 @@ name: Cross-Version
 
 on: [push, pull_request]
 
+env:
+  MAVEN_ARGS: -B -V -ntp -e -Djansi.passthrough=true -Dstyle.color=always -Djacoco.skip=true
+
 jobs:
 
   test_java:
     name: Java ${{ matrix.java }}
     strategy:
       fail-fast: false
       matrix:
-        java: [19, 20, 21]
+        java: [22, 23]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Java
         uses: oracle-actions/setup-java@v1
         with:
           website: jdk.java.net
           release: ${{ matrix.java }}
           version: latest
       - name: Test
-        run: >
-          ./mvnw -B -V --no-transfer-progress -e verify javadoc:javadoc
-          -Djacoco.skip=true
-          -Djansi.passthrough=true
-          -Dstyle.color=always
+        run: ./mvnw $MAVEN_ARGS verify

.github/workflows/dependency-graph.yml

@@ -0,0 +1,24 @@
+name: Dependency Graph
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+
+  dependency_graph:
+
+    name: Update
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '21'
+          cache: 'maven'
+      - name: Update dependency graph
+        uses: advanced-security/maven-dependency-submission-action@v4

.github/workflows/main.yml

@@ -2,72 +2,69 @@ name: CI
 
 on: [push, pull_request]
 
+env:
+  MAVEN_ARGS: -B -V -ntp -e -Djansi.passthrough=true -Dstyle.color=always
+
 jobs:
 
   test_os:
+
     name: OS ${{ matrix.os }}
-    permissions:
-      # Needed for test reporting
-      checks: write
-      pull-requests: write
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - os: ubuntu-latest
-            comment-test-results: true
-          - os: macOS-latest
-            comment-test-results: false
-          - os: windows-latest
-            comment-test-results: false
+        os: [ubuntu-latest, macOS-latest, windows-latest]
     runs-on: ${{ matrix.os }}
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: '21'
           cache: 'maven'
       - name: Test
-        # Note: arguments with a period or bang in them have to be single quoted to prevent
-        # confusing the PowerShell instance on Windows runners.
-        run: >
-          ./mvnw -B -V --no-transfer-progress -e verify javadoc:javadoc
-          '-Djansi.passthrough=true'
-          '-Dstyle.color=always'
+        run: ./mvnw $MAVEN_ARGS verify
+
+  javadoc:
 
-      - name: Publish unit test results
-        uses: EnricoMi/publish-unit-test-result-action@v2
-        if: ${{ matrix.comment-test-results }}
-        continue-on-error: true
+    name: Javadoc
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Java
+        uses: actions/setup-java@v4
         with:
-          check_name: "JUnit test results"
-          junit_files: "assertj*/**/target/surefire-reports/TEST-*.xml"
+          distribution: 'zulu'
+          java-version: '21'
+          cache: 'maven'
+      - name: Generate Javadoc
+        run: ./mvnw $MAVEN_ARGS -DskipTests package javadoc:javadoc
 
   sonar:
+
     name: Sonar code analysis
     runs-on: ubuntu-latest
     if: github.repository == 'assertj/assertj' && github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: '21'
           cache: 'maven'
       - name: Test with Sonar
         run: >
-          ./mvnw -B -V --no-transfer-progress -e verify javadoc:javadoc sonar:sonar
+          ./mvnw $MAVEN_ARGS verify sonar:sonar
           -Dsonar.host.url=https://sonarcloud.io
           -Dsonar.organization=assertj
           -Dsonar.projectKey=joel-costigliola_assertj-core
-          -Djansi.passthrough=true
-          -Dstyle.color=always
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/pitest-receive-pr.yml

@@ -15,6 +15,9 @@ name: Receive
 on:
   pull_request:
 
+env:
+  MAVEN_ARGS: -B -V -ntp -e -Djansi.passthrough=true -Dstyle.color=always
+
 jobs:
   store-pitest-feedback:
     # Only run on forked repos.
@@ -23,32 +26,28 @@ jobs:
 
     steps:
       - name: Checkout project
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # important to set a fetch depth of 2. By default the checkout action make no history available
           fetch-depth: 2
 
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: '21'
           cache: 'maven'
       - name: run pitest
         # pitest has been bound to a profile called pitest for normal running
         # we add config to analyse only changes made within a PR and treat surviving mutants as check errors
         # failWhenNoMutations is unset in the pom, as otherwise PRs that do not affect java code would fail
         run: >
-          mvn -B -e -Ppitest -Dfeatures="+GIT(from[HEAD~1]), +gitci" test
-          -Djansi.passthrough=true
-          -Dstyle.color=always
+          ./mvnw $MAVEN_ARGS -Ppitest -Dfeatures="+GIT(from[HEAD~1]), +gitci" test
       - name: aggregate files
         run: >
-          mvn -B -e -f assertj-core/pom.xml -Ppitest pitest-git:aggregate
-          -Djansi.passthrough=true
-          -Dstyle.color=always
+          ./mvnw $MAVEN_ARGS -f assertj-core/pom.xml -Ppitest pitest-git:aggregate
       - name: upload results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pitest
           path: target/assertj-core/pit-reports-ci/

.github/workflows/pitest-updated-pr.yml

@@ -19,20 +19,23 @@ on:
     types:
       - completed
 
+env:
+  MAVEN_ARGS: -B -V -ntp -e -Djansi.passthrough=true -Dstyle.color=always
+
 jobs:
   pitest-update-pr:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
     steps:
       - name: debug
-        uses: hmarr/debug-action@v2
+        uses: hmarr/debug-action@v3
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: '21'
       - name: Download artifact
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v3
         with:
           workflow: ${{ github.event.workflow_run.workflow_id }}
           name: pitest
@@ -43,6 +46,4 @@ jobs:
         # the code, but does mean the version here must be maintained. An alternative would be to checkout the code and use 
         # the github goal. This will work as long as the artifact is extracted to the maven target directory
         run: >
-          mvn -B -DrepoToken=${{ secrets.GITHUB_TOKEN }} com.groupcdg:pitest-github-maven-plugin:1.0.3:updatePR
-          -Djansi.passthrough=true
-          -Dstyle.color=always
+          ./mvnw $MAVEN_ARGS -DrepoToken=${{ secrets.GITHUB_TOKEN }} com.groupcdg:pitest-github-maven-plugin:1.1.1:updatePR