Index: /trunk/.github/workflows/ant-test.yml
===================================================================
--- /trunk/.github/workflows/ant-test.yml	(revision 18669)
+++ /trunk/.github/workflows/ant-test.yml	(revision 18670)
@@ -2,6 +2,4 @@
 env:
   junit_platform_version: '1.7.2'
-  # ANT_HOME is also our ant version
-  ANT_HOME: 'apache-ant-1.10.12'
 on:
   - push
@@ -27,10 +25,10 @@
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 256
 
       - name: Cache
-        uses: actions/cache@v2.0.0
+        uses: actions/cache@v3
         with:
           path: |
@@ -40,22 +38,15 @@
 
       - name: Setup Java ${{ matrix.java }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
 
-      - name: Install Ant ${{ env.ANT_HOME }}
-        run: |
-          if [ ! -f tools/${{ env.ANT_HOME }}-bin.tar.gz ]; then
-            curl -o tools/${{ env.ANT_HOME }}-bin.tar.gz https://downloads.apache.org/ant/binaries/${{ env.ANT_HOME }}-bin.tar.gz
-          fi
-          tar zxf tools/${{ env.ANT_HOME }}-bin.tar.gz
-
-      - name: Ant diagnostics
-        run: ${{ env.ANT_HOME }}/bin/ant -diagnostics
+      - name: Install Ant
+        uses: JOSM/JOSMPluginAction/actions/setup-ant@v1
 
       - name: Test with Ant
         run: |
-          ANT="${{ env.ANT_HOME }}/bin/ant -DnoJavaFX=true test-unit-hardfail"
+          ANT="ant -DnoJavaFX=true test-unit-hardfail"
           $ANT -Dtest.headless=true
 
@@ -66,5 +57,5 @@
       - name: Upload Ant reports
         if: ${{ always() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Ant reports for JOSM ${{ needs.createrelease.outputs.josm_revision }} on java ${{ matrix.java }} on ${{ matrix.os }}
@@ -82,5 +73,5 @@
     steps:
       - name: Download Artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: artifacts
@@ -88,5 +79,5 @@
       - name: Publish Test Report with action-junit-report
         if: ${{ always() }}
-        uses: mikepenz/action-junit-report@v2
+        uses: mikepenz/action-junit-report@v3
         with:
           report_paths: 'artifacts/**/*.xml'
@@ -94,5 +85,5 @@
 
       - name: Publish Test Report with publish-unit-test-result-action
-        uses: EnricoMi/publish-unit-test-result-action@v1
+        uses: EnricoMi/publish-unit-test-result-action@v2
         with:
           files: 'artifacts/**/*.xml'
Index: /trunk/.github/workflows/ant.yml
===================================================================
--- /trunk/.github/workflows/ant.yml	(revision 18669)
+++ /trunk/.github/workflows/ant.yml	(revision 18670)
@@ -2,6 +2,4 @@
 env:
   junit_platform_version: '1.7.2'
-  # ANT_HOME is also our ant version
-  ANT_HOME: 'apache-ant-1.10.12'
   JAVAFX_VERSION: '17.0.2'
 on:
@@ -27,5 +25,5 @@
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 256
@@ -38,15 +36,15 @@
           if [[ "$josm_revision" == "$(curl --silent https://josm.openstreetmap.de/tested)" ]]; then
             echo "josm_prerelease=false" >> $GITHUB_ENV
-            echo "::set-output name=josm_prerelease::false"
+            echo "josm_prerelease=false" >> $GITHUB_OUTPUT
             josm_release_tag=$josm_revision-tested
           else
             echo "josm_prerelease=true" >> $GITHUB_ENV
-            echo "::set-output name=josm_prerelease::true"
+            echo "josm_prerelease=true" >> $GITHUB_OUTPUT
             josm_release_tag=$josm_revision
           fi
           echo "josm_revision=$josm_revision" >> $GITHUB_ENV
-          echo "::set-output name=josm_revision::$josm_revision"
+          echo "josm_revision=$josm_revision" >> $GITHUB_OUTPUT
           echo "josm_release_tag=$josm_release_tag" >> $GITHUB_ENV
-          echo "::set-output name=josm_release_tag::$josm_release_tag"
+          echo "josm_release_tag=$josm_release_tag" >> $GITHUB_OUTPUT
 
       - name: Create release
@@ -77,10 +75,10 @@
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 256
 
       - name: Cache
-        uses: actions/cache@v2.0.0
+        uses: actions/cache@v3
         with:
           path: |
@@ -90,18 +88,11 @@
 
       - name: Setup Java ${{ matrix.java }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
 
-      - name: Install Ant ${{ env.ANT_HOME }}
-        run: |
-          if [ ! -f tools/${{ env.ANT_HOME }}-bin.tar.gz ]; then
-            curl -o tools/${{ env.ANT_HOME }}-bin.tar.gz https://downloads.apache.org/ant/binaries/${{ env.ANT_HOME }}-bin.tar.gz
-          fi
-          tar zxf tools/${{ env.ANT_HOME }}-bin.tar.gz
-
-      - name: Ant diagnostics
-        run: ${{ env.ANT_HOME }}/bin/ant -diagnostics
+      - name: Install Ant
+        uses: JOSM/JOSMPluginAction/actions/setup-ant@v1
 
       - name: Optimise images
@@ -126,7 +117,7 @@
           echo "$SIGN_CERT" | base64 --decode > $SIGN_KEYSTORE
           if [ "${{ needs.createrelease.outputs.josm_prerelease }}" == "true" ]; then
-            ANT="${{ env.ANT_HOME }}/bin/ant"
+            ANT="ant"
           else
-            ANT="${{ env.ANT_HOME }}/bin/ant -Dreleasebuild=true"
+            ANT="ant -Dreleasebuild=true"
           fi
           $ANT dist
Index: /trunk/.github/workflows/checkstyle-analysis.yml
===================================================================
--- /trunk/.github/workflows/checkstyle-analysis.yml	(revision 18669)
+++ /trunk/.github/workflows/checkstyle-analysis.yml	(revision 18670)
@@ -15,10 +15,10 @@
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
           fetch-depth: 256
 
     - name: Cache
-      uses: actions/cache@v2.0.0
+      uses: actions/cache@v3
       with:
         path: |
@@ -32,9 +32,9 @@
 
     - name: Upload report
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         path: checkstyle-josm.xml
 
-    - uses: jwgmeligmeyling/checkstyle-github-action@master
+    - uses: JOSM/JOSMPluginAction/actions/checkstyle@v1
       with:
-        path: '**/checkstyle-josm.xml'
+        file: "checkstyle-josm.xml"
Index: /trunk/.github/workflows/codeql-analysis.yml
===================================================================
--- /trunk/.github/workflows/codeql-analysis.yml	(revision 18669)
+++ /trunk/.github/workflows/codeql-analysis.yml	(revision 18670)
@@ -22,10 +22,10 @@
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
           fetch-depth: 256
 
     - name: Cache
-      uses: actions/cache@v2.0.0
+      uses: actions/cache@v3
       with:
         path: |
@@ -35,5 +35,5 @@
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
@@ -44,3 +44,3 @@
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
Index: /trunk/.github/workflows/pmd-analysis.yml
===================================================================
--- /trunk/.github/workflows/pmd-analysis.yml	(revision 18669)
+++ /trunk/.github/workflows/pmd-analysis.yml	(revision 18670)
@@ -15,10 +15,10 @@
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
           fetch-depth: 256
 
     - name: Cache
-      uses: actions/cache@v2.0.0
+      uses: actions/cache@v3
       with:
         path: |
@@ -32,9 +32,10 @@
 
     - name: Upload report
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         path: pmd-josm.xml
 
-    - uses: jwgmeligmeyling/pmd-github-action@master
+    - uses: JOSM/JOSMPluginAction/actions/pmd@v1
       with:
-        path: '**/pmd-josm.xml'
+        src: 'src'
+        file: "pmd-josm.xml"
Index: /trunk/.github/workflows/spotbugs-analysis.yml
===================================================================
--- /trunk/.github/workflows/spotbugs-analysis.yml	(revision 18669)
+++ /trunk/.github/workflows/spotbugs-analysis.yml	(revision 18670)
@@ -15,10 +15,10 @@
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
           fetch-depth: 256
 
     - name: Cache
-      uses: actions/cache@v2.0.0
+      uses: actions/cache@v3
       with:
         path: |
@@ -32,5 +32,5 @@
 
     - name: Upload report
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         path: spotbugs-josm.xml
Index: /trunk/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportTest.java	(revision 18669)
+++ /trunk/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportTest.java	(revision 18670)
@@ -139,5 +139,5 @@
                 Arguments.of("MainApplication.worker", (Consumer<Runnable>) runnable -> {
                     MainApplication.worker.execute(runnable);
-                    assertDoesNotThrow(() -> MainApplication.worker.submit(() -> { /* Sync thread */}).get(1, TimeUnit.SECONDS));
+                    assertDoesNotThrow(() -> MainApplication.worker.submit(() -> { /* Sync thread */ }).get(1, TimeUnit.SECONDS));
                 })
         );