Cleanup scripts and dependency to annotations.

jenkinsci · Nov 3, 2023 · 73a3ed6 · 73a3ed6
1 parent 63c2c32
commit 73a3ed6
Show file tree

Hide file tree

Showing 24 changed files with 172 additions and 31 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -14,12 +14,9 @@ updates:
       - dependency-name: org.eclipse.collections:eclipse-collections-api
         versions:
           - ">= 10.a"
-      - dependency-name: org.webjars:popper.js
+      - dependency-name: net.javacrumbs.json-unit:json-unit-assertj
         versions:
-          - ">= 2.0.0"
-      - dependency-name: org.webjars:bootstrap
-        versions:
-          - ">= 5.0.0"
+          - ">= 3.0.0"
 
   - package-ecosystem: "github-actions"
     directory: "/"

diff --git a/.github/workflows/enforce-labels.yml b/.github/workflows/enforce-labels.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: mheap/github-action-required-labels@v5
         with:
-          mode: exactly
+          mode: minimum
           count: 1
           labels: "bug,feature,enhancement,breaking,tests,documentation,internal,dependencies"
           message: "Maintainer needs to assign at least one label before merge"
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![Join the chat at https://gitter.im/jenkinsci/warnings-plugin](https://badges.gitter.im/jenkinsci/warnings-plugin.svg)](https://gitter.im/jenkinsci/warnings-plugin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Jenkins Plugin Installs](https://img.shields.io/jenkins/plugin/i/warnings-ng.svg?color=red)](https://plugins.jenkins.io/warnings-ng)
 [![Jenkins](https://ci.jenkins.io/job/Plugins/job/warnings-ng-plugin/job/master/badge/icon?subject=Jenkins%20CI)](https://ci.jenkins.io/job/Plugins/job/warnings-ng-plugin/job/master/)
-[![GitHub Actions](https://github.com/jenkinsci/warnings-ng-plugin/workflows/GitHub%20CI/badge.svg?branch=master)](https://github.com/jenkinsci/warnings-ng-plugin/actions)
+[![GitHub Actions](https://github.com/jenkinsci/warnings-ng-plugin/workflows/GitHub%20CI/badge.svg)](https://github.com/jenkinsci/warnings-ng-plugin/actions)
 [![Codecov](https://codecov.io/gh/jenkinsci/warnings-ng-plugin/branch/master/graph/badge.svg)](https://app.codecov.io/gh/jenkinsci/warnings-ng-plugin)
 
 The Jenkins Next Generation Warnings plugin collects compiler warnings or issues reported by static analysis tools and 

diff --git a/SUPPORTED-FORMATS.md b/SUPPORTED-FORMATS.md
@@ -1,4 +1,4 @@
-<!--- DO NOT EDIT - Generated by ToolsLister at 2022-11-18T23:18:43.347138-->
+<!--- DO NOT EDIT - Generated by ToolsLister at 2023-10-16T16:39:39.702387-->
 # Supported Report Formats
 
 Jenkins' Warnings Next Generation Plugin supports the following report formats. 
@@ -467,6 +467,25 @@ the [Analysis Parsers Library](https://github.com/jenkinsci/analysis-model/).
                 -
             </td>
         </tr>
+        <tr>
+            <td>
+                code-generator
+            </td>
+            <td>
+                codeGeneratorParser()
+            </td>
+            <td>
+                <img src="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/6.x/svgs/solid/triangle-exclamation.svg" alt="Code Generator Tool" height="48" width="48">
+            </td>
+            <td>
+                <a href="https://www.mathworks.com/help/stats/code-generation.html">
+                    Code Generator Tool
+                </a>
+            </td>
+            <td>
+                -
+            </td>
+        </tr>
         <tr>
             <td>
                 code-checker
@@ -581,6 +600,25 @@ the [Analysis Parsers Library](https://github.com/jenkinsci/analysis-model/).
                 :bulb: You need to use the Eclipse format with the option <code>--output=eclipse</code>
             </td>
         </tr>
+        <tr>
+            <td>
+                crosscore-embedded-studio
+            </td>
+            <td>
+                CrossCoreEmbeddedStudioParser()
+            </td>
+            <td>
+                <img src="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/6.x/svgs/solid/triangle-exclamation.svg" alt="CrossCore Embedded Studio (CCES)" height="48" width="48">
+            </td>
+            <td>
+                <a href="https://www.analog.com/en/design-center/evaluation-hardware-and-software/software/adswt-cces.html">
+                    CrossCore Embedded Studio (CCES)
+                </a>
+            </td>
+            <td>
+                -
+            </td>
+        </tr>
         <tr>
             <td>
                 csslint
@@ -762,6 +800,25 @@ the [Analysis Parsers Library](https://github.com/jenkinsci/analysis-model/).
                 :bulb: <p><p>Create an output file that contains Eclipse ECJ output, in either XML or text format.</p><p>To log in XML format, specify &quot;.xml&quot; as the file extension to the -log argument:</p><p><code>java -jar ecj.jar -log &lt;logfile&gt;.xml &lt;other arguments&gt;</code></p><p>To log in text format, specify any file extension except &quot;.xml&quot; to the -log argument:</p><p><code>java -jar ecj.jar -log &lt;logfile&gt;.log &lt;other arguments&gt;</code></p></p>
             </td>
         </tr>
+        <tr>
+            <td>
+                embedded-engineer
+            </td>
+            <td>
+                embeddedEngineerParser()
+            </td>
+            <td>
+                <img src="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/6.x/svgs/solid/triangle-exclamation.svg" alt="Embedded Engineer Tool" height="48" width="48">
+            </td>
+            <td>
+                <a href="https://www.lieberlieber.com/embedded-engineer/">
+                    Embedded Engineer Tool
+                </a>
+            </td>
+            <td>
+                -
+            </td>
+        </tr>
         <tr>
             <td>
                 erlc
@@ -1057,6 +1114,25 @@ the [Analysis Parsers Library](https://github.com/jenkinsci/analysis-model/).
                 -
             </td>
         </tr>
+        <tr>
+            <td>
+                grype
+            </td>
+            <td>
+                grype()
+            </td>
+            <td>
+                <img src="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/6.x/svgs/solid/triangle-exclamation.svg" alt="Grype" height="48" width="48">
+            </td>
+            <td>
+                <a href="https://github.com/anchore/grype">
+                    Grype
+                </a>
+            </td>
+            <td>
+                **/grype-report.json
+            </td>
+        </tr>
         <tr>
             <td>
                 hadolint
@@ -1817,6 +1893,30 @@ analyze - iccxxxxcompiler_opts cstat2.c</pre></code>For details check the IAR C-
                 **/pmd.xml
             </td>
         </tr>
+        <tr>
+            <td>
+                polyspace-parser
+            </td>
+            <td>
+                polyspaceParser()
+            </td>
+            <td>
+                <img src="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/6.x/svgs/solid/triangle-exclamation.svg" alt="Polyspace Tool" height="48" width="48">
+            </td>
+            <td>
+                <a href="https://www.mathworks.com/products/polyspace.html">
+                    Polyspace Tool
+                </a>
+            </td>
+            <td>
+                -
+            </td>
+        </tr>
+        <tr>
+            <td colspan="5">
+                :bulb: Reads reports of Polyspace Static Analysis Tool by MathWorks. Used for <a href='https://www.mathworks.com/help/bugfinder/ref/polyspaceresultsexport.html?s_tid=srchtitle_polyspace-results-export_1'>BugFinder</a> and  <a href='https://www.mathworks.com/help/codeprover/ref/polyspaceresultsexport.html?s_tid=srchtitle_polyspace-results-export_2'>CodeProver</a> result files.<br/>Report can be generated with command: polyspace-results-export -format csv -results-dir <RESULTS> -output-name <CSVFILE> -key <KEY>
+            </td>
+        </tr>
         <tr>
             <td>
                 prefast
@@ -1930,7 +2030,7 @@ analyze - iccxxxxcompiler_opts cstat2.c</pre></code>For details check the IAR C-
         </tr>
         <tr>
             <td colspan="5">
-                :bulb: <p>Create a./pylintrc that contains:<p><code>msg-template={path}:{module}:{line}: [{msg_id}({symbol}), {obj}] {msg}</code></p></p><p>Start pylint using the command:<p><code>pylint --rcfile=./pylintrc CODE > pylint.log</code></p></p>
+                :bulb: <p>Start Pylint using this custom message template (can also be configured via a pylintrc configuration file):<p><code>pylint --msg-template='{path}:{line}: [{msg_id}, {obj}] {msg} ({symbol})' modules_or_packages > pylint.log</code></p></p>
             </td>
         </tr>
         <tr>
@@ -2153,6 +2253,30 @@ analyze - iccxxxxcompiler_opts cstat2.c</pre></code>For details check the IAR C-
                 -
             </td>
         </tr>
+        <tr>
+            <td>
+                simulink-check-parser
+            </td>
+            <td>
+                simulinkCheckParser()
+            </td>
+            <td>
+                <img src="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/6.x/svgs/solid/triangle-exclamation.svg" alt="Simulink Check Tool" height="48" width="48">
+            </td>
+            <td>
+                <a href="https://www.mathworks.com/products/simulink-check.html">
+                    Simulink Check Tool
+                </a>
+            </td>
+            <td>
+                -
+            </td>
+        </tr>
+        <tr>
+            <td colspan="5">
+                :bulb: Reads and Parses HTML reports of Simulink Check Tool by MathWorks. Report can be generated with command: <code>ModelAdvisor.summaryReport(ModelAdvisor.run(<SYSTEMS>, <CONFIG>, <FILENAME>, <ARGS>))</code>
+            </td>
+        </tr>
         <tr>
             <td>
                 sonar

diff --git a/bin/german.sh b/bin/german.sh
diff --git a/bin/release.sh b/bin/release.sh
@@ -4,5 +4,3 @@ git pull
 git push
 cd plugin
 mvn -B clean build-helper:parse-version release:prepare release:perform -DdevelopmentVersion=\${parsedVersion.majorVersion}.\${parsedVersion.nextMinorVersion}.0-SNAPSHOT
-
-
diff --git a/plugin/etc/assertj-templates/assertions_entry_point_class_template.txt b/plugin/etc/assertj-templates/assertions_entry_point_class_template.txt
@@ -5,7 +5,7 @@ package ${package};
  * type-specific assertion objects.
  */
 @edu.umd.cs.findbugs.annotations.SuppressFBWarnings("NM")
-@javax.annotation.Generated(value="assertj-assertions-generator")
+@edu.hm.hafner.util.Generated(value="assertj-assertions-generator")
 public class Assertions extends edu.hm.hafner.analysis.assertions.Assertions {
 ${all_assertions_entry_points}
   /**

diff --git a/plugin/etc/assertj-templates/soft_assertions_entry_point_class_template.txt b/plugin/etc/assertj-templates/soft_assertions_entry_point_class_template.txt
@@ -4,7 +4,7 @@ package ${package};
  * Entry point for soft assertions of different data types.
  */
 @edu.umd.cs.findbugs.annotations.SuppressFBWarnings("NM")
-@javax.annotation.Generated(value="assertj-assertions-generator")
+@edu.hm.hafner.util.Generated(value="assertj-assertions-generator")
 public class SoftAssertions extends edu.hm.hafner.analysis.assertions.SoftAssertions {
 ${all_assertions_entry_points}
 }
diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/core/columns/IssuesTotalColumnTest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/core/columns/IssuesTotalColumnTest.java
@@ -4,7 +4,7 @@
 import java.util.Collections;
 
 import org.junit.jupiter.api.Test;
-import org.jvnet.hudson.test.Issue;
+import org.junitpioneer.jupiter.Issue;
 
 import hudson.model.Job;
 

diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/core/model/AnalysisResultTest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/core/model/AnalysisResultTest.java
@@ -5,7 +5,7 @@
 import java.util.Collections;
 
 import org.junit.jupiter.api.Test;
-import org.jvnet.hudson.test.Issue;
+import org.junitpioneer.jupiter.Issue;
 
 import edu.hm.hafner.util.ResourceTest;
 

diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/core/model/ReportXmlStreamTest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/core/model/ReportXmlStreamTest.java
@@ -3,7 +3,7 @@
 import java.nio.file.Path;
 
 import org.junit.jupiter.api.Test;
-import org.jvnet.hudson.test.Issue;
+import org.junitpioneer.jupiter.Issue;
 
 import edu.hm.hafner.analysis.Report;
 import edu.hm.hafner.analysis.Severity;

diff --git a/...src/test/java/io/jenkins/plugins/analysis/core/model/StaticAnalysisLabelProviderTest.java b/...src/test/java/io/jenkins/plugins/analysis/core/model/StaticAnalysisLabelProviderTest.java
@@ -4,7 +4,7 @@
 
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.jvnet.hudson.test.Issue;
+import org.junitpioneer.jupiter.Issue;
 
 import edu.hm.hafner.analysis.IssueBuilder;
 

diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/core/util/AbsolutePathGeneratorITest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/core/util/AbsolutePathGeneratorITest.java
@@ -7,7 +7,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
-import org.jvnet.hudson.test.Issue;
+import org.junitpioneer.jupiter.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 
 import hudson.FilePath;

diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/core/util/ModelValidationTest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/core/util/ModelValidationTest.java
@@ -5,7 +5,7 @@
 import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
-import org.jvnet.hudson.test.Issue;
+import org.junitpioneer.jupiter.Issue;
 
 import edu.hm.hafner.analysis.Severity;
 

diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/groovy/GroovyParserTest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/groovy/GroovyParserTest.java
@@ -5,7 +5,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
-import org.jvnet.hudson.test.Issue;
+import org.junitpioneer.jupiter.Issue;
 
 import edu.hm.hafner.analysis.IssueParser;
 import edu.hm.hafner.analysis.Report;

diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/groovy/GroovyScriptITest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/groovy/GroovyScriptITest.java
@@ -3,7 +3,7 @@
 import java.util.Collections;
 
 import org.junit.jupiter.api.Test;
-import org.jvnet.hudson.test.Issue;
+import org.junitpioneer.jupiter.Issue;
 
 import io.jenkins.plugins.analysis.core.model.Tool;
 import io.jenkins.plugins.analysis.core.testutil.IntegrationTestWithJenkinsPerSuite;

diff --git a/...test/java/io/jenkins/plugins/analysis/warnings/integrations/ConfigurationAsCodeITest.java b/...test/java/io/jenkins/plugins/analysis/warnings/integrations/ConfigurationAsCodeITest.java
@@ -3,7 +3,7 @@
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
-import org.jvnet.hudson.test.Issue;
+import org.junitpioneer.jupiter.Issue;
 
 import hudson.model.FreeStyleProject;
 import hudson.model.TopLevelItem;

diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/steps/QualityGateITest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/steps/QualityGateITest.java
@@ -5,7 +5,7 @@
 
 import org.eclipse.collections.impl.factory.Maps;
 import org.junit.jupiter.api.Test;
-import org.jvnet.hudson.test.Issue;
+import org.junitpioneer.jupiter.Issue;
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 

diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/tasks/AgentScannerTest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/tasks/AgentScannerTest.java
@@ -3,7 +3,7 @@
 import java.nio.file.Path;
 
 import org.junit.jupiter.api.Test;
-import org.jvnet.hudson.test.Issue;
+import org.junitpioneer.jupiter.Issue;
 
 import edu.hm.hafner.analysis.Report;
 import edu.hm.hafner.util.SerializableTest;

diff --git a/pom.xml b/pom.xml
@@ -16,6 +16,8 @@
   <properties>
     <java.version>1.8</java.version>
     <hpi-plugin.version>3.51</hpi-plugin.version>
+    <scmTag>HEAD</scmTag>
+
     <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
     <maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>

diff --git a/ui-tests/etc/assertj-templates/assertions_entry_point_class_template.txt b/ui-tests/etc/assertj-templates/assertions_entry_point_class_template.txt
@@ -5,7 +5,7 @@ package ${package};
  * type-specific assertion objects.
  */
 @edu.umd.cs.findbugs.annotations.SuppressFBWarnings("NM")
-@javax.annotation.Generated(value="assertj-assertions-generator")
+@edu.hm.hafner.util.Generated(value="assertj-assertions-generator")
 public class Assertions extends org.assertj.core.api.Assertions {
 ${all_assertions_entry_points}
   /**

diff --git a/ui-tests/etc/assertj-templates/soft_assertions_entry_point_class_template.txt b/ui-tests/etc/assertj-templates/soft_assertions_entry_point_class_template.txt
@@ -4,7 +4,7 @@ package ${package};
  * Entry point for soft assertions of different data types.
  */
 @edu.umd.cs.findbugs.annotations.SuppressFBWarnings("NM")
-@javax.annotation.Generated(value="assertj-assertions-generator")
+@edu.hm.hafner.util.Generated(value="assertj-assertions-generator")
 public class SoftAssertions extends org.assertj.core.api.AutoCloseableSoftAssertions {
 ${all_assertions_entry_points}
 }
diff --git a/ui-tests/javac.20231019_113650.args b/ui-tests/javac.20231019_113650.args
@@ -0,0 +1 @@
+@/private/var/folders/pg/qr8ry2kd4qjc151jhq9ksgx00000gn/T/org.codehaus.plexus.compiler.javac.JavacCompiler5569295821040207826arguments