Merge pull request #1064 from jenkinsci/dependabot/maven/edu.hm.hafne…

…r-codingstyle-pom-4.7.0 Bump edu.hm.hafner:codingstyle-pom from 4.6.0 to 4.7.0
jenkinsci · May 8, 2024 · d4bcd7f · d4bcd7f
2 parents 40da6fe + 595be7e
commit d4bcd7f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,7 +3,6 @@ name: 'GitHub CI'
 on:
   push:
     branches:
-      - master
       - main
   pull_request:
 
@@ -34,4 +33,4 @@ jobs:
       - name: Build with Maven
         env:
           BROWSER: chrome-container
-        run: mvn -V --color always -ntp clean verify --file pom.xml '-Djenkins.test.timeout=5000' '-Dgpg.skip'
+        run: mvn -V --color always -ntp clean verify '-Djenkins.test.timeout=5000' '-Dgpg.skip' '-Pci'
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -49,7 +49,7 @@ jobs:
           queries: +security-and-quality
 
       - name: Build with Maven
-        run: mvn -V --color always -ntp clean verify --file pom.xml -Pskip
+        run: mvn -V --color always -ntp clean verify -Pskip
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -3,7 +3,6 @@ name: 'CodeCov'
 on:
   push:
     branches:
-      - master
       - main
   pull_request:
 
@@ -27,7 +26,7 @@ jobs:
         with:
           maven-version: 3.9.6
       - name: Generate coverage with JaCoCo
-        run: mvn -V --color always -ntp clean verify '-Dgpg.skip'
+        run: mvn -V --color always -ntp clean verify -Dgpg.skip -Pci
       - name: Upload coverage to Codecov
         uses: codecov/[email protected]
         with:

diff --git a/.github/workflows/quality-monitor.yml b/.github/workflows/quality-monitor.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Build with Maven
         env:
           BROWSER: chrome-container
-        run: mvn -V --color always -ntp clean verify | tee maven.log
+        run: mvn -V --color always -ntp clean verify -Pci | tee maven.log
       - name: Extract pull request number
         uses: jwalton/gh-find-current-pr@v1
         id: pr
@@ -53,12 +53,10 @@ jobs:
                 "tools": [
                   {
                     "id": "checkstyle",
-                    "name": "CheckStyle",
                     "pattern": "**/target/checkstyle-*/checkstyle-result.xml"
                   },
                   {
                     "id": "pmd",
-                    "name": "PMD",
                     "pattern": "**/target/pmd-*/pmd.xml"
                   }
                 ]
@@ -70,7 +68,6 @@ jobs:
                 "tools": [
                   {
                     "id": "spotbugs",
-                    "name": "SpotBugs",
                     "sourcePath": "src/main/java",
                     "pattern": "**/target/spotbugsXml.xml"
                   }
@@ -99,4 +96,3 @@ jobs:
               }
              ]
             }
-
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>edu.hm.hafner</groupId>
     <artifactId>codingstyle-pom</artifactId>
-    <version>4.6.0</version>
+    <version>4.9.0</version>
     <relativePath />
   </parent>
 

diff --git a/src/main/java/edu/hm/hafner/analysis/Report.java b/src/main/java/edu/hm/hafner/analysis/Report.java
@@ -414,8 +414,8 @@ Issue remove(final UUID issueId) {
 
     private Optional<Issue> removeIfContained(final UUID issueId) {
         Optional<Issue> issue = find(issueId);
-        issue.ifPresent(value -> elements.remove(value));
         if (issue.isPresent()) {
+            elements.remove(issue.get());
             return issue;
         }