Bump org.jvnet.hudson.plugins:analysis-pom from 7.4.0 to 8.1.2

.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' '-Pci'

.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

.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 -Pci
       - name: Upload coverage to Codecov
         uses: codecov/[email protected]
         with:

pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jvnet.hudson.plugins</groupId>
     <artifactId>analysis-pom</artifactId>
-    <version>7.4.0</version>
+    <version>8.1.2</version>
     <relativePath />
   </parent>
 
@@ -23,7 +23,7 @@
 
     <module.name>${project.groupId}.echarts</module.name>
 
-    <echarts-build-trends.version>4.4.0</echarts-build-trends.version>
+    <echarts-build-trends.version>4.6.0</echarts-build-trends.version>
   </properties>
 
   <licenses>

src/main/java/io/jenkins/plugins/echarts/JenkinsPalette.java

@@ -29,9 +29,8 @@ public enum JenkinsPalette {
     WHITE(StringUtils.EMPTY, StringUtils.EMPTY, StringUtils.EMPTY),
     YELLOW;
 
-    static final List<JenkinsPalette> CHART_COLORS = List.of(JenkinsPalette.RED, JenkinsPalette.BLUE,
-            JenkinsPalette.YELLOW, JenkinsPalette.GREEN, JenkinsPalette.CYAN, JenkinsPalette.INDIGO,
-            JenkinsPalette.ORANGE, JenkinsPalette.PINK, JenkinsPalette.PURPLE, JenkinsPalette.BROWN);
+    static final List<JenkinsPalette> CHART_COLORS = List.of(RED, BLUE, YELLOW, GREEN, CYAN, INDIGO,
+            ORANGE, PINK, PURPLE, BROWN);
 
     /**
      * Returns a chart color that can be used to render element {@code n} in a chart. If {@code n} is greater than

src/main/webapp/js/echarts-api.js

@@ -77,12 +77,13 @@ const echartsJenkinsApi = {
     },
 
     /**
-     * Configures the content of the trend configuration  dialog.
+     * Configures the content of the trend configuration dialog.
      *
      * @param {String} suffix - the suffix for the ID of the affected trend configuration dialog
      * @param {Function} fillDialog - a function to fill the configuration dialog with additional values from the JSON
      *     configuration object
-     * @param {Function} saveDialog - a function to save the configuration dialog values to the JSON configuration object
+     * @param {Function} saveDialog - a function to save the configuration dialog values to the JSON configuration
+     *     object
      */
     configureTrend: function (suffix, fillDialog, saveDialog) {
         const trendConfiguration = jQuery3('#trend-configuration-' + suffix);
@@ -224,23 +225,22 @@ const echartsJenkinsApi = {
      *
      * @param {String} chartDivId - the ID of the div where the chart should be shown in
      * @param {String} model - the line chart model
-     * @param {String} settingsDialogId - the optional ID of the div that provides a settings dialog (might be set to null
-     *     if there is no such dialog)
+     * @param {String} settingsDialogId - the optional ID of the div that provides a settings dialog (might be set to
+     *     null if there is no such dialog)
      * @param {Function} chartClickedEventHandler - the optional event handler that receives click events
      * @param {Boolean} allowYAxisZoom - Allow zooming on the y-axis
      */
     renderConfigurableZoomableTrendChart: function (chartDivId, model, settingsDialogId, chartClickedEventHandler, allowYAxisZoom = false) {
-        const themedModel = echartsJenkinsApi.resolveJenkinsColors(model);
-        const chartModel = JSON.parse(themedModel);
+        const chartModel = JSON.parse(echartsJenkinsApi.resolveJenkinsColors(model)); // NOPMD
         const chartPlaceHolder = document.getElementById(chartDivId);
         const chart = echarts.init(chartPlaceHolder);
-        chartPlaceHolder.echart = chart;
+        chartPlaceHolder.echart = chart; // NOPMD
 
         const textColor = getComputedStyle(document.body).getPropertyValue('--text-color') || '#333';
         const showSettings = document.getElementById(settingsDialogId);
 
         function getDataZoomOptions(allowYAxisZoom) {
-            var dataZoomOptions = [
+            const dataZoomOptions = [
                 {
                     type: 'inside'
                 },
@@ -250,7 +250,7 @@ const echartsJenkinsApi = {
                     bottom: 5,
                     moveHandleSize: 5,
                     xAxisIndex: [0],
-                    filterMode: 'filter',
+                    filterMode: 'filter'
                 }
             ];
 
@@ -266,7 +266,7 @@ const echartsJenkinsApi = {
             }
 
             return dataZoomOptions;
-        };
+        }
 
         const options = {
             tooltip: {
@@ -588,9 +588,7 @@ const echartsJenkinsApi = {
                         left: 'center'
                     };
                 }
-                else {
-                    return null;
-                }
+                return null;
             }
 
             const chartPlaceHolder = jQuery3("#" + echartsJenkinsApi.escapeMetaCharacters(chartDivId));

src/test/java/io/jenkins/plugins/echarts/BuildActionIteratorTest.java

@@ -5,8 +5,10 @@
 import java.util.NoSuchElementException;
 import java.util.Optional;
 
+import org.assertj.core.api.RecursiveComparisonAssert;
 import org.junit.jupiter.api.Test;
 
+import edu.hm.hafner.echarts.Build;
 import edu.hm.hafner.echarts.BuildResult;
 
 import hudson.model.Run;
@@ -22,6 +24,8 @@
  * @author Ullrich Hafner
  */
 class BuildActionIteratorTest {
+    private static final Build IGNORE_BUILD = new Build(0);
+
     @Test
     void shouldCreateEmptyIterator() {
         BuildActionIterator<TestAction> iterator = new BuildActionIterator<>(TestAction.class, Optional.empty());
@@ -39,8 +43,7 @@ void shouldReturnResultOfCurrentBuild() {
         BuildActionIterator<TestAction> iterator = new BuildActionIterator<>(TestAction.class, Optional.of(testAction));
 
         assertThat(iterator).hasNext();
-        assertThat(iterator.next()).usingRecursiveComparison().ignoringFields("build")
-                .isEqualTo(new BuildResult<>(null, testAction));
+        verifyResult(testAction, iterator);
         assertThat(iterator).isExhausted();
     }
 
@@ -60,12 +63,10 @@ void shouldReturnResultOfPreviousBuild() {
         when(baseline.getPreviousBuild()).thenAnswer(i -> previousBuild);
 
         assertThat(iterator).hasNext();
-        assertThat(iterator.next()).usingRecursiveComparison().ignoringFields("build")
-                .isEqualTo(new BuildResult<>(null, testAction));
+        verifyResult(testAction, iterator);
 
         assertThat(iterator).hasNext();
-        assertThat(iterator.next()).usingRecursiveComparison().ignoringFields("build")
-                .isEqualTo(new BuildResult<>(null, previousAction));
+        verifyResult(previousAction, iterator);
         assertThat(iterator).isExhausted();
     }
 
@@ -89,12 +90,10 @@ void shouldSkipBuildWithNoResult() {
         when(skippedBuild.getPreviousBuild()).thenAnswer(i -> previousBuild);
 
         assertThat(iterator).hasNext();
-        assertThat(iterator.next()).usingRecursiveComparison().ignoringFields("build")
-                .isEqualTo(new BuildResult<>(null, testAction));
+        verifyResult(testAction, iterator);
 
         assertThat(iterator).hasNext();
-        assertThat(iterator.next()).usingRecursiveComparison().ignoringFields("build")
-                .isEqualTo(new BuildResult<>(null, previousAction));
+        verifyResult(previousAction, iterator);
         assertThat(iterator).isExhausted();
     }
 
@@ -125,16 +124,13 @@ void shouldSkipBuildInThemMiddle() {
         BuildActionIterator<TestAction> iterator = new BuildActionIterator<>(TestAction.class, Optional.of(testAction));
 
         assertThat(iterator).hasNext();
-        assertThat(iterator.next()).usingRecursiveComparison().ignoringFields("build")
-                .isEqualTo(new BuildResult<>(null, testAction));
+        verifyResult(testAction, iterator);
 
         assertThat(iterator).hasNext();
-        assertThat(iterator.next()).usingRecursiveComparison().ignoringFields("build")
-                .isEqualTo(new BuildResult<>(null, middleAction));
+        verifyResult(middleAction, iterator);
 
         assertThat(iterator).hasNext();
-        assertThat(iterator.next()).usingRecursiveComparison().ignoringFields("build")
-                .isEqualTo(new BuildResult<>(null, previousAction));
+        verifyResult(previousAction, iterator);
 
         assertThat(iterator).isExhausted();
     }
@@ -172,15 +168,19 @@ private void shouldSelectResultByFilter(final TestAction first, final TestAction
         when(baseline.getPreviousBuild()).thenAnswer(i -> previousBuild);
 
         assertThat(iterator).hasNext();
-        assertThat(iterator.next()).usingRecursiveComparison().ignoringFields("build")
-                .isEqualTo(new BuildResult<>(null, testAction));
+        verifyResult(testAction, iterator);
 
         assertThat(iterator).hasNext();
-        assertThat(iterator.next()).usingRecursiveComparison().ignoringFields("build")
-                .isEqualTo(new BuildResult<>(null, expectedResult));
+        verifyResult(expectedResult, iterator);
         assertThat(iterator).isExhausted();
     }
 
+    private RecursiveComparisonAssert<?> verifyResult(final TestAction expectedResult,
+            final BuildActionIterator<TestAction> iterator) {
+        return assertThat(iterator.next()).usingRecursiveComparison().ignoringFields("build")
+                .isEqualTo(new BuildResult<>(IGNORE_BUILD, expectedResult));
+    }
+
     private abstract static class TestAction extends BuildAction<String> {
         private static final long serialVersionUID = -8129555082892128959L;