Merge branch 'JOSM:master' into minor-fixes

gabortim · Jun 20, 2024 · 83d3bf0 · 83d3bf0
2 parents 6f71082 + 064ab0a
commit 83d3bf0
Show file tree

Hide file tree

Showing 708 changed files with 11,586 additions and 8,329 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.github/workflows/ant-test.yml b/.github/workflows/ant-test.yml
@@ -19,31 +19,31 @@ jobs:
       fail-fast: false
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
-        java: [8, 11, 17, 21, 22-ea]
+        java: [11, 17, 21, 22]
         os: [ubuntu-latest, macos-latest, windows-latest]
     name: Java ${{ matrix.java }} on ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 256
 
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.ivy2/cache/
             ~/work/josm/josm/tools/
           key: ${{ runner.os }}-ivy2-${{ hashFiles('build.xml', 'ivy.xml', 'tools/ivy.xml') }}
 
       - name: Setup Java ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
 
       - name: Install Ant
-        uses: JOSM/JOSMPluginAction/actions/setup-ant@v1
+        uses: JOSM/JOSMPluginAction/actions/setup-ant@v2
 
       - name: Test with Ant
         run: |
@@ -56,12 +56,13 @@ jobs:
 
       - name: Upload Ant reports
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Ant reports for JOSM ${{ needs.createrelease.outputs.josm_revision }} on java ${{ matrix.java }} on ${{ matrix.os }}
           path: |
             test/report/*.txt
             test/report/TEST*.xml
+            hs_err*
 
   publish-test-results:
     name: "Publish Unit Tests Results"
@@ -72,13 +73,13 @@ jobs:
 
     steps:
       - name: Download Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
 
       - name: Publish Test Report with action-junit-report
         if: ${{ always() }}
-        uses: mikepenz/action-junit-report@v3
+        uses: mikepenz/action-junit-report@v4
         with:
           report_paths: 'artifacts/**/*.xml'
           token: ${{ secrets.GITHUB_TOKEN }}