Merge remote-tracking branch 'origin/master' into record-coverage

Author: uhafner

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up Maven
-        uses: stCarolas/setup-maven@v4.4
+        uses: stCarolas/setup-maven@v4.5
         with:
           maven-version: 3.9.1
       - name: Set up JDK ${{ matrix.jdk }}

.github/workflows/enforce-labels.yml

@@ -7,7 +7,7 @@ jobs:
   enforce-label:
     runs-on: ubuntu-latest
     steps:
-      - uses: yogevbd/enforce-label-action@2.1.0
+      - uses: yogevbd/enforce-label-action@2.2.2
         with:
           REQUIRED_LABELS_ANY: "bug,feature,enhancement,deprecated,removed,tests,documentation,internal,dependencies"
           REQUIRED_LABELS_ANY_DESCRIPTION: "Maintainer needs to assign at least one label before merge"

.gitignore

@@ -9,4 +9,5 @@ pom.xml.versionsBackup
 pom.xml.releaseBackup
 release.properties
 .DS_Store
+.idea
 /package-lock.json

README.md

@@ -1,6 +1,6 @@
 # Jenkins Code Coverage Plug-in
 
-[![Gitter](https://badges.gitter.im/jenkinsci/code-coverage-api-plugin.svg)](https://gitter.im/jenkinsci/code-coverage-api-plugin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Join the chat at Gitter/Matrix](https://badges.gitter.im/jenkinsci/code-coverage-api-plugin.svg)](https://gitter.im/jenkinsci/code-coverage-api-plugin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Jenkins Plugin Installs](https://img.shields.io/jenkins/plugin/i/code-coverage-api.svg?color=red)](https://plugins.jenkins.io/code-coverage-api)
 [![Jenkins](https://ci.jenkins.io/job/Plugins/job/code-coverage-api-plugin/job/master/badge/icon?subject=Jenkins%20CI)](https://ci.jenkins.io/job/Plugins/job/code-coverage-api-plugin/job/master/)
 [![GitHub Actions](https://github.com/jenkinsci/code-coverage-api-plugin/workflows/GitHub%20CI/badge.svg?branch=master)](https://github.com/jenkinsci/code-coverage-api-plugin/actions)

plugin/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jvnet.hudson.plugins</groupId>
     <artifactId>analysis-pom</artifactId>
-    <version>6.4.0</version>
+    <version>6.5.0</version>
     <relativePath />
   </parent>
 
@@ -24,29 +24,19 @@
     <gitHubRepo>jenkinsci/code-coverage-api-plugin</gitHubRepo>
 
     <trove4j.version>3.0.3</trove4j.version>
-    <saxon-he.version>12.0</saxon-he.version>
-
-    <pull-request-monitoring.version>1.7.8</pull-request-monitoring.version>
-    <json-unit-assertj.version>2.36.1</json-unit-assertj.version>
+    <saxon-he.version>12.1</saxon-he.version>
     <gson.version>2.10.1</gson.version>
+
+    <xmlunit.version>2.9.1</xmlunit.version>
     <jsoup.version>1.15.4</jsoup.version>
-    <docker-fixtures.version>1.11</docker-fixtures.version>
     <testcontainers.version>1.17.6</testcontainers.version>
-    <job-dsl.version>1.82</job-dsl.version>
-    <xmlunit.version>2.9.0</xmlunit.version>
+    <job-dsl.version>1.83</job-dsl.version>
 
-    <coverage-model.version>0.18.0</coverage-model.version>
-    <prism-api.version>1.29.0-3</prism-api.version>
+    <coverage-model.version>0.19.0</coverage-model.version>
     <git-forensics.version>2.0.0</git-forensics.version>
+    <prism-api.version>1.29.0-3</prism-api.version>
+    <pull-request-monitoring.version>1.7.8</pull-request-monitoring.version>
 
-    <jquery3-api.version>3.6.3-1</jquery3-api.version>
-    <plugin-util-api.version>3.1.0</plugin-util-api.version>
-    <bootstrap5-api.version>5.2.2-1</bootstrap5-api.version>
-    <font-awesome-api.version>6.3.0-1</font-awesome-api.version>
-    <data-tables-api.version>1.13.3-1</data-tables-api.version>
-    <echarts-api.version>5.4.0-2</echarts-api.version>
-
-    <forensics-api.version>2.0.0</forensics-api.version>
   </properties>
 
   <developers>
@@ -108,7 +98,6 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>ionicons-api</artifactId>
-      <version>45.vf54fca_5d2154</version>
     </dependency>
     <dependency>
       <groupId>net.sf.trove4j</groupId>
@@ -165,37 +154,30 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>echarts-api</artifactId>
-      <version>${echarts-api.version}</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>bootstrap5-api</artifactId>
-      <version>${bootstrap5-api.version}</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>jquery3-api</artifactId>
-      <version>${jquery3-api.version}</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>data-tables-api</artifactId>
-      <version>${data-tables-api.version}</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>forensics-api</artifactId>
-      <version>${forensics-api.version}</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>plugin-util-api</artifactId>
-      <version>${plugin-util-api.version}</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>font-awesome-api</artifactId>
-      <version>${font-awesome-api.version}</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
@@ -220,7 +202,6 @@
       <artifactId>plugin-util-api</artifactId>
       <classifier>tests</classifier>
       <scope>test</scope>
-      <version>${plugin-util-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.xmlunit</groupId>
@@ -254,18 +235,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>net.javacrumbs.json-unit</groupId>
-      <artifactId>json-unit-assertj</artifactId>
-      <version>${json-unit-assertj.version}</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.ow2.asm</groupId>
-          <artifactId>asm</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-cps</artifactId>
@@ -326,7 +295,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>timestamper</artifactId>
-      <version>1.20</version>
+      <version>1.22</version>
       <scope>test</scope>
     </dependency>
 

plugin/src/main/java/io/jenkins/plugins/coverage/metrics/model/ElementFormatter.java

@@ -226,6 +226,21 @@ public String formatValueWithMetric(final Value value) {
                 + format(value, Functions.getCurrentLocale());
     }
 
+    /**
+     * Returns a formatted and localized String representation of the specified value prefixed with the metric name.
+     * The value will be printed with all details (number of covered and missed items).
+     *
+     * @param value
+     *         the value to format
+     *
+     * @return the value formatted as a string
+     */
+    @SuppressWarnings("unused") // Called by jelly view
+    public String formatDetailedValueWithMetric(final Value value) {
+        return getDisplayName(value.getMetric()) + ": "
+                + formatDetails(value, Functions.getCurrentLocale());
+    }
+
     /**
      * Transforms percentages with a ',' decimal separator to a representation using a '.' in order to use the
      * percentage for styling HTML tags.

plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageBuildAction.java

@@ -277,6 +277,23 @@ public Baseline getDeltaBaseline(final Baseline baseline) {
         throw new NoSuchElementException("No delta baseline for this baseline: " + baseline);
     }
 
+    /**
+     * Returns the title text for the specified baseline.
+     *
+     * @param baseline
+     *         the baseline to get the title for
+     *
+     * @return the title
+     */
+    public String getTitle(final Baseline baseline) {
+        if (hasDelta(baseline)) {
+            return getDeltaBaseline(baseline).getTitle();
+        }
+        else {
+            return baseline.getTitle();
+        }
+    }
+
     /**
      * Returns all available values for the specified baseline.
      *