Merge remote-tracking branch 'origin/main' into dependabot/npm_and_ya…

…rn/fortawesome/fontawesome-free-6.7.2 # Conflicts: # pom.xml
jenkinsci · Feb 18, 2025 · 3b22ad9 · 3b22ad9
2 parents d01e2aa + fcb1a05
commit 3b22ad9
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 8 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -33,7 +33,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.0.7
+        uses: codecov/codecov-action@v5.3.1
         with:
           file: 'target/site/jacoco/jacoco.xml'
           disable_search: true

diff --git a/.github/workflows/quality-monitor.yml b/.github/workflows/quality-monitor.yml
@@ -10,9 +10,12 @@ jobs:
     name: Build, test and monitor quality on Ubuntu
 
     steps:
+      - uses: actions/checkout@v4
+        if: github.event_name == 'push'
       - uses: actions/checkout@v4
         with:
-          ref: "refs/pull/${{ github.event.number }}/merge"
+          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:
@@ -24,10 +27,16 @@ jobs:
         uses: stCarolas/setup-maven@v5
         with:
           maven-version: 3.9.9
+      - name: Cache the NVD database
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository/org/owasp/dependency-check-data
+          key: dependency-check
       - name: Build with Maven
         env:
           BROWSER: chrome-container
-        run: mvn -V --color always -ntp clean verify -Ppit -Pci | tee maven.log
+          NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
+        run: mvn -V --color always -ntp clean verify -Ppit -Pci -Powasp | tee maven.log
       - name: Extract pull request number
         uses: jwalton/gh-find-current-pr@v1
         id: pr
@@ -72,6 +81,21 @@ jobs:
                       "id": "spotbugs",
                       "sourcePath": "src/main/java",
                       "pattern": "**/target/spotbugsXml.xml"
+                    },
+                    {
+                      "id": "error-prone",
+                      "pattern": "**/maven.log"
+                    }
+                  ]
+                },
+                {
+                  "name": "Vulnerabilities",
+                  "id": "vulnerabilities",
+                  "icon": "shield",
+                  "tools": [
+                    {
+                      "id": "owasp-dependency-check",
+                      "pattern": "**/target/dependency-check-report.json"                    
                     }
                   ]
                 }
@@ -95,6 +119,25 @@ jobs:
                       "pattern": "**/target/site/jacoco/jacoco.xml"
                     }
                   ]
+                },
+                {
+                  "name": "Mutation Coverage",
+                  "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"
+                    }
+                  ]
                 }
               ],
               "metrics": 

diff --git a/.github/workflows/run-release-drafter.yml b/.github/workflows/run-release-drafter.yml
@@ -11,6 +11,6 @@ jobs:
     name: 'Update Release Draft'
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@v6.0.0
+      - uses: release-drafter/release-drafter@v6.1.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/package.json b/package.json
@@ -10,8 +10,8 @@
   },
   "devDependencies": {
     "remark-cli": "12.0.1",
-    "remark-lint": "10.0.0",
-    "remark-preset-lint-recommended": "7.0.0"
+    "remark-lint": "10.0.1",
+    "remark-preset-lint-recommended": "7.0.1"
   },
   "scripts": {
     "lint-md": "remark .",

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jvnet.hudson.plugins</groupId>
     <artifactId>analysis-pom</artifactId>
-    <version>10.0.0</version>
+    <version>10.4.0</version>
     <relativePath />
   </parent>
 
@@ -22,7 +22,7 @@
     <changelist>-SNAPSHOT</changelist>
 
     <module.name>${project.groupId}.font-awesome-api</module.name>
-    <testcontainers.version>1.20.3</testcontainers.version>
+    <testcontainers.version>1.20.4</testcontainers.version>
 
   </properties>
 
@@ -45,10 +45,14 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>plugin-util-api</artifactId>
+      <!-- TODO: remove the version when a matching BOM is available -->
+      <version>6.0.0</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>plugin-util-api</artifactId>
+      <!-- TODO: remove the version when a matching BOM is available -->
+      <version>6.0.0</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>