Synchronize CI pipelines

Author: uhafner

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-  pull_request_target:
+  pull_request:
 
 jobs:
   build:
@@ -19,11 +19,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-        if: github.event_name == 'push'
-      - uses: actions/checkout@v4
-        with:
-          ref: "${{ github.event.pull_request.merge_commit_sha }}"
-        if: github.event_name == 'pull_request_target'
       - name: Set up JDK ${{ matrix.jdk }}
         uses: actions/setup-java@v4
         with:

.github/workflows/codeql.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-  pull_request_target:
+  pull_request:
   schedule:
     - cron: "32 3 * * 0"
 
@@ -24,11 +24,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-        if: github.event_name == 'push'
-      - uses: actions/checkout@v4
-        with:
-          ref: "${{ github.event.pull_request.merge_commit_sha }}"
-        if: github.event_name == 'pull_request_target'
 
       - name: Setup Java
         uses: actions/setup-java@v4

.github/workflows/coverage.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-  pull_request_target:
+  pull_request:
 
 jobs:
   coverage:
@@ -14,11 +14,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-        if: github.event_name == 'push'
-      - uses: actions/checkout@v4
-        with:
-          ref: "${{ github.event.pull_request.merge_commit_sha }}"
-        if: github.event_name == 'pull_request_target'
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
@@ -33,7 +28,7 @@ jobs:
       - name: Generate coverage with JaCoCo
         run: mvn -V --color always -ntp clean verify -Pci
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5.3.1
+        uses: codecov/codecov-action@v5.0.7
         with:
           file: 'target/site/jacoco/jacoco.xml'
           disable_search: true

.github/workflows/quality-monitor.yml

@@ -1,7 +1,7 @@
 name: 'Quality Monitor PR'
 
 on:
-  pull_request_target:
+  pull_request:
 
 jobs:
   build:
@@ -11,11 +11,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-        if: github.event_name == 'push'
-      - uses: actions/checkout@v4
-        with:
-          ref: "${{ github.event.pull_request.merge_commit_sha }}"
-        if: github.event_name == 'pull_request_target'
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
@@ -41,21 +36,22 @@ jobs:
         uses: jwalton/gh-find-current-pr@v1
         id: pr
       - name: Run Quality Monitor
-        uses: uhafner/quality-monitor@v1
+        uses: uhafner/quality-monitor@v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           pr-number: ${{ steps.pr.outputs.number }}
+          show-headers: true
           config: >
             {
               "tests": {
+                "name": "Tests",
                 "tools": [
                   {
-                    "id": "test",
-                    "name": "Tests",
+                    "id": "junit",
+                    "name": "JUnit Tests",
                     "pattern": "**/target/*-reports/TEST*.xml"
                   }
-                ],
-                "name": "Tests"
+                ]
               },
               "analysis": [
                 {
@@ -88,6 +84,18 @@ jobs:
                     }
                   ]
                 },
+                {
+                  "name": "API Problems",
+                  "id": "api",
+                  "icon": "no_entry_sign",
+                  "tools": [
+                    {
+                      "id": "revapi",
+                      "sourcePath": "src/main/java",
+                      "pattern": "**/target/revapi-result.json"
+                    }
+                  ]
+                },
                 {
                   "name": "Vulnerabilities",
                   "id": "vulnerabilities",
@@ -106,14 +114,12 @@ jobs:
                   "tools": [
                     {
                       "id": "jacoco",
-                      "name": "Line Coverage",
                       "metric": "line",
                       "sourcePath": "src/main/java",
                       "pattern": "**/target/site/jacoco/jacoco.xml"
                     },
                     {
                       "id": "jacoco",
-                      "name": "Branch Coverage",
                       "metric": "branch",
                       "sourcePath": "src/main/java",
                       "pattern": "**/target/site/jacoco/jacoco.xml"
@@ -125,14 +131,12 @@ jobs:
                   "tools": [
                     {
                       "id": "pit",
-                      "name": "Mutation Coverage",
                       "metric": "mutation",
                       "sourcePath": "src/main/java",
                       "pattern": "**/target/pit-reports/mutations.xml"
                     },
                     {
                       "id": "pit",
-                      "name": "Test Strength",
                       "metric": "test-strength",
                       "sourcePath": "src/main/java",
                       "pattern": "**/target/pit-reports/mutations.xml"
@@ -142,73 +146,42 @@ jobs:
               ],
               "metrics": 
                 {
-                  "name": "Toplevel Metrics",
+                  "name": "Software Metrics",
                   "tools": [
                     {
-                      "name": "Cyclomatic Complexity",
                       "id": "metrics",
                       "pattern": "**/metrics/pmd.xml",
                       "metric": "CYCLOMATIC_COMPLEXITY"
                     },
                     {
-                      "name": "Cognitive Complexity",
                       "id": "metrics",
                       "pattern": "**/metrics/pmd.xml",
                       "metric": "COGNITIVE_COMPLEXITY"
                     },
                     {
-                      "name": "Lines of Code",
                       "id": "metrics",
                       "pattern": "**/metrics/pmd.xml",
-                      "metric": "LOC"
+                      "metric": "NPATH_COMPLEXITY"
                     },
                     {
-                      "name": "Non Commenting Source Statements",
                       "id": "metrics",
                       "pattern": "**/metrics/pmd.xml",
-                      "metric": "NCSS"
+                      "metric": "LOC"
                     },
                     {
-                      "name": "Access to foreign data",
                       "id": "metrics",
                       "pattern": "**/metrics/pmd.xml",
-                      "metric": "ACCESS_TO_FOREIGN_DATA"
+                      "metric": "NCSS"
                     },
                     {
-                      "name": "Class cohesion",
                       "id": "metrics",
                       "pattern": "**/metrics/pmd.xml",
                       "metric": "COHESION"
                     },
                     {
-                      "name": "Fan out",
-                      "id": "metrics",
-                      "pattern": "**/metrics/pmd.xml",
-                      "metric": "FAN_OUT"
-                    },
-                    {
-                      "name": "Number of accessors",
-                      "id": "metrics",
-                      "pattern": "**/metrics/pmd.xml",
-                      "metric": "NUMBER_OF_ACCESSORS"
-                    },
-                    {
-                      "name": "Weight of a class",
                       "id": "metrics",
                       "pattern": "**/metrics/pmd.xml",
                       "metric": "WEIGHT_OF_CLASS"
-                    },
-                    {
-                      "name": "Weighted method count",
-                      "id": "metrics",
-                      "pattern": "**/metrics/pmd.xml",
-                      "metric": "WEIGHED_METHOD_COUNT"
-                    },
-                    {
-                      "name": "N-Path Complexity",
-                      "id": "metrics",
-                      "pattern": "**/metrics/pmd.xml",
-                      "metric": "NPATH_COMPLEXITY"
                     }
                   ]
                 }