Merge pull request #1928 from jenkinsci/13.0.0

13.0.0

Author: uhafner

plugin/pom.xml

@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.jvnet.hudson.plugins</groupId>
     <artifactId>analysis-pom</artifactId>
-    <version>9.0.0</version>
+    <version>10.4.0</version>
     <relativePath />
   </parent>
 
   <groupId>io.jenkins.plugins</groupId>
   <artifactId>warnings-ng</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>12.0.0-SNAPSHOT</version>
   <packaging>hpi</packaging>
   <name>Warnings Plugin</name>
 
@@ -38,17 +38,15 @@
   <scm>
     <connection>scm:git:https://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
     <developerConnection>scm:git:[email protected]:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
-    <tag>v11.10.0</tag>
+    <tag>HEAD</tag>
     <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
   </scm>
 
   <properties>
-    <revision>11.13.0</revision>
-    <changelist>-SNAPSHOT</changelist>
     <module.name>${project.groupId}.warnings.ng</module.name>
 
-    <analysis-model-api.version>12.9.1</analysis-model-api.version>
-    <analysis-model-tests.version>${analysis-model-api.version}</analysis-model-tests.version>
+    <analysis-model-api.version>13.0.0</analysis-model-api.version>
+    <analysis-model-tests.version>13.0.0</analysis-model-tests.version>
     <pull-request-monitoring.version>335.v525cd64ec76b_</pull-request-monitoring.version>
 
     <eclipse-collections.version>9.2.0</eclipse-collections.version>
@@ -60,8 +58,6 @@
     <testcontainers.version>1.20.4</testcontainers.version>
 
     <!-- Jenkins Plug-in Dependencies Versions -->
-    <git-forensics.version>2.2.1</git-forensics.version>
-
     <flexible-publish.version>0.15.2</flexible-publish.version>
     <form-element-path.version>1.11</form-element-path.version>
 
@@ -99,7 +95,8 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>plugin-util-api</artifactId>
-      <version>5.1.0</version>
+      <!-- TODO: remove the version when a matching BOM is available -->
+      <version>6.0.0</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
@@ -160,6 +157,8 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>forensics-api</artifactId>
+      <!-- TODO: remove the version when a matching BOM is available -->
+      <version>3.0.0</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
@@ -219,12 +218,15 @@
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>forensics-api</artifactId>
       <classifier>tests</classifier>
+      <!-- TODO: remove the version when a matching BOM is available -->
+      <version>3.0.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>git-forensics</artifactId>
-      <version>${git-forensics.version}</version>
+      <!-- TODO: remove the version when a matching BOM is available -->
+      <version>3.1.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -305,7 +307,8 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>plugin-util-api</artifactId>
-      <version>5.1.0</version>
+      <!-- TODO: remove the version when a matching BOM is available -->
+      <version>6.0.0</version>
       <classifier>tests</classifier>
       <scope>test</scope>
       <exclusions>
@@ -578,6 +581,7 @@
           <excludes combine.children="append">
             <exclude>.*Thresholds</exclude>
             <exclude>.*Test.*</exclude>
+            <exclude>.*Benchmark.*</exclude>
             <exclude>.*TaskScanner.*</exclude>
           </excludes>
           <entryPointClassPackage>io.jenkins.plugins.analysis.core.assertions</entryPointClassPackage>

plugin/src/main/java/io/jenkins/plugins/analysis/core/columns/IssuesTotalColumn.java

@@ -61,7 +61,7 @@ public IssuesTotalColumn() {
     }
 
     /**
-     * Called after de-serialization to retain backward compatibility..
+     * Called after deserialization to retain backward compatibility..
      *
      * @return this
      */

plugin/src/main/java/io/jenkins/plugins/analysis/core/model/DeltaReport.java

@@ -39,9 +39,12 @@ public class DeltaReport {
     public DeltaReport(final Report report, final int currentBuildNumber) {
         allIssues = report;
         outstandingIssues = report;
-        referenceIssues = EMPTY_REPORT;
-        newIssues = EMPTY_REPORT;
-        fixedIssues = EMPTY_REPORT;
+
+        var empty = report.copyEmptyInstance();
+        referenceIssues = empty;
+        newIssues = empty;
+        fixedIssues = empty;
+
         referenceBuildId = StringUtils.EMPTY;
 
         report.logInfo("No valid reference build found");

plugin/src/main/java/io/jenkins/plugins/analysis/core/model/FixedWarningsDetail.java

@@ -60,6 +60,7 @@ public boolean canDisplayFile(final Issue issue) {
 
     /**
      * Returns the URL to the results of the same type of issues (i.e. same ID) in the reference build.
+     *
      * <p>
      * If no reference build is found, then an empty string is returned.
      * </p>

plugin/src/main/java/io/jenkins/plugins/analysis/core/model/IconLabelProvider.java

@@ -20,7 +20,7 @@ public class IconLabelProvider extends StaticAnalysisLabelProvider {
      *         the name of the tool
      */
     public IconLabelProvider(final String id, final String name) {
-        this(id, name, EMPTY_DESCRIPTION, id);
+        this(id, name, EMPTY_DESCRIPTION);
     }
 
     /**

plugin/src/main/java/io/jenkins/plugins/analysis/core/model/IssueReportScanner.java

@@ -49,7 +49,7 @@ public IssueReportScanner(final String filePattern, final String encoding,
     @Override
     protected Optional<Report> processFile(final Path file, final Charset charset, final FilteredLog log) {
         try {
-            Report fileReport = parser.parseFile(new FileReaderFactory(file, charset));
+            Report fileReport = parser.parse(new FileReaderFactory(file, charset));
 
             log.logInfo("Successfully parsed file %s", file);
             log.logInfo("-> found %s (skipped %s)",

plugin/src/main/java/io/jenkins/plugins/analysis/core/model/LabelProviderFactory.java

@@ -54,7 +54,7 @@ public StaticAnalysisLabelProvider create(final String id) {
      * @param name
      *         the name of the tool (might be empty or null)
      *
-     * @return The label provider of the selected static analysis tool. If the tool is not found then a default label
+     * @return The label provider of the selected static analysis tool. If the tool is not found, then a default label
      *         provider is returned.
      */
     public StaticAnalysisLabelProvider create(final String id, @CheckForNull final String name) {

plugin/src/main/java/io/jenkins/plugins/analysis/core/model/ReportScanningTool.java

@@ -50,11 +50,10 @@ public abstract class ReportScanningTool extends Tool {
 
     private String pattern = StringUtils.EMPTY;
     private String reportEncoding = StringUtils.EMPTY;
-    // Use negative case to allow defaulting to false and defaulting to existing behaviour.
     private boolean skipSymbolicLinks = false;
 
     /**
-     * Sets the Ant file-set pattern of files to work with. If the pattern is undefined then the console log is
+     * Sets the Ant file-set pattern of files to work with. If the pattern is undefined, then the console log is
      * scanned.
      *
      * @param pattern
@@ -95,7 +94,7 @@ public ReportScanningToolDescriptor getDescriptor() {
     public abstract IssueParser createParser();
 
     /**
-     * Specify if file scanning skip traversal of symbolic links.
+     * Specify if the file scanning step should skip the traversal of symbolic links.
      *
      * @param skipSymbolicLinks
      *         if symbolic links should be skipped during directory scanning.
@@ -180,6 +179,7 @@ private Report scanInWorkspace(final FilePath workspace, final String expandedPa
 
             List<Report> results = report.getResults();
             Report aggregation;
+            // FIXME: properties are not set in the aggregation
             if (results.isEmpty()) {
                 aggregation = new Report();
             }

plugin/src/main/java/io/jenkins/plugins/analysis/core/model/ResetQualityGateCommand.java

@@ -16,6 +16,7 @@
  * build (started automatically or manually) will not evaluate a quality gate that considers the number of new warnings.
  * This helps to start over from a clean state if the number of new warnings have been increased accidentally. Otherwise
  * you won't get a successful build anymore until all new warnings have been fixed.
+ *
  * <p>
  * Technically, this command just adds a marker action to the selected build. Once a new build is running, this marker
  * action will be checked for existence and the quality gate will be bypassed for one single build.