From 23dab9a1692d5eba371923e4551717c463688cc2 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Mon, 19 Apr 2021 20:08:51 +0200
Subject: [PATCH 01/31] Migrate UI to Bootstrap 5.

---
 plugin/pom.xml                                |  6 +--
 .../core/model/ConsoleDetail/index.jelly      |  2 +-
 .../model/FixedWarningsDetail/index.jelly     |  2 +-
 .../core/model/InfoErrorDetail/index.jelly    |  2 +-
 .../core/model/IssuesDetail/filled.jelly      | 24 ++++++------
 .../core/model/IssuesDetail/index.jelly       |  2 +-
 .../core/model/SourceDetail/index.jelly       |  2 +-
 .../portlets/IssuesTablePortlet/portlet.jelly |  2 +-
 .../src/main/resources/issues/history.jelly   | 18 ++++-----
 .../main/resources/issues/log-messages.jelly  |  2 +-
 .../main/resources/issues/property-tab.jelly  |  2 +-
 .../src/main/resources/issues/property.jelly  |  2 +-
 .../issues/severity-distribution.jelly        |  8 ++--
 .../main/resources/issues/zero-issues.jelly   |  2 +-
 plugin/src/main/webapp/js/issues-detail.js    | 38 +++++++++++++------
 15 files changed, 65 insertions(+), 49 deletions(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index 84bf54ff82..91bba52a19 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -36,7 +36,7 @@
     <echarts-api.version>5.0.2-1</echarts-api.version>
     <font-awesome-api.version>5.15.2-2</font-awesome-api.version>
     <jquery3-api.version>3.6.0-1</jquery3-api.version>
-    <bootstrap4-api.version>4.6.0-3</bootstrap4-api.version>
+    <bootstrap5-api.version>5.0.0-beta3-1-SNAPSHOT</bootstrap5-api.version>
     <popper-api.version>1.16.1-2</popper-api.version>
     <error_prone_annotations.version>2.6.0</error_prone_annotations.version>
 
@@ -173,8 +173,8 @@
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
-      <artifactId>bootstrap4-api</artifactId>
-      <version>${bootstrap4-api.version}</version>
+      <artifactId>bootstrap5-api</artifactId>
+      <version>${bootstrap5-api.version}</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/ConsoleDetail/index.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/ConsoleDetail/index.jelly
index c53656d8ca..e390077312 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/ConsoleDetail/index.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/ConsoleDetail/index.jelly
@@ -1,5 +1,5 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:bs="/bootstrap">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:bs="/bootstrap5">
   <st:header name="Content-Type" value="text/html;charset=UTF-8" />
 
   <bs:page it="${it}">
diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/FixedWarningsDetail/index.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/FixedWarningsDetail/index.jelly
index 571ef2a67f..7ec563d87d 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/FixedWarningsDetail/index.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/FixedWarningsDetail/index.jelly
@@ -1,5 +1,5 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:bs="/bootstrap">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:bs="/bootstrap5">
 
   <st:header name="Content-Type" value="text/html;charset=UTF-8"/>
 
diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/InfoErrorDetail/index.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/InfoErrorDetail/index.jelly
index 7b073c05e1..62bb6959b9 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/InfoErrorDetail/index.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/InfoErrorDetail/index.jelly
@@ -1,5 +1,5 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:bs="/bootstrap" xmlns:issues="/issues">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:bs="/bootstrap5" xmlns:issues="/issues">
 
   <st:header name="Content-Type" value="text/html;charset=UTF-8"/>
 
diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
index 1ec36e5dae..7619f577fe 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
@@ -1,13 +1,13 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:issues="/issues" xmlns:dt="/data-tables" xmlns:c="/charts" xmlns:bs="/bootstrap">
+<j:jelly xmlns:j="jelly:core" xmlns:issues="/issues" xmlns:dt="/data-tables" xmlns:c="/charts" xmlns:bs="/bootstrap5">
 
   <div class="row py-3">
 
     <!-- A carousel with all pie charts on small screens -->
-    <div class="col-xs-12 col-sm-6 col-md-5 col-lg-4 d-none d-block d-lg-block d-xl-none d-xxl-none">
+    <div class="col-xs-12 col-sm-6 col-md-5 col-lg-4 d-none d-block d-sm-block d-xl-none d-xxl-none">
 
       <bs:card title="${%Overview}" fontAwesomeIcon="bell">
-        <div id="overview-carousel" class="carousel slide" data-interval="false">
+        <div id="overview-carousel" class="carousel slide carousel-dark" data-bs-interval="false">
           <div class="carousel-inner">
             <div class="carousel-item active">
               <c:pie-chart id="severities" model="${it.severityModel}" height="256" enableLinks="true" />
@@ -16,14 +16,14 @@
               <c:pie-chart id="trend" model="${it.trendModel}" height="256" enableLinks="true"/>
             </div>
           </div>
-          <a class="carousel-control-prev" data-target="#overview-carousel" role="button" data-slide="prev">
+          <button class="carousel-control-prev" type="button" data-bs-target="#overview-carousel" data-bs-slide="prev">
             <span class="carousel-control-prev-icon" aria-hidden="true"/>
-            <span class="sr-only">Previous</span>
-          </a>
-          <a class="carousel-control-next" data-target="#overview-carousel" role="button" data-slide="next">
+            <span class="visually-hidden">Previous</span>
+          </button>
+          <button class="carousel-control-next" type="button" data-bs-target="#overview-carousel" data-bs-slide="next">
             <span class="carousel-control-next-icon" aria-hidden="true"/>
-            <span class="sr-only">Next</span>
-          </a>
+            <span class="visually-hidden">Next</span>
+          </button>
         </div>
       </bs:card>
 
@@ -78,16 +78,16 @@
 
               <j:if test="${i.isNotEmpty()}">
                 <li class="nav-item">
-                  <a class="nav-link" role="tab" data-toggle="tab" href="#issuesContent">${l.issues}</a>
+                  <a class="nav-link" role="tab" data-bs-toggle="tab" href="#issuesContent">${l.issues}</a>
                 </li>
                 <j:if test="${it.isBlameVisible()}">
                   <li class="nav-item">
-                    <a class="nav-link" role="tab" data-toggle="tab" href="#blamesContent">${%SCM Blames}</a>
+                    <a class="nav-link" role="tab" data-bs-toggle="tab" href="#blamesContent">${%SCM Blames}</a>
                   </li>
                 </j:if>
                 <j:if test="${it.isForensicsVisible()}">
                   <li class="nav-item">
-                    <a class="nav-link" role="tab" data-toggle="tab" href="#forensicsContent">${%SCM Forensics}</a>
+                    <a class="nav-link" role="tab" data-bs-toggle="tab" href="#forensicsContent">${%SCM Forensics}</a>
                   </li>
                 </j:if>
               </j:if>
diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/index.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/index.jelly
index 1780923d8a..0da9de05e9 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/index.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/index.jelly
@@ -1,5 +1,5 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:bs="/bootstrap">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:bs="/bootstrap5">
 
   <st:header name="Content-Type" value="text/html;charset=UTF-8"/>
 
diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/SourceDetail/index.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/SourceDetail/index.jelly
index 0372b681c1..8a62f33cfb 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/SourceDetail/index.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/SourceDetail/index.jelly
@@ -1,5 +1,5 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:bs="/bootstrap">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:bs="/bootstrap5">
 
   <st:header name="Content-Type" value="text/html;charset=UTF-8"/>
 
diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/portlets/IssuesTablePortlet/portlet.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/portlets/IssuesTablePortlet/portlet.jelly
index 6dd63e6862..5205e9cb73 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/portlets/IssuesTablePortlet/portlet.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/portlets/IssuesTablePortlet/portlet.jelly
@@ -51,7 +51,7 @@
 
           </j:when>
           <j:otherwise>
-            <st:adjunct includes="io.jenkins.plugins.bootstrap4"/>
+            <st:adjunct includes="io.jenkins.plugins.bootstrap5"/>
 
             <link rel="stylesheet" href="${resURL}/plugin/warnings-ng/css/custom-style.css"/>
 
diff --git a/plugin/src/main/resources/issues/history.jelly b/plugin/src/main/resources/issues/history.jelly
index ccce0dfc0f..9edc05acd6 100644
--- a/plugin/src/main/resources/issues/history.jelly
+++ b/plugin/src/main/resources/issues/history.jelly
@@ -1,5 +1,5 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:bs="/bootstrap">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:bs="/bootstrap5">
 
   <st:documentation>
     Renders a chart with the build history in a bootstrap card.
@@ -7,7 +7,7 @@
 
   <bs:card title="${%History}" fontAwesomeIcon="chart-line">
 
-    <div id="trend-carousel" class="carousel slide" data-interval="false">
+    <div id="trend-carousel" class="carousel slide carousel-dark" data-bs-interval="false">
       <div class="carousel-inner">
         <div class="carousel-item active">
           <div id="severities-trend-chart" class="graph-cursor-pointer card-chart"/>
@@ -20,18 +20,18 @@
         </div>
         <j:if test="${it.healthReportEnabled}">
           <div class="carousel-item">
-            <div id="health-trend-chart" class="graph-cursor-pointer card-chart"/>
+            <div id="health-trend-chart" class="graph-cursor-pointer card-chart d-block w-100"/>
           </div>
         </j:if>
       </div>
-      <a class="carousel-control-prev" data-target="#trend-carousel" role="button" data-slide="prev">
+      <button class="carousel-control-prev" type="button" data-bs-target="#trend-carousel" data-bs-slide="prev">
         <span class="carousel-control-prev-icon" aria-hidden="true"/>
-        <span class="sr-only">Previous</span>
-      </a>
-      <a class="carousel-control-next" data-target="#trend-carousel" role="button" data-slide="next">
+        <span class="visually-hidden">Previous</span>
+      </button>
+      <button class="carousel-control-next" type="button" data-bs-target="#trend-carousel" data-bs-slide="next">
         <span class="carousel-control-next-icon" aria-hidden="true"/>
-        <span class="sr-only">Next</span>
-      </a>
+        <span class="visually-hidden">Next</span>
+      </button>
     </div>
 
   </bs:card>
diff --git a/plugin/src/main/resources/issues/log-messages.jelly b/plugin/src/main/resources/issues/log-messages.jelly
index 46c8e2abd8..91611d3dd1 100644
--- a/plugin/src/main/resources/issues/log-messages.jelly
+++ b/plugin/src/main/resources/issues/log-messages.jelly
@@ -1,5 +1,5 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:bs="/bootstrap">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:bs="/bootstrap5">
   <st:documentation>
     Renders info and error messages.
     <st:attribute name="messages" use="required">
diff --git a/plugin/src/main/resources/issues/property-tab.jelly b/plugin/src/main/resources/issues/property-tab.jelly
index ad21d39fe5..9c5fd91a07 100644
--- a/plugin/src/main/resources/issues/property-tab.jelly
+++ b/plugin/src/main/resources/issues/property-tab.jelly
@@ -16,7 +16,7 @@
 
   <j:if test="${size(elements) > 1}">
     <li class="nav-item">
-      <a class="nav-link" role="tab" data-toggle="tab" href="#${property}Content">${name}</a>
+      <a class="nav-link" role="tab" data-bs-toggle="tab" href="#${property}Content">${name}</a>
     </li>
   </j:if>
 
diff --git a/plugin/src/main/resources/issues/property.jelly b/plugin/src/main/resources/issues/property.jelly
index d4eb9640ab..3b2ace525d 100644
--- a/plugin/src/main/resources/issues/property.jelly
+++ b/plugin/src/main/resources/issues/property.jelly
@@ -41,7 +41,7 @@
               <tr>
                 <td>
                   <a href="${t.property}.${key.hashCode()}/"
-                     data-toggle="tooltip" data-placement="right" title="${t.getToolTip(key)}">
+                     data-bs-toggle="tooltip" data-bs-placement="right" title="${t.getToolTip(key)}">
                     ${t.getDisplayName(key)}</a>
                 </td>
                 <td class="text-right">${count}</td>
diff --git a/plugin/src/main/resources/issues/severity-distribution.jelly b/plugin/src/main/resources/issues/severity-distribution.jelly
index e38c5c19cc..e5920b38c7 100644
--- a/plugin/src/main/resources/issues/severity-distribution.jelly
+++ b/plugin/src/main/resources/issues/severity-distribution.jelly
@@ -23,19 +23,19 @@
     <div title="${container.toolTip}">
         <j:if test="${error > 0}">
             <span class="bar-graph severity-error severity-error--hover" style="width:${error / max * 100}%"
-                  data-toggle="tooltip" data-placement="bottom" title="${%error.tooltip(error)}">.</span>
+                  data-bs-toggle="tooltip" data-bs-placement="bottom" title="${%error.tooltip(error)}">.</span>
         </j:if>
         <j:if test="${high > 0}">
             <span class="bar-graph severity-high severity-high--hover" style="width:${high / max * 100}%"
-                  data-toggle="tooltip" data-placement="bottom" title="${%high.tooltip(high)}">.</span>
+                  data-bs-toggle="tooltip" data-bs-placement="bottom" title="${%high.tooltip(high)}">.</span>
         </j:if>
         <j:if test="${normal > 0}">
             <span class="bar-graph severity-normal severity-normal--hover" style="width:${normal / max * 100}%"
-                  data-toggle="tooltip" data-placement="bottom" title="${%normal.tooltip(normal)}">.</span>
+                  data-bs-toggle="tooltip" data-bs-placement="bottom" title="${%normal.tooltip(normal)}">.</span>
         </j:if>
         <j:if test="${low > 0}">
             <span class="bar-graph severity-low severity-low--hover" style="width:${low / max * 100}%"
-                  data-toggle="tooltip" data-placement="bottom" title="${%low.tooltip(low)}">.</span>
+                  data-bs-toggle="tooltip" data-bs-placement="bottom" title="${%low.tooltip(low)}">.</span>
         </j:if>
     </div>
 
diff --git a/plugin/src/main/resources/issues/zero-issues.jelly b/plugin/src/main/resources/issues/zero-issues.jelly
index dfc4845f59..1cc5e9c7d2 100644
--- a/plugin/src/main/resources/issues/zero-issues.jelly
+++ b/plugin/src/main/resources/issues/zero-issues.jelly
@@ -1,5 +1,5 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:bs="/bootstrap" xmlns:fa="/font-awesome" >
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:bs="/bootstrap5" xmlns:fa="/font-awesome" >
 
   <st:documentation>
     Renders a bootstrap card with a zero issues message.
diff --git a/plugin/src/main/webapp/js/issues-detail.js b/plugin/src/main/webapp/js/issues-detail.js
index f13e72e8dc..23b8dbf1ba 100644
--- a/plugin/src/main/webapp/js/issues-detail.js
+++ b/plugin/src/main/webapp/js/issues-detail.js
@@ -1,4 +1,4 @@
-/* global jQuery3, view, echartsJenkinsApi */
+/* global jQuery3, view, echartsJenkinsApi, bootstrap5 */
 (function ($) {
     redrawTrendCharts();
     storeAndRestoreCarousel('trend-carousel');
@@ -23,19 +23,16 @@
      * Activate the tab that has been visited the last time. If there is no such tab, highlight the first one.
      * If the user selects the tab using an #anchor prefer this tab.
      */
-    const detailsTabs = $('#tab-details');
-    detailsTabs.find('li:first-child a').tab('show');
-
+    selectTab('li:first-child a');
     const url = document.location.toString();
     if (url.match('#')) {
         const tabName = url.split('#')[1];
-
-        detailsTabs.find('a[href="#' + tabName + '"]').tab('show');
+        selectTab('a[href="#' + tabName + '"]');
     }
     else {
         const activeTab = localStorage.getItem('activeTab');
         if (activeTab) {
-            detailsTabs.find('a[href="' + activeTab + '"]').tab('show');
+            selectTab('a[href="' + activeTab + '"]');
         }
     }
 
@@ -53,14 +50,32 @@
      * Activate tooltips.
      */
     $(function () {
-        $('[data-toggle="tooltip"]').tooltip();
+        $('[data-bs-toggle="tooltip"]').each(function () {
+            const tooltip = new bootstrap5.Tooltip($(this)[0]);
+            tooltip.enable();
+        });
     });
 
+    /**
+     * Activates the specified tab.
+     *
+     * @param {String} selector - selector of the tab
+     */
+    function selectTab(selector) {
+        const detailsTabs = $('#tab-details');
+        const selectedTab = detailsTabs.find(selector);
+
+        if (selectedTab.length !== 0) {
+            const tab = new bootstrap5.Tab(selectedTab[0]);
+            tab.show();
+        }
+    }
+
     /**
      * Redraws the trend charts. Reads the last selected X-Axis type from the browser local storage and
      * redraws the trend charts.
      */
-    function redrawTrendCharts () {
+    function redrawTrendCharts() {
         const isBuildOnXAxis = !(localStorage.getItem('#trendBuildAxis') === 'date');
 
         /**
@@ -104,7 +119,7 @@
      *
      * @param {String} carouselId - ID of the carousel
      */
-    function storeAndRestoreCarousel (carouselId) {
+    function storeAndRestoreCarousel(carouselId) {
         const carousel = $('#' + carouselId);
         carousel.on('slid.bs.carousel', function (e) {
             localStorage.setItem(carouselId, e.to);
@@ -115,7 +130,8 @@
         });
         const activeCarousel = localStorage.getItem(carouselId);
         if (activeCarousel) {
-            carousel.carousel(parseInt(activeCarousel));
+            const carouselControl = new bootstrap5.Carousel(carousel[0])
+            carouselControl.to(parseInt(activeCarousel));
         }
     }
 })(jQuery3);

From 0c6b0a77bc781cd7b680632eb2966a58bb8ce842 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Fri, 23 Apr 2021 20:21:13 +0200
Subject: [PATCH 02/31] Fix some other minor issues due to BS5 changes.

---
 .../plugins/analysis/core/model/IssuesDetail/filled.jelly   | 6 +++---
 plugin/src/main/resources/issues/history.jelly              | 2 +-
 plugin/src/main/webapp/css/custom-style.css                 | 6 +++---
 plugin/src/main/webapp/js/issues-detail.js                  | 1 +
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
index 7619f577fe..cce88cfc8e 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
@@ -1,7 +1,7 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:issues="/issues" xmlns:dt="/data-tables" xmlns:c="/charts" xmlns:bs="/bootstrap5">
 
-  <div class="row py-3">
+  <div class="row py-3 flex-nowrap">
 
     <!-- A carousel with all pie charts on small screens -->
     <div class="col-xs-12 col-sm-6 col-md-5 col-lg-4 d-none d-block d-sm-block d-xl-none d-xxl-none">
@@ -9,10 +9,10 @@
       <bs:card title="${%Overview}" fontAwesomeIcon="bell">
         <div id="overview-carousel" class="carousel slide carousel-dark" data-bs-interval="false">
           <div class="carousel-inner">
-            <div class="carousel-item active">
+            <div class="carousel-item active" data-bs-interval="false">
               <c:pie-chart id="severities" model="${it.severityModel}" height="256" enableLinks="true" />
             </div>
-            <div class="carousel-item">
+            <div class="carousel-item" data-bs-interval="false">
               <c:pie-chart id="trend" model="${it.trendModel}" height="256" enableLinks="true"/>
             </div>
           </div>
diff --git a/plugin/src/main/resources/issues/history.jelly b/plugin/src/main/resources/issues/history.jelly
index 9edc05acd6..4c36d1ff0a 100644
--- a/plugin/src/main/resources/issues/history.jelly
+++ b/plugin/src/main/resources/issues/history.jelly
@@ -20,7 +20,7 @@
         </div>
         <j:if test="${it.healthReportEnabled}">
           <div class="carousel-item">
-            <div id="health-trend-chart" class="graph-cursor-pointer card-chart d-block w-100"/>
+            <div id="health-trend-chart" class="graph-cursor-pointer card-chart"/>
           </div>
         </j:if>
       </div>
diff --git a/plugin/src/main/webapp/css/custom-style.css b/plugin/src/main/webapp/css/custom-style.css
index 9883a084b7..c2d29720ec 100644
--- a/plugin/src/main/webapp/css/custom-style.css
+++ b/plugin/src/main/webapp/css/custom-style.css
@@ -3,12 +3,12 @@
 /* ------------------------------------------------------------------------------------------------------------------- */
 
 .card-chart {
-    width: 90%;
+    width: 100%;
     min-height: 256px;
     min-width: 256px;
     display: block;
-    margin-left: auto;
-    margin-right: auto;
+    padding-left: 20px;
+    padding-right: 20px;
 }
 
 .log-output {
diff --git a/plugin/src/main/webapp/js/issues-detail.js b/plugin/src/main/webapp/js/issues-detail.js
index 23b8dbf1ba..0f7593ffe5 100644
--- a/plugin/src/main/webapp/js/issues-detail.js
+++ b/plugin/src/main/webapp/js/issues-detail.js
@@ -132,6 +132,7 @@
         if (activeCarousel) {
             const carouselControl = new bootstrap5.Carousel(carousel[0])
             carouselControl.to(parseInt(activeCarousel));
+            carouselControl.pause();
         }
     }
 })(jQuery3);

From 22fe52c66d55d5b8932939910ffe492429e50cb5 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Fri, 23 Apr 2021 22:37:18 +0200
Subject: [PATCH 03/31] Bump UI dependencies to latest versions.

---
 plugin/pom.xml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index 91bba52a19..73cb20de35 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jvnet.hudson.plugins</groupId>
     <artifactId>analysis-pom</artifactId>
-    <version>5.4.0</version>
+    <version>5.6.0</version>
     <relativePath />
   </parent>
 
@@ -33,11 +33,10 @@
     <plugin-util-api.version>2.1.0</plugin-util-api.version>
 
     <data-tables-api.version>1.10.23-3</data-tables-api.version>
-    <echarts-api.version>5.0.2-1</echarts-api.version>
+    <echarts-api.version>5.1.0-2</echarts-api.version>
     <font-awesome-api.version>5.15.2-2</font-awesome-api.version>
     <jquery3-api.version>3.6.0-1</jquery3-api.version>
-    <bootstrap5-api.version>5.0.0-beta3-1-SNAPSHOT</bootstrap5-api.version>
-    <popper-api.version>1.16.1-2</popper-api.version>
+    <bootstrap5-api.version>5.0.0-beta3-1</bootstrap5-api.version>
     <error_prone_annotations.version>2.6.0</error_prone_annotations.version>
 
     <eclipse-collections.version>9.2.0</eclipse-collections.version>
@@ -108,11 +107,6 @@
         <artifactId>script-security</artifactId>
         <version>${script-security.version}</version>
       </dependency>
-      <dependency>
-        <groupId>io.jenkins.plugins</groupId>
-        <artifactId>popper-api</artifactId>
-        <version>${popper-api.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.google.errorprone</groupId>
         <artifactId>error_prone_annotations</artifactId>

From 70f0485d02c3df6020b067389d04e62c9ef0bd98 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Fri, 23 Apr 2021 22:39:16 +0200
Subject: [PATCH 04/31] Bump UI dependencies to latest versions.

---
 plugin/pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index 73cb20de35..c4beabaf9b 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -35,7 +35,6 @@
     <data-tables-api.version>1.10.23-3</data-tables-api.version>
     <echarts-api.version>5.1.0-2</echarts-api.version>
     <font-awesome-api.version>5.15.2-2</font-awesome-api.version>
-    <jquery3-api.version>3.6.0-1</jquery3-api.version>
     <bootstrap5-api.version>5.0.0-beta3-1</bootstrap5-api.version>
     <error_prone_annotations.version>2.6.0</error_prone_annotations.version>
 
@@ -173,7 +172,6 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>jquery3-api</artifactId>
-      <version>${jquery3-api.version}</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>

From 9a363edccb9502275c8391ee072ae3454e3fec32 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Mon, 26 Apr 2021 22:41:25 +0200
Subject: [PATCH 05/31] Add configuration dialog for trend chart.

---
 plugin/pom.xml                                |  2 +-
 .../analysis/core/model/IssuesDetail.java     | 80 +++++++++++++++----
 .../core/model/IssuesDetail/filled.jelly      |  2 +
 plugin/src/main/webapp/js/issues-detail.js    | 31 ++++---
 4 files changed, 87 insertions(+), 28 deletions(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index c4beabaf9b..015b20665a 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -33,7 +33,7 @@
     <plugin-util-api.version>2.1.0</plugin-util-api.version>
 
     <data-tables-api.version>1.10.23-3</data-tables-api.version>
-    <echarts-api.version>5.1.0-2</echarts-api.version>
+    <echarts-api.version>5.1.0-3-rc415.d482e8a32bb7</echarts-api.version>
     <font-awesome-api.version>5.15.2-2</font-awesome-api.version>
     <bootstrap5-api.version>5.0.0-beta3-1</bootstrap5-api.version>
     <error_prone_annotations.version>2.6.0</error_prone_annotations.version>
diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/IssuesDetail.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/IssuesDetail.java
index 93cfcc7316..48d9a61d41 100644
--- a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/IssuesDetail.java
+++ b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/IssuesDetail.java
@@ -16,7 +16,6 @@
 import edu.hm.hafner.analysis.Report;
 import edu.hm.hafner.analysis.Severity;
 import edu.hm.hafner.echarts.ChartModelConfiguration;
-import edu.hm.hafner.echarts.ChartModelConfiguration.AxisType;
 import edu.hm.hafner.echarts.JacksonFacade;
 
 import org.kohsuke.stapler.StaplerRequest;
@@ -52,6 +51,7 @@
 public class IssuesDetail extends DefaultAsyncTableContentProvider implements ModelObject {
     private static final ResetQualityGateCommand RESET_QUALITY_GATE_COMMAND = new ResetQualityGateCommand();
     private static final JacksonFacade JACKSON_FACADE = new JacksonFacade();
+    private static final String DEFAULT_CONFIGURATION = "{}";
 
     private final Run<?, ?> owner;
 
@@ -299,15 +299,25 @@ public String getTrendModel() {
      *         determines whether the Jenkins build number should be used on the X-axis or the date
      *
      * @return the UI model as JSON
+     * @deprecated replaced by {@link #getBuildTrend(String)}
      */
-    @JavaScriptMethod
-    @SuppressWarnings("unused") // Called by jelly view
+    @Deprecated @SuppressWarnings("unused")
     public String getBuildTrend(final boolean isBuildOnXAxis) {
-        return createTrendAsJson(new SeverityTrendChart(), isBuildOnXAxis);
+        return createTrendAsJson(new SeverityTrendChart(), DEFAULT_CONFIGURATION);
     }
 
-    private ChartModelConfiguration createChartConfiguration(final boolean isBuildOnXAxis) {
-        return new ChartModelConfiguration(isBuildOnXAxis ? AxisType.BUILD : AxisType.DATE);
+    /**
+     * Returns the UI model for an ECharts line chart that shows the issues stacked by severity.
+     *
+     * @param configuration
+     *         determines whether the Jenkins build number should be used on the X-axis or the date
+     *
+     * @return the UI model as JSON
+     */
+    @JavaScriptMethod
+    @SuppressWarnings("unused") // Called by jelly view
+    public String getBuildTrend(final String configuration) {
+        return createTrendAsJson(new SeverityTrendChart(), configuration);
     }
 
     /**
@@ -317,11 +327,25 @@ private ChartModelConfiguration createChartConfiguration(final boolean isBuildOn
      *         determines whether the Jenkins build number should be used on the X-axis or the date
      *
      * @return the UI model as JSON
+     * @deprecated replaced by {@link #getToolsTrend(String)}
+     */
+    @Deprecated @SuppressWarnings("unused")
+    public String getToolsTrend(final boolean isBuildOnXAxis) {
+        return createTrendAsJson(new ToolsTrendChart(), DEFAULT_CONFIGURATION);
+    }
+
+    /**
+     * Returns the UI model for an ECharts line chart that shows the issues by tool.
+     *
+     * @param configuration
+     *         determines whether the Jenkins build number should be used on the X-axis or the date
+     *
+     * @return the UI model as JSON
      */
     @JavaScriptMethod
     @SuppressWarnings("unused") // Called by jelly view
-    public String getToolsTrend(final boolean isBuildOnXAxis) {
-        return createTrendAsJson(new ToolsTrendChart(), isBuildOnXAxis);
+    public String getToolsTrend(final String configuration) {
+        return createTrendAsJson(new ToolsTrendChart(), configuration);
     }
 
     /**
@@ -331,11 +355,25 @@ public String getToolsTrend(final boolean isBuildOnXAxis) {
      *         determines whether the Jenkins build number should be used on the X-axis or the date
      *
      * @return the UI model as JSON
+     * @deprecated replaced by {@link #getNewVersusFixedTrend(String)}
+     */
+    @Deprecated @SuppressWarnings("unused")
+    public String getNewVersusFixedTrend(final boolean isBuildOnXAxis) {
+        return createTrendAsJson(new NewVersusFixedTrendChart(), DEFAULT_CONFIGURATION);
+    }
+
+    /**
+     * Returns the UI model for an ECharts line chart that shows the new and fixed issues.
+     *
+     * @param configuration
+     *         determines whether the Jenkins build number should be used on the X-axis or the date
+     *
+     * @return the UI model as JSON
      */
     @JavaScriptMethod
     @SuppressWarnings("unused") // Called by jelly view
-    public String getNewVersusFixedTrend(final boolean isBuildOnXAxis) {
-        return createTrendAsJson(new NewVersusFixedTrendChart(), isBuildOnXAxis);
+    public String getNewVersusFixedTrend(final String configuration) {
+        return createTrendAsJson(new NewVersusFixedTrendChart(), configuration);
     }
 
     /**
@@ -345,11 +383,25 @@ public String getNewVersusFixedTrend(final boolean isBuildOnXAxis) {
      *         determines whether the Jenkins build number should be used on the X-axis or the date
      *
      * @return the UI model as JSON
+     * @deprecated replaced by {@link #getHealthTrend(String)}
+     */
+    @Deprecated @SuppressWarnings("unused")
+    public String getHealthTrend(final boolean isBuildOnXAxis) {
+        return createTrendAsJson(new HealthTrendChart(healthDescriptor), DEFAULT_CONFIGURATION);
+    }
+
+    /**
+     * Returns the UI model for an ECharts line chart that shows the issues by tool.
+     *
+     * @param configuration
+     *         determines whether the Jenkins build number should be used on the X-axis or the date
+     *
+     * @return the UI model as JSON
      */
     @JavaScriptMethod
     @SuppressWarnings("unused") // Called by jelly view
-    public String getHealthTrend(final boolean isBuildOnXAxis) {
-        return createTrendAsJson(new HealthTrendChart(healthDescriptor), isBuildOnXAxis);
+    public String getHealthTrend(final String configuration) {
+        return createTrendAsJson(new HealthTrendChart(healthDescriptor), configuration);
     }
 
     /**
@@ -362,10 +414,10 @@ public boolean isHealthReportEnabled() {
         return healthDescriptor.isEnabled();
     }
 
-    private String createTrendAsJson(final TrendChart trendChart, final boolean isBuildOnXAxis) {
+    private String createTrendAsJson(final TrendChart trendChart, final String configuration) {
         History history = new AnalysisHistory(owner, new ByIdResultSelector(result.getId()));
 
-        return new JacksonFacade().toJson(trendChart.create(history, createChartConfiguration(isBuildOnXAxis)));
+        return new JacksonFacade().toJson(trendChart.create(history, ChartModelConfiguration.fromJson(configuration)));
     }
 
     /**
diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
index cce88cfc8e..0141bcf09f 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
@@ -134,4 +134,6 @@
 
   </div>
 
+  <c:chart-configuration/>
+
 </j:jelly>
diff --git a/plugin/src/main/webapp/js/issues-detail.js b/plugin/src/main/webapp/js/issues-detail.js
index 0f7593ffe5..1812fd93e2 100644
--- a/plugin/src/main/webapp/js/issues-detail.js
+++ b/plugin/src/main/webapp/js/issues-detail.js
@@ -1,5 +1,9 @@
 /* global jQuery3, view, echartsJenkinsApi, bootstrap5 */
 (function ($) {
+    $('#trendConfiguration').on('hidden.bs.modal', function () {
+        redrawTrendCharts();
+    });
+
     redrawTrendCharts();
     storeAndRestoreCarousel('trend-carousel');
     storeAndRestoreCarousel('overview-carousel');
@@ -61,7 +65,7 @@
      *
      * @param {String} selector - selector of the tab
      */
-    function selectTab(selector) {
+    function selectTab (selector) {
         const detailsTabs = $('#tab-details');
         const selectedTab = detailsTabs.find(selector);
 
@@ -75,31 +79,32 @@
      * Redraws the trend charts. Reads the last selected X-Axis type from the browser local storage and
      * redraws the trend charts.
      */
-    function redrawTrendCharts() {
-        const isBuildOnXAxis = !(localStorage.getItem('#trendBuildAxis') === 'date');
+    function redrawTrendCharts () {
+        const configuration = localStorage.getItem('echarts#trendConfiguration');
+        const trendConfigurationDialogId = 'trendConfiguration';
 
         /**
          * Creates a build trend chart that shows the number of issues for a couple of builds.
          * Requires that a DOM <div> element exists with the ID '#severities-trend-chart'.
          */
-        view.getBuildTrend(isBuildOnXAxis, function (lineModel) {
-            echartsJenkinsApi.renderZoomableTrendChart('severities-trend-chart', lineModel.responseJSON, redrawTrendCharts);
+        view.getBuildTrend(configuration, function (lineModel) {
+            echartsJenkinsApi.renderZoomableTrendChart('severities-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
         });
 
         /**
          * Creates a build trend chart that shows the number of issues per tool.
          * Requires that a DOM <div> element exists with the ID '#tools-trend-chart'.
          */
-        view.getToolsTrend(isBuildOnXAxis, function (lineModel) {
-            echartsJenkinsApi.renderZoomableTrendChart('tools-trend-chart', lineModel.responseJSON, redrawTrendCharts);
+        view.getToolsTrend(configuration, function (lineModel) {
+            echartsJenkinsApi.renderZoomableTrendChart('tools-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
         });
 
         /**
          * Creates a build trend chart that shows the number of issues per tool.
          * Requires that a DOM <div> element exists with the ID '#new-versus-fixed-trend-chart'.
          */
-        view.getNewVersusFixedTrend(isBuildOnXAxis, function (lineModel) {
-            echartsJenkinsApi.renderZoomableTrendChart('new-versus-fixed-trend-chart', lineModel.responseJSON, redrawTrendCharts);
+        view.getNewVersusFixedTrend(configuration, function (lineModel) {
+            echartsJenkinsApi.renderZoomableTrendChart('new-versus-fixed-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
         });
 
         /**
@@ -107,8 +112,8 @@
          * Requires that a DOM <div> element exists with the ID '#health-trend-chart'.
          */
         if ($('#health-trend-chart').length) {
-            view.getHealthTrend(isBuildOnXAxis, function (lineModel) {
-                echartsJenkinsApi.renderZoomableTrendChart('health-trend-chart', lineModel.responseJSON, redrawTrendCharts);
+            view.getHealthTrend(configuration, function (lineModel) {
+                echartsJenkinsApi.renderZoomableTrendChart('health-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
             });
         }
     }
@@ -119,7 +124,7 @@
      *
      * @param {String} carouselId - ID of the carousel
      */
-    function storeAndRestoreCarousel(carouselId) {
+    function storeAndRestoreCarousel (carouselId) {
         const carousel = $('#' + carouselId);
         carousel.on('slid.bs.carousel', function (e) {
             localStorage.setItem(carouselId, e.to);
@@ -130,7 +135,7 @@
         });
         const activeCarousel = localStorage.getItem(carouselId);
         if (activeCarousel) {
-            const carouselControl = new bootstrap5.Carousel(carousel[0])
+            const carouselControl = new bootstrap5.Carousel(carousel[0]);
             carouselControl.to(parseInt(activeCarousel));
             carouselControl.pause();
         }

From ef79493c9c27d8ee48be82dc868387c4cfe7dc0e Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Fri, 7 May 2021 16:05:16 +0200
Subject: [PATCH 06/31] Add NPM to dependabot and ignore some UI modules.

---
 .github/dependabot.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 93c791be13..354e5282eb 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -30,8 +30,16 @@ updates:
       - dependency-name: org.webjars:popper.js
         versions:
           - ">= 2.0.0"
+      - dependency-name: org.webjars:bootstrap
+        versions:
+          - ">= 5.0.0"
 
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "daily"
+
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"

From 58f618a41baa7e2974225950229ee278dfa7e7ce Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Sat, 8 May 2021 17:53:05 +0200
Subject: [PATCH 07/31] Make tooltips compatible with BS5.

---
 .../plugins/analysis/core/model/FileNameRenderer.java     | 4 ++--
 plugin/src/main/resources/issues/property.jelly           | 2 +-
 .../src/main/resources/issues/severity-distribution.jelly | 8 ++++----
 .../analysis/core/model/AbstractDetailsModelTest.java     | 2 +-
 .../plugins/analysis/core/model/FileNameRendererTest.java | 2 +-
 .../plugins/analysis/warnings/DryTableModelTest.java      | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/FileNameRenderer.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/FileNameRenderer.java
index 5896eb1972..6940b181b3 100644
--- a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/FileNameRenderer.java
+++ b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/FileNameRenderer.java
@@ -92,8 +92,8 @@ public DomContent createAffectedFileLink(final Issue issue, final String prefix)
         else if (facade.canAccessAffectedFileOf(build, issue)) {
             return a().withHref(prefix + getSourceCodeUrl(issue))
                     .withText(getFileNameAtLine(issue))
-                    .attr("data-toggle", "tooltip")
-                    .attr("data-placement", "bottom")
+                    .attr("data-bs-toggle", "tooltip")
+                    .attr("data-bs-placement", "left")
                     .withTitle(issue.getFileName());
         }
         else {
diff --git a/plugin/src/main/resources/issues/property.jelly b/plugin/src/main/resources/issues/property.jelly
index 3b2ace525d..7fce9f8b7d 100644
--- a/plugin/src/main/resources/issues/property.jelly
+++ b/plugin/src/main/resources/issues/property.jelly
@@ -41,7 +41,7 @@
               <tr>
                 <td>
                   <a href="${t.property}.${key.hashCode()}/"
-                     data-bs-toggle="tooltip" data-bs-placement="right" title="${t.getToolTip(key)}">
+                     data-bs-toggle="tooltip" data-bs-placement="left" title="${t.getToolTip(key)}">
                     ${t.getDisplayName(key)}</a>
                 </td>
                 <td class="text-right">${count}</td>
diff --git a/plugin/src/main/resources/issues/severity-distribution.jelly b/plugin/src/main/resources/issues/severity-distribution.jelly
index e5920b38c7..1224d3d1e0 100644
--- a/plugin/src/main/resources/issues/severity-distribution.jelly
+++ b/plugin/src/main/resources/issues/severity-distribution.jelly
@@ -23,19 +23,19 @@
     <div title="${container.toolTip}">
         <j:if test="${error > 0}">
             <span class="bar-graph severity-error severity-error--hover" style="width:${error / max * 100}%"
-                  data-bs-toggle="tooltip" data-bs-placement="bottom" title="${%error.tooltip(error)}">.</span>
+                  data-bs-toggle="tooltip" data-bs-placement="left" title="${%error.tooltip(error)}">.</span>
         </j:if>
         <j:if test="${high > 0}">
             <span class="bar-graph severity-high severity-high--hover" style="width:${high / max * 100}%"
-                  data-bs-toggle="tooltip" data-bs-placement="bottom" title="${%high.tooltip(high)}">.</span>
+                  data-bs-toggle="tooltip" data-bs-placement="left" title="${%high.tooltip(high)}">.</span>
         </j:if>
         <j:if test="${normal > 0}">
             <span class="bar-graph severity-normal severity-normal--hover" style="width:${normal / max * 100}%"
-                  data-bs-toggle="tooltip" data-bs-placement="bottom" title="${%normal.tooltip(normal)}">.</span>
+                  data-bs-toggle="tooltip" data-bs-placement="left" title="${%normal.tooltip(normal)}">.</span>
         </j:if>
         <j:if test="${low > 0}">
             <span class="bar-graph severity-low severity-low--hover" style="width:${low / max * 100}%"
-                  data-bs-toggle="tooltip" data-bs-placement="bottom" title="${%low.tooltip(low)}">.</span>
+                  data-bs-toggle="tooltip" data-bs-placement="left" title="${%low.tooltip(low)}">.</span>
         </j:if>
     </div>
 
diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/core/model/AbstractDetailsModelTest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/core/model/AbstractDetailsModelTest.java
index 0909e83983..697b4c47b2 100644
--- a/plugin/src/test/java/io/jenkins/plugins/analysis/core/model/AbstractDetailsModelTest.java
+++ b/plugin/src/test/java/io/jenkins/plugins/analysis/core/model/AbstractDetailsModelTest.java
@@ -72,7 +72,7 @@ static void useEnglishLocale() {
      * @return the file name column
      */
     protected String createExpectedFileName(final Issue issue) {
-        return String.format("<a href=\"source.%s/#15\" data-toggle=\"tooltip\" data-placement=\"bottom\" title=\"/path/to/file-1\">file-1:15</a>", issue.getId().toString());
+        return String.format("<a href=\"source.%s/#15\" data-bs-toggle=\"tooltip\" data-bs-placement=\"left\" title=\"/path/to/file-1\">file-1:15</a>", issue.getId().toString());
     }
 
     /**
diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/core/model/FileNameRendererTest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/core/model/FileNameRendererTest.java
index 7dc54c56a3..a857c74685 100644
--- a/plugin/src/test/java/io/jenkins/plugins/analysis/core/model/FileNameRendererTest.java
+++ b/plugin/src/test/java/io/jenkins/plugins/analysis/core/model/FileNameRendererTest.java
@@ -41,7 +41,7 @@ void shouldCreateFileNameAsLink() {
 
         Issue issue = new IssueBuilder().setFileName("/path/to/affected/file.txt").setLineStart(20).build();
 
-        assertThat(renderer.renderAffectedFileLink(issue)).matches("<a href=\"source\\.[0-9a-f-]+/#20\" data-toggle=\"tooltip\" data-placement=\"bottom\" title=\"/path/to/affected/file.txt\">file.txt:20</a>");
+        assertThat(renderer.renderAffectedFileLink(issue)).matches("<a href=\"source\\.[0-9a-f-]+/#20\" data-bs-toggle=\"tooltip\" data-bs-placement=\"left\" title=\"/path/to/affected/file.txt\">file.txt:20</a>");
         assertThat(renderer.renderAffectedFileLink(issue)).contains(issue.getId().toString());
     }
 
diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/DryTableModelTest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/DryTableModelTest.java
index 9d0c4b8f9f..f6234524cc 100644
--- a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/DryTableModelTest.java
+++ b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/DryTableModelTest.java
@@ -82,7 +82,7 @@ void shouldConvertIssueToArrayOfColumns() {
     }
 
     private String getFileNameFor(final Issue issue, final int index) {
-        return String.format("<a href=\"source.%s/#%d\" data-toggle=\"tooltip\" data-placement=\"bottom\" title=\"/path/to/file-"
+        return String.format("<a href=\"source.%s/#%d\" data-bs-toggle=\"tooltip\" data-bs-placement=\"left\" title=\"/path/to/file-"
                         + index + "\">file-%d:%d</a>",  issue.getId().toString(),
                 issue.getLineStart(), index, issue.getLineStart());
     }

From 10d3c922c61c0cb1f0dc2a9472b41d09aab446c2 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Tue, 11 May 2021 14:28:09 +0200
Subject: [PATCH 08/31] Enable configuration dialog for job trend charts.

---
 plugin/pom.xml                                |  2 +-
 .../core/model/AggregatedTrendAction.java     | 27 +++++++++++++++--
 .../analysis/core/model/JobAction.java        | 30 +++++++++++++++----
 .../core/model/IssuesDetail/filled.jelly      |  4 +--
 .../core/model/JobAction/floatingBox.jelly    |  2 +-
 plugin/src/main/webapp/js/issues-detail.js    | 16 +++++-----
 6 files changed, 61 insertions(+), 20 deletions(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index b93e4d991a..d0f9e74788 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -33,7 +33,7 @@
     <plugin-util-api.version>2.1.0</plugin-util-api.version>
 
     <data-tables-api.version>1.10.23-3</data-tables-api.version>
-    <echarts-api.version>5.1.0-3-rc415.d482e8a32bb7</echarts-api.version>
+    <echarts-api.version>5.1.0-3-rc425.a563153f32e2</echarts-api.version>
     <font-awesome-api.version>5.15.2-2</font-awesome-api.version>
     <bootstrap5-api.version>5.0.0-beta3-1</bootstrap5-api.version>
     <error_prone_annotations.version>2.6.0</error_prone_annotations.version>
diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction.java
index 08b0bdde8c..a9f67da3db 100644
--- a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction.java
+++ b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction.java
@@ -75,19 +75,39 @@ private Set<AnalysisHistory> createBuildHistory() {
         }
     }
 
-    @JavaScriptMethod
+    /**
+     * Returns the trend chart model that renders the aggregated build results.
+     *
+     * @return the trend chart
+     * @deprecated replaced {@link #getConfigurableBuildTrendModel(String)}
+     */
     @SuppressWarnings("unused") // Called by jelly view
     @Override
     public String getBuildTrendModel() {
         return new JacksonFacade().toJson(createChartModel());
     }
 
+    /**
+     * Returns the trend chart model that renders the aggregated build results.
+     *
+     * @param configuration
+     *         JSON configuration of the chart (number of builds, etc.)
+     *
+     * @return the trend chart
+     */
+    @JavaScriptMethod
+    @SuppressWarnings("unused") // Called by jelly view
+    public String getConfigurableBuildTrendModel(final String configuration) {
+        return new JacksonFacade().toJson(createChartModel());
+    }
+
     private LinesChartModel createChartModel() {
         Run<?, ?> lastBuild = owner.getLastBuild();
         if (lastBuild == null) {
             return new LinesChartModel();
         }
-        return new ToolsTrendChart().create(new CompositeBuildResultsIterable(lastBuild), new ChartModelConfiguration());
+        return new ToolsTrendChart().create(new CompositeBuildResultsIterable(lastBuild),
+                new ChartModelConfiguration());
     }
 
     @Override
@@ -115,7 +135,8 @@ private static class CompositeBuildResultsIterable implements Iterable<BuildResu
             this.lastBuild = lastBuild;
         }
 
-        @Override @NonNull
+        @Override
+        @NonNull
         public Iterator<BuildResult<AnalysisBuildResult>> iterator() {
             return new CompositeIterator(lastBuild);
         }
diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/JobAction.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/JobAction.java
index 386287f747..7079365aa8 100644
--- a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/JobAction.java
+++ b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/JobAction.java
@@ -178,18 +178,38 @@ public Optional<ResultAction> getLatestAction() {
         return createBuildHistory().getBaselineAction();
     }
 
-    @JavaScriptMethod
+    /**
+     * Returns the trend chart model that renders the aggregated build results.
+     *
+     * @return the trend chart
+     * @deprecated replaced {@link #getConfigurableBuildTrendModel(String)}
+     */
+    @Deprecated
     @Override
     public String getBuildTrendModel() {
-        return new JacksonFacade().toJson(createChartModel());
+        return new JacksonFacade().toJson(createChartModel(new ChartModelConfiguration()));
+    }
+
+    /**
+     * Returns the trend chart model that renders the build results for a specific action.
+     *
+     * @param configuration
+     *         JSON configuration of the chart (number of builds, etc.)
+     *
+     * @return the trend chart
+     */
+    @JavaScriptMethod
+    @SuppressWarnings("unused") // Called by jelly view
+    public String getConfigurableBuildTrendModel(final String configuration) {
+        return new JacksonFacade().toJson(createChartModel(ChartModelConfiguration.fromJson(configuration)));
     }
 
-    private LinesChartModel createChartModel() {
+    private LinesChartModel createChartModel(final ChartModelConfiguration configuration) {
         if (numberOfTools > 1) {
-            return new ToolsTrendChart().create(createBuildHistory(), new ChartModelConfiguration());
+            return new ToolsTrendChart().create(createBuildHistory(), configuration);
         }
         else {
-            return new SeverityTrendChart().create(createBuildHistory(), new ChartModelConfiguration());
+            return new SeverityTrendChart().create(createBuildHistory(), configuration);
         }
     }
 
diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
index 0141bcf09f..5f16a2caeb 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
@@ -1,5 +1,5 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:issues="/issues" xmlns:dt="/data-tables" xmlns:c="/charts" xmlns:bs="/bootstrap5">
+<j:jelly xmlns:j="jelly:core" xmlns:issues="/issues" xmlns:dt="/data-tables" xmlns:c="/charts" xmlns:bs="/bootstrap5" xmlns:st="jelly:stapler" >
 
   <div class="row py-3 flex-nowrap">
 
@@ -134,6 +134,6 @@
 
   </div>
 
-  <c:chart-configuration/>
+  <st:adjunct includes="io.jenkins.plugins.echarts-trend-configuration-dialog"/>
 
 </j:jelly>
diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/JobAction/floatingBox.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/JobAction/floatingBox.jelly
index e5c5fec9f3..f7dfa3a40a 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/JobAction/floatingBox.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/JobAction/floatingBox.jelly
@@ -2,7 +2,7 @@
 <j:jelly xmlns:j="jelly:core" xmlns:c="/charts">
 
   <j:if test="${!from.trendEmpty}">
-    <c:trend-chart it="${from}" title="${from.trendName}" enableLinks="true"/>
+    <c:trend-chart it="${from}" title="${from.trendName}" enableLinks="true" configurationId="defaultTrendConfiguration"/>
   </j:if>
 
 </j:jelly>
diff --git a/plugin/src/main/webapp/js/issues-detail.js b/plugin/src/main/webapp/js/issues-detail.js
index 1812fd93e2..f1504b96ae 100644
--- a/plugin/src/main/webapp/js/issues-detail.js
+++ b/plugin/src/main/webapp/js/issues-detail.js
@@ -1,6 +1,6 @@
 /* global jQuery3, view, echartsJenkinsApi, bootstrap5 */
 (function ($) {
-    $('#trendConfiguration').on('hidden.bs.modal', function () {
+    $('#defaultTrendConfiguration').on('hidden.bs.modal', function () {
         redrawTrendCharts();
     });
 
@@ -80,15 +80,15 @@
      * redraws the trend charts.
      */
     function redrawTrendCharts () {
-        const configuration = localStorage.getItem('echarts#trendConfiguration');
-        const trendConfigurationDialogId = 'trendConfiguration';
+        const configuration = localStorage.getItem('echarts#trend#defaultTrendConfiguration');
+        const trendConfigurationDialogId = 'defaultTrendConfiguration';
 
         /**
          * Creates a build trend chart that shows the number of issues for a couple of builds.
          * Requires that a DOM <div> element exists with the ID '#severities-trend-chart'.
          */
         view.getBuildTrend(configuration, function (lineModel) {
-            echartsJenkinsApi.renderZoomableTrendChart('severities-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
+            echartsJenkinsApi.renderConfigurableTrendChart('severities-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
         });
 
         /**
@@ -96,7 +96,7 @@
          * Requires that a DOM <div> element exists with the ID '#tools-trend-chart'.
          */
         view.getToolsTrend(configuration, function (lineModel) {
-            echartsJenkinsApi.renderZoomableTrendChart('tools-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
+            echartsJenkinsApi.renderConfigurableTrendChart('tools-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
         });
 
         /**
@@ -104,7 +104,7 @@
          * Requires that a DOM <div> element exists with the ID '#new-versus-fixed-trend-chart'.
          */
         view.getNewVersusFixedTrend(configuration, function (lineModel) {
-            echartsJenkinsApi.renderZoomableTrendChart('new-versus-fixed-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
+            echartsJenkinsApi.renderConfigurableTrendChart('new-versus-fixed-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
         });
 
         /**
@@ -113,7 +113,7 @@
          */
         if ($('#health-trend-chart').length) {
             view.getHealthTrend(configuration, function (lineModel) {
-                echartsJenkinsApi.renderZoomableTrendChart('health-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
+                echartsJenkinsApi.renderConfigurableTrendChart('health-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
             });
         }
     }
@@ -134,7 +134,7 @@
             }
         });
         const activeCarousel = localStorage.getItem(carouselId);
-        if (activeCarousel) {
+        if (activeCarousel && carousel.is(':visible')) {
             const carouselControl = new bootstrap5.Carousel(carousel[0]);
             carouselControl.to(parseInt(activeCarousel));
             carouselControl.pause();

From fde4be8561a9cc4a71f01e88fdbdd6366d3e9936 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Thu, 13 May 2021 11:15:20 +0200
Subject: [PATCH 09/31] Use new interface for configurable trend charts.

---
 plugin/pom.xml                                  |  2 +-
 .../core/model/AggregatedTrendAction.java       | 17 ++++++++---------
 .../plugins/analysis/core/model/JobAction.java  |  6 +++---
 .../AggregatedTrendAction/floatingBox.jelly     | 12 +++++-------
 plugin/src/main/webapp/js/issues-detail.js      |  8 ++++----
 .../analysis/warnings/steps/JobActionITest.java |  6 +++---
 6 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index d0f9e74788..6aaa86e239 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -33,7 +33,7 @@
     <plugin-util-api.version>2.1.0</plugin-util-api.version>
 
     <data-tables-api.version>1.10.23-3</data-tables-api.version>
-    <echarts-api.version>5.1.0-3-rc425.a563153f32e2</echarts-api.version>
+    <echarts-api.version>5.1.0-3-rc429.e97f248b5fec</echarts-api.version>
     <font-awesome-api.version>5.15.2-2</font-awesome-api.version>
     <bootstrap5-api.version>5.0.0-beta3-1</bootstrap5-api.version>
     <error_prone_annotations.version>2.6.0</error_prone_annotations.version>
diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction.java
index a9f67da3db..064ba28f27 100644
--- a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction.java
+++ b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction.java
@@ -22,15 +22,16 @@
 import io.jenkins.plugins.analysis.core.charts.JenkinsBuild;
 import io.jenkins.plugins.analysis.core.charts.ToolsTrendChart;
 import io.jenkins.plugins.analysis.core.util.AnalysisBuildResult;
-import io.jenkins.plugins.echarts.AsyncTrendChart;
+import io.jenkins.plugins.echarts.AsyncConfigurableTrendChart;
 
 /**
  * Project action that renders a combined trend chart of all tools in the job.
  *
  * @author Ullrich Hafner
  */
-public class AggregatedTrendAction implements Action, AsyncTrendChart {
+public class AggregatedTrendAction implements Action, AsyncConfigurableTrendChart {
     private static final int MIN_TOOLS = 2;
+    private static final String EMPTY = "{}";
 
     private final Job<?, ?> owner;
 
@@ -81,10 +82,8 @@ private Set<AnalysisHistory> createBuildHistory() {
      * @return the trend chart
      * @deprecated replaced {@link #getConfigurableBuildTrendModel(String)}
      */
-    @SuppressWarnings("unused") // Called by jelly view
-    @Override
     public String getBuildTrendModel() {
-        return new JacksonFacade().toJson(createChartModel());
+        return getConfigurableBuildTrendModel(EMPTY);
     }
 
     /**
@@ -95,19 +94,19 @@ public String getBuildTrendModel() {
      *
      * @return the trend chart
      */
+    @Override
     @JavaScriptMethod
     @SuppressWarnings("unused") // Called by jelly view
     public String getConfigurableBuildTrendModel(final String configuration) {
-        return new JacksonFacade().toJson(createChartModel());
+        return new JacksonFacade().toJson(createChartModel(ChartModelConfiguration.fromJson(configuration)));
     }
 
-    private LinesChartModel createChartModel() {
+    private LinesChartModel createChartModel(final ChartModelConfiguration configuration) {
         Run<?, ?> lastBuild = owner.getLastBuild();
         if (lastBuild == null) {
             return new LinesChartModel();
         }
-        return new ToolsTrendChart().create(new CompositeBuildResultsIterable(lastBuild),
-                new ChartModelConfiguration());
+        return new ToolsTrendChart().create(new CompositeBuildResultsIterable(lastBuild), configuration);
     }
 
     @Override
diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/JobAction.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/JobAction.java
index 7079365aa8..13b17fafb1 100644
--- a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/JobAction.java
+++ b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/JobAction.java
@@ -21,7 +21,7 @@
 import io.jenkins.plugins.analysis.core.charts.ToolsTrendChart;
 import io.jenkins.plugins.analysis.core.util.AnalysisBuildResult;
 import io.jenkins.plugins.analysis.core.util.TrendChartType;
-import io.jenkins.plugins.echarts.AsyncTrendChart;
+import io.jenkins.plugins.echarts.AsyncConfigurableTrendChart;
 
 /**
  * A job action displays a link on the side panel of a job. This action also is responsible to render the historical
@@ -29,7 +29,7 @@
  *
  * @author Ullrich Hafner
  */
-public class JobAction implements Action, AsyncTrendChart {
+public class JobAction implements Action, AsyncConfigurableTrendChart {
     private final Job<?, ?> owner;
     private final StaticAnalysisLabelProvider labelProvider;
     private final int numberOfTools;
@@ -185,7 +185,6 @@ public Optional<ResultAction> getLatestAction() {
      * @deprecated replaced {@link #getConfigurableBuildTrendModel(String)}
      */
     @Deprecated
-    @Override
     public String getBuildTrendModel() {
         return new JacksonFacade().toJson(createChartModel(new ChartModelConfiguration()));
     }
@@ -198,6 +197,7 @@ public String getBuildTrendModel() {
      *
      * @return the trend chart
      */
+    @Override
     @JavaScriptMethod
     @SuppressWarnings("unused") // Called by jelly view
     public String getConfigurableBuildTrendModel(final String configuration) {
diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction/floatingBox.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction/floatingBox.jelly
index a535f2cf0e..29baa86f20 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction/floatingBox.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction/floatingBox.jelly
@@ -1,10 +1,8 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core">
-
-  <j:jelly xmlns:j="jelly:core" xmlns:c="/charts">
-
-    <c:trend-chart it="${from}" title="${%Aggregated Analysis Results}"/>
-
-  </j:jelly>
+<j:jelly xmlns:j="jelly:core" xmlns:c="/charts">
 
+  <j:if test="${!from.trendEmpty}">
+    <c:trend-chart it="${from}" title="${%Aggregated Analysis Results}" configurationId="defaultTrendConfiguration"/>
+  </j:if>
 </j:jelly>
+
diff --git a/plugin/src/main/webapp/js/issues-detail.js b/plugin/src/main/webapp/js/issues-detail.js
index f1504b96ae..59afd00e96 100644
--- a/plugin/src/main/webapp/js/issues-detail.js
+++ b/plugin/src/main/webapp/js/issues-detail.js
@@ -88,7 +88,7 @@
          * Requires that a DOM <div> element exists with the ID '#severities-trend-chart'.
          */
         view.getBuildTrend(configuration, function (lineModel) {
-            echartsJenkinsApi.renderConfigurableTrendChart('severities-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
+            echartsJenkinsApi.renderConfigurableZoomableTrendChart('severities-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
         });
 
         /**
@@ -96,7 +96,7 @@
          * Requires that a DOM <div> element exists with the ID '#tools-trend-chart'.
          */
         view.getToolsTrend(configuration, function (lineModel) {
-            echartsJenkinsApi.renderConfigurableTrendChart('tools-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
+            echartsJenkinsApi.renderConfigurableZoomableTrendChart('tools-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
         });
 
         /**
@@ -104,7 +104,7 @@
          * Requires that a DOM <div> element exists with the ID '#new-versus-fixed-trend-chart'.
          */
         view.getNewVersusFixedTrend(configuration, function (lineModel) {
-            echartsJenkinsApi.renderConfigurableTrendChart('new-versus-fixed-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
+            echartsJenkinsApi.renderConfigurableZoomableTrendChart('new-versus-fixed-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
         });
 
         /**
@@ -113,7 +113,7 @@
          */
         if ($('#health-trend-chart').length) {
             view.getHealthTrend(configuration, function (lineModel) {
-                echartsJenkinsApi.renderConfigurableTrendChart('health-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
+                echartsJenkinsApi.renderConfigurableZoomableTrendChart('health-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
             });
         }
     }
diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/steps/JobActionITest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/steps/JobActionITest.java
index 862f97db33..1353da6a2f 100644
--- a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/steps/JobActionITest.java
+++ b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/steps/JobActionITest.java
@@ -21,7 +21,7 @@
 import io.jenkins.plugins.analysis.core.util.TrendChartType;
 import io.jenkins.plugins.analysis.warnings.CheckStyle;
 import io.jenkins.plugins.analysis.warnings.Eclipse;
-import io.jenkins.plugins.echarts.AsyncTrendChart;
+import io.jenkins.plugins.echarts.AsyncConfigurableTrendChart;
 
 import static io.jenkins.plugins.analysis.core.assertions.Assertions.*;
 
@@ -196,11 +196,11 @@ public void shouldHaveSidebarLinkEvenWhenLastActionHasNoResults() {
         assertThat(jobAction).isNotNull();
     }
 
-    private void assertThatTrendChartIsVisible(final AsyncTrendChart trendChart) {
+    private void assertThatTrendChartIsVisible(final AsyncConfigurableTrendChart trendChart) {
         assertThat(trendChart.isTrendVisible()).isTrue();
     }
 
-    private void assertThatTrendChartIsHidden(final AsyncTrendChart trendChart) {
+    private void assertThatTrendChartIsHidden(final AsyncConfigurableTrendChart trendChart) {
         assertThat(trendChart.isTrendVisible()).isFalse();
     }
 

From 69270a445435b6abd9281e50adff0f5b4bfbd297 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Thu, 13 May 2021 16:00:51 +0200
Subject: [PATCH 10/31] Fix 2 new warnings.

---
 .../plugins/analysis/core/model/AggregatedTrendAction.java      | 1 +
 .../io/jenkins/plugins/analysis/core/model/IssuesDetail.java    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction.java
index 064ba28f27..26aa46f603 100644
--- a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction.java
+++ b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction.java
@@ -82,6 +82,7 @@ private Set<AnalysisHistory> createBuildHistory() {
      * @return the trend chart
      * @deprecated replaced {@link #getConfigurableBuildTrendModel(String)}
      */
+    @Deprecated
     public String getBuildTrendModel() {
         return getConfigurableBuildTrendModel(EMPTY);
     }
diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/IssuesDetail.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/IssuesDetail.java
index 48d9a61d41..8bc22bb912 100644
--- a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/IssuesDetail.java
+++ b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/IssuesDetail.java
@@ -47,7 +47,7 @@
  *
  * @author Ullrich Hafner
  */
-@SuppressWarnings({"PMD.ExcessiveImports", "ClassDataAbstractionCoupling", "ClassFanOutComplexity"})
+@SuppressWarnings({"PMD.ExcessiveImports", "PMD.GodClass", "ClassDataAbstractionCoupling", "ClassFanOutComplexity"})
 public class IssuesDetail extends DefaultAsyncTableContentProvider implements ModelObject {
     private static final ResetQualityGateCommand RESET_QUALITY_GATE_COMMAND = new ResetQualityGateCommand();
     private static final JacksonFacade JACKSON_FACADE = new JacksonFacade();

From 813a9279644183287433cfe109e70093461c011a Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Mon, 17 May 2021 00:59:03 +0200
Subject: [PATCH 11/31] Use new trend setup dialog IDs.

---
 .../analysis/core/model/AggregatedTrendAction/floatingBox.jelly | 2 +-
 .../plugins/analysis/core/model/JobAction/floatingBox.jelly     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction/floatingBox.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction/floatingBox.jelly
index 29baa86f20..359c2d5e43 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction/floatingBox.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction/floatingBox.jelly
@@ -2,7 +2,7 @@
 <j:jelly xmlns:j="jelly:core" xmlns:c="/charts">
 
   <j:if test="${!from.trendEmpty}">
-    <c:trend-chart it="${from}" title="${%Aggregated Analysis Results}" configurationId="defaultTrendConfiguration"/>
+    <c:trend-chart it="${from}" title="${%Aggregated Analysis Results}" configurationId="default"/>
   </j:if>
 </j:jelly>
 
diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/JobAction/floatingBox.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/JobAction/floatingBox.jelly
index f7dfa3a40a..9fb0f4eb72 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/JobAction/floatingBox.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/JobAction/floatingBox.jelly
@@ -2,7 +2,7 @@
 <j:jelly xmlns:j="jelly:core" xmlns:c="/charts">
 
   <j:if test="${!from.trendEmpty}">
-    <c:trend-chart it="${from}" title="${from.trendName}" enableLinks="true" configurationId="defaultTrendConfiguration"/>
+    <c:trend-chart it="${from}" title="${from.trendName}" enableLinks="true" configurationId="default"/>
   </j:if>
 
 </j:jelly>

From 7648aba35d3d1018f4f246abdd3137b468bd5298 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Mon, 17 May 2021 23:28:17 +0200
Subject: [PATCH 12/31] Use new echarts version.

---
 plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index 5d51d58d46..f19cdb3cc9 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -34,7 +34,7 @@
 
     <data-tables-api.version>1.10.23-3</data-tables-api.version>
     <font-awesome-api.version>5.15.3-2</font-awesome-api.version>
-    <echarts-api.version>5.1.0-3-rc429.e97f248b5fec</echarts-api.version>
+    <echarts-api.version>5.1.0-3-rc438.c93a60077404</echarts-api.version>
     <bootstrap5-api.version>5.0.0-beta3-1</bootstrap5-api.version>
     <error_prone_annotations.version>2.6.0</error_prone_annotations.version>
 

From 75995009fa6560b8f4f0adf7b7ce85d83be09fb7 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Tue, 18 May 2021 19:59:35 +0200
Subject: [PATCH 13/31] Add a configuration of the build trend charts on the
 job view.

---
 .../analysis/core/model/JobAction.java        | 64 +++++++++++++++++--
 .../analysis/core/model/ResultAction.java     |  4 ++
 .../core/model/JobAction/floatingBox.jelly    |  6 +-
 .../plugins/analysis/warnings/charts.jelly    | 51 +++++++++++++++
 4 files changed, 116 insertions(+), 9 deletions(-)
 create mode 100644 plugin/src/main/resources/io/jenkins/plugins/analysis/warnings/charts.jelly

diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/JobAction.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/JobAction.java
index 13b17fafb1..5f982b7ec4 100644
--- a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/JobAction.java
+++ b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/JobAction.java
@@ -3,10 +3,15 @@
 import java.io.IOException;
 import java.util.Optional;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 import edu.hm.hafner.echarts.BuildResult;
 import edu.hm.hafner.echarts.ChartModelConfiguration;
 import edu.hm.hafner.echarts.JacksonFacade;
-import edu.hm.hafner.echarts.LinesChartModel;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 
 import org.kohsuke.stapler.StaplerRequest;
@@ -17,15 +22,18 @@
 import hudson.model.Run;
 import jenkins.model.Jenkins;
 
+import io.jenkins.plugins.analysis.core.charts.HealthTrendChart;
+import io.jenkins.plugins.analysis.core.charts.NewVersusFixedTrendChart;
 import io.jenkins.plugins.analysis.core.charts.SeverityTrendChart;
 import io.jenkins.plugins.analysis.core.charts.ToolsTrendChart;
+import io.jenkins.plugins.analysis.core.charts.TrendChart;
 import io.jenkins.plugins.analysis.core.util.AnalysisBuildResult;
 import io.jenkins.plugins.analysis.core.util.TrendChartType;
 import io.jenkins.plugins.echarts.AsyncConfigurableTrendChart;
 
 /**
  * A job action displays a link on the side panel of a job. This action also is responsible to render the historical
- * trend via its associated 'floatingBox.jelly' view.
+ * trend via its associated 'charts.jelly' view.
  *
  * @author Ullrich Hafner
  */
@@ -42,6 +50,7 @@ public class JobAction implements Action, AsyncConfigurableTrendChart {
      *         the job that owns this action
      * @param labelProvider
      *         the label provider
+     *
      * @deprecated use {@link #JobAction(Job, StaticAnalysisLabelProvider, int)}
      */
     @Deprecated
@@ -186,7 +195,7 @@ public Optional<ResultAction> getLatestAction() {
      */
     @Deprecated
     public String getBuildTrendModel() {
-        return new JacksonFacade().toJson(createChartModel(new ChartModelConfiguration()));
+        return getConfigurableBuildTrendModel("{}");
     }
 
     /**
@@ -201,16 +210,57 @@ public String getBuildTrendModel() {
     @JavaScriptMethod
     @SuppressWarnings("unused") // Called by jelly view
     public String getConfigurableBuildTrendModel(final String configuration) {
-        return new JacksonFacade().toJson(createChartModel(ChartModelConfiguration.fromJson(configuration)));
+        String chartType = getString(configuration, "chartType", "severity");
+
+        return new JacksonFacade().toJson(selectChart(chartType).create(
+                createBuildHistory(), ChartModelConfiguration.fromJson(configuration)));
     }
 
-    private LinesChartModel createChartModel(final ChartModelConfiguration configuration) {
+    private TrendChart selectChart(final String chartType) {
+        if ("new".equals(chartType)) {
+            return new NewVersusFixedTrendChart();
+        }
+        if ("health".equals(chartType)) {
+            Optional<ResultAction> latestAction = getLatestAction();
+            if (latestAction.isPresent()) {
+                return new HealthTrendChart(latestAction.get().getHealthDescriptor());
+            }
+        }
         if (numberOfTools > 1) {
-            return new ToolsTrendChart().create(createBuildHistory(), configuration);
+            return new ToolsTrendChart();
         }
         else {
-            return new SeverityTrendChart().create(createBuildHistory(), configuration);
+            return new SeverityTrendChart();
+        }
+    }
+
+    /**
+     * Returns the text value of the specified JSON property.
+     *
+     * @param json
+     *         the JSON object to extract the property value from
+     * @param property
+     *         the name of the propety
+     * @param defaultValue
+     *         the default value if the property is undefined or invalid
+     *
+     * @return the value of the property
+     */
+    public String getString(final String json, final String property, final String defaultValue) {
+        try {
+            ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,
+                    false);
+            ObjectNode node = mapper.readValue(json, ObjectNode.class);
+            JsonNode typeNode = node.get(property);
+            if (typeNode != null) {
+                return typeNode.asText(defaultValue);
+            }
         }
+        catch (JsonProcessingException exception) {
+            // ignore
+        }
+
+        return defaultValue;
     }
 
     /**
diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/ResultAction.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/ResultAction.java
index b137b63262..a3a223659c 100644
--- a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/ResultAction.java
+++ b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/ResultAction.java
@@ -195,6 +195,10 @@ public HealthReport getBuildHealth() {
                 getResult().getSizePerSeverity());
     }
 
+    HealthDescriptor getHealthDescriptor() {
+        return healthDescriptor;
+    }
+
     @Override
     public Collection<? extends Action> getProjectActions() {
         return Collections.singleton(
diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/JobAction/floatingBox.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/JobAction/floatingBox.jelly
index 9fb0f4eb72..e81ad896a3 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/JobAction/floatingBox.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/JobAction/floatingBox.jelly
@@ -1,8 +1,10 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:c="/charts">
+<j:jelly xmlns:j="jelly:core" xmlns:c="/charts" xmlns:st="jelly:stapler">
+
+  <st:adjunct includes="io.jenkins.plugins.analysis.warnings.charts"/>
 
   <j:if test="${!from.trendEmpty}">
-    <c:trend-chart it="${from}" title="${from.trendName}" enableLinks="true" configurationId="default"/>
+    <c:trend-chart it="${from}" title="${from.trendName}" enableLinks="true" configurationId="warnings"/>
   </j:if>
 
 </j:jelly>
diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/warnings/charts.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/warnings/charts.jelly
new file mode 100644
index 0000000000..39b3674185
--- /dev/null
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/warnings/charts.jelly
@@ -0,0 +1,51 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:c="/charts">
+
+  <!-- Trend chart configuration that adds a selection of the trend chart type. -->
+  <c:trend-setup suffix="warnings">
+    <div class="mb-3">
+      <label class="form-label fw-bold">
+        Type of chart
+      </label>
+    </div>
+    <div class="mb-3">
+      <input class="form-check-input" type="radio" name="chartType" id="severity" checked="true"/>
+      <label class="form-check-label" for="files">
+        Issues by Severity
+      </label>
+    </div>
+    <div class="mb-3">
+      <input class="form-check-input" type="radio" name="chartType" id="health"/>
+      <label class="form-check-label" for="loc">
+        Issues and Health
+      </label>
+    </div>
+    <div class="mb-3">
+      <input class="form-check-input" type="radio" name="chartType" id="new"/>
+      <label class="form-check-label" for="delta">
+        New and fixed issues
+      </label>
+    </div>
+    <div class="mb-3">
+      <label class="form-label fw-bold">
+        General configuration
+      </label>
+    </div>
+  </c:trend-setup>
+
+  <script>
+    function fillWarnings (trendConfiguration, jsonConfiguration) {
+      const type = jsonConfiguration['chartType'];
+      if (type) {
+        trendConfiguration.find('#' + type).prop('checked', true);
+      }
+    }
+
+    function saveWarnings (trendConfiguration, jsonConfiguration) {
+      jsonConfiguration['chartType'] = trendConfiguration.find('input[name=chartType]:checked').attr('id');
+    }
+
+    echartsJenkinsApi.configureTrend('warnings', fillWarnings, saveWarnings)
+  </script>
+
+</j:jelly>

From bcb1bfdc67c14135ccf3df322c1c8f5d98246e11 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Wed, 19 May 2021 10:58:54 +0200
Subject: [PATCH 14/31] Bump version of echarts to 5.1.0-3-rc440.bf1a5b2177c1.

---
 plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index f19cdb3cc9..0b4d6fca90 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -34,7 +34,7 @@
 
     <data-tables-api.version>1.10.23-3</data-tables-api.version>
     <font-awesome-api.version>5.15.3-2</font-awesome-api.version>
-    <echarts-api.version>5.1.0-3-rc438.c93a60077404</echarts-api.version>
+    <echarts-api.version>5.1.0-3-rc440.bf1a5b2177c1</echarts-api.version>
     <bootstrap5-api.version>5.0.0-beta3-1</bootstrap5-api.version>
     <error_prone_annotations.version>2.6.0</error_prone_annotations.version>
 

From 08dc2b3067c1c3d3f030fac3d6383c9d495ba850 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Thu, 20 May 2021 11:54:26 +0200
Subject: [PATCH 15/31] Simplify JSON parsing of the `chartType` property.

---
 plugin/pom.xml                                |  2 +-
 .../analysis/core/model/JobAction.java        | 38 +------------------
 2 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index 0b4d6fca90..2651466e59 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -34,7 +34,7 @@
 
     <data-tables-api.version>1.10.23-3</data-tables-api.version>
     <font-awesome-api.version>5.15.3-2</font-awesome-api.version>
-    <echarts-api.version>5.1.0-3-rc440.bf1a5b2177c1</echarts-api.version>
+    <echarts-api.version>5.1.0-3-rc442.19377bcf1d00</echarts-api.version>
     <bootstrap5-api.version>5.0.0-beta3-1</bootstrap5-api.version>
     <error_prone_annotations.version>2.6.0</error_prone_annotations.version>
 
diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/JobAction.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/JobAction.java
index 5f982b7ec4..419aac23b9 100644
--- a/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/JobAction.java
+++ b/plugin/src/main/java/io/jenkins/plugins/analysis/core/model/JobAction.java
@@ -3,12 +3,6 @@
 import java.io.IOException;
 import java.util.Optional;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
 import edu.hm.hafner.echarts.BuildResult;
 import edu.hm.hafner.echarts.ChartModelConfiguration;
 import edu.hm.hafner.echarts.JacksonFacade;
@@ -38,6 +32,7 @@
  * @author Ullrich Hafner
  */
 public class JobAction implements Action, AsyncConfigurableTrendChart {
+    private static final JacksonFacade JACKSON_FACADE = new JacksonFacade();
     private final Job<?, ?> owner;
     private final StaticAnalysisLabelProvider labelProvider;
     private final int numberOfTools;
@@ -210,7 +205,7 @@ public String getBuildTrendModel() {
     @JavaScriptMethod
     @SuppressWarnings("unused") // Called by jelly view
     public String getConfigurableBuildTrendModel(final String configuration) {
-        String chartType = getString(configuration, "chartType", "severity");
+        String chartType = JACKSON_FACADE.getString(configuration, "chartType", "severity");
 
         return new JacksonFacade().toJson(selectChart(chartType).create(
                 createBuildHistory(), ChartModelConfiguration.fromJson(configuration)));
@@ -234,35 +229,6 @@ private TrendChart selectChart(final String chartType) {
         }
     }
 
-    /**
-     * Returns the text value of the specified JSON property.
-     *
-     * @param json
-     *         the JSON object to extract the property value from
-     * @param property
-     *         the name of the propety
-     * @param defaultValue
-     *         the default value if the property is undefined or invalid
-     *
-     * @return the value of the property
-     */
-    public String getString(final String json, final String property, final String defaultValue) {
-        try {
-            ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,
-                    false);
-            ObjectNode node = mapper.readValue(json, ObjectNode.class);
-            JsonNode typeNode = node.get(property);
-            if (typeNode != null) {
-                return typeNode.asText(defaultValue);
-            }
-        }
-        catch (JsonProcessingException exception) {
-            // ignore
-        }
-
-        return defaultValue;
-    }
-
     /**
      * Returns whether the trend chart is visible or not.
      *

From 0de001697332669ab7ffbe6438a2e108b6518005 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Fri, 21 May 2021 16:19:12 +0200
Subject: [PATCH 16/31] Kake parsing of configuration more robust.

---
 plugin/src/main/webapp/css/custom-style.css | 9 ---------
 plugin/src/main/webapp/js/issues-detail.js  | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/plugin/src/main/webapp/css/custom-style.css b/plugin/src/main/webapp/css/custom-style.css
index c2d29720ec..36622c35e9 100644
--- a/plugin/src/main/webapp/css/custom-style.css
+++ b/plugin/src/main/webapp/css/custom-style.css
@@ -2,15 +2,6 @@
 /* Size of charts in a card.                                                                                           */
 /* ------------------------------------------------------------------------------------------------------------------- */
 
-.card-chart {
-    width: 100%;
-    min-height: 256px;
-    min-width: 256px;
-    display: block;
-    padding-left: 20px;
-    padding-right: 20px;
-}
-
 .log-output {
     font-size: var(--font-size-sm);
 }
diff --git a/plugin/src/main/webapp/js/issues-detail.js b/plugin/src/main/webapp/js/issues-detail.js
index 59afd00e96..85f3d20d7c 100644
--- a/plugin/src/main/webapp/js/issues-detail.js
+++ b/plugin/src/main/webapp/js/issues-detail.js
@@ -80,7 +80,7 @@
      * redraws the trend charts.
      */
     function redrawTrendCharts () {
-        const configuration = localStorage.getItem('echarts#trend#defaultTrendConfiguration');
+        const configuration = echartsJenkinsApi.readConfiguration('jenkins-echarts-warnings-trend');
         const trendConfigurationDialogId = 'defaultTrendConfiguration';
 
         /**

From 590ead84af63a526c4af0b87e74e3a88c61c74db Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Fri, 21 May 2021 19:56:15 +0200
Subject: [PATCH 17/31] Bump version of ECharts to 5.1.0-3-rc443.de651a379c4a.

---
 plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index 2651466e59..d431e9508c 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -34,7 +34,7 @@
 
     <data-tables-api.version>1.10.23-3</data-tables-api.version>
     <font-awesome-api.version>5.15.3-2</font-awesome-api.version>
-    <echarts-api.version>5.1.0-3-rc442.19377bcf1d00</echarts-api.version>
+    <echarts-api.version>5.1.0-3-rc443.de651a379c4a</echarts-api.version>
     <bootstrap5-api.version>5.0.0-beta3-1</bootstrap5-api.version>
     <error_prone_annotations.version>2.6.0</error_prone_annotations.version>
 

From 017575d5c89918058bbdaffd393d6bb3592b979a Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Mon, 31 May 2021 22:40:18 +0200
Subject: [PATCH 18/31] Refactor trend configuration:

Now the general trend options are changed for *all* charts.
So individual trend chart dialogs change the global configuration and the local one.
---
 .../core/model/IssuesDetail/filled.jelly        |  2 +-
 .../plugins/analysis/warnings/charts.jelly      |  8 +++++---
 plugin/src/main/webapp/js/issues-detail.js      | 17 +++++++++--------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
index 5f16a2caeb..230c455e73 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
@@ -134,6 +134,6 @@
 
   </div>
 
-  <st:adjunct includes="io.jenkins.plugins.echarts-trend-configuration-dialog"/>
+  <st:adjunct includes="io.jenkins.plugins.echarts-trend-default-setup"/>
 
 </j:jelly>
diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/warnings/charts.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/warnings/charts.jelly
index 39b3674185..d28e1c535c 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/warnings/charts.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/warnings/charts.jelly
@@ -34,15 +34,17 @@
   </c:trend-setup>
 
   <script>
-    function fillWarnings (trendConfiguration, jsonConfiguration) {
+    function fillWarnings(trendConfiguration, jsonConfiguration) {
       const type = jsonConfiguration['chartType'];
       if (type) {
         trendConfiguration.find('#' + type).prop('checked', true);
       }
     }
 
-    function saveWarnings (trendConfiguration, jsonConfiguration) {
-      jsonConfiguration['chartType'] = trendConfiguration.find('input[name=chartType]:checked').attr('id');
+    function saveWarnings(trendConfiguration) {
+      return {
+        'chartType': trendConfiguration.find('input[name=chartType]:checked').attr('id')
+      };
     }
 
     echartsJenkinsApi.configureTrend('warnings', fillWarnings, saveWarnings)
diff --git a/plugin/src/main/webapp/js/issues-detail.js b/plugin/src/main/webapp/js/issues-detail.js
index 85f3d20d7c..f570604af6 100644
--- a/plugin/src/main/webapp/js/issues-detail.js
+++ b/plugin/src/main/webapp/js/issues-detail.js
@@ -1,6 +1,8 @@
-/* global jQuery3, view, echartsJenkinsApi, bootstrap5 */
+/* global jQuery3, view, echartsJenkinsApi, bootstrap5, trendDefaultStorageId */
 (function ($) {
-    $('#defaultTrendConfiguration').on('hidden.bs.modal', function () {
+    const trendConfigurationDialogId = 'trend-configuration-default';
+
+    $('#' + trendConfigurationDialogId).on('hidden.bs.modal', function () {
         redrawTrendCharts();
     });
 
@@ -80,15 +82,14 @@
      * redraws the trend charts.
      */
     function redrawTrendCharts () {
-        const configuration = echartsJenkinsApi.readConfiguration('jenkins-echarts-warnings-trend');
-        const trendConfigurationDialogId = 'defaultTrendConfiguration';
+        const configuration = JSON.stringify(echartsJenkinsApi.readConfiguration(trendDefaultStorageId));
 
         /**
          * Creates a build trend chart that shows the number of issues for a couple of builds.
          * Requires that a DOM <div> element exists with the ID '#severities-trend-chart'.
          */
         view.getBuildTrend(configuration, function (lineModel) {
-            echartsJenkinsApi.renderConfigurableZoomableTrendChart('severities-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
+            echartsJenkinsApi.renderConfigurableZoomableTrendChart('severities-trend-chart', lineModel.responseJSON, trendConfigurationDialogId);
         });
 
         /**
@@ -96,7 +97,7 @@
          * Requires that a DOM <div> element exists with the ID '#tools-trend-chart'.
          */
         view.getToolsTrend(configuration, function (lineModel) {
-            echartsJenkinsApi.renderConfigurableZoomableTrendChart('tools-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
+            echartsJenkinsApi.renderConfigurableZoomableTrendChart('tools-trend-chart', lineModel.responseJSON, trendConfigurationDialogId);
         });
 
         /**
@@ -104,7 +105,7 @@
          * Requires that a DOM <div> element exists with the ID '#new-versus-fixed-trend-chart'.
          */
         view.getNewVersusFixedTrend(configuration, function (lineModel) {
-            echartsJenkinsApi.renderConfigurableZoomableTrendChart('new-versus-fixed-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
+            echartsJenkinsApi.renderConfigurableZoomableTrendChart('new-versus-fixed-trend-chart', lineModel.responseJSON, trendConfigurationDialogId);
         });
 
         /**
@@ -113,7 +114,7 @@
          */
         if ($('#health-trend-chart').length) {
             view.getHealthTrend(configuration, function (lineModel) {
-                echartsJenkinsApi.renderConfigurableZoomableTrendChart('health-trend-chart', lineModel.responseJSON, redrawTrendCharts, trendConfigurationDialogId);
+                echartsJenkinsApi.renderConfigurableZoomableTrendChart('health-trend-chart', lineModel.responseJSON, trendConfigurationDialogId);
             });
         }
     }

From 5462ef43a06d5a6d28fe750bbc4a94bfdaf517ed Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Thu, 3 Jun 2021 01:11:35 +0200
Subject: [PATCH 19/31] Extract configuration of charts.

Now configuration of trend charts in job page and trend charts in details pages use a different dialog.
---
 plugin/pom.xml                                              | 2 +-
 .../core/model/AggregatedTrendAction/floatingBox.jelly      | 6 +++++-
 .../plugins/analysis/core/model/IssuesDetail/filled.jelly   | 4 +---
 .../plugins/analysis/core/model/JobAction/floatingBox.jelly | 6 ++++--
 .../io/jenkins/plugins/analysis/warnings/charts.jelly       | 4 +++-
 plugin/src/main/resources/issues/history.jelly              | 4 +++-
 plugin/src/main/webapp/js/issues-detail.js                  | 4 ++--
 7 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index d431e9508c..1fc3fc9679 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -34,7 +34,7 @@
 
     <data-tables-api.version>1.10.23-3</data-tables-api.version>
     <font-awesome-api.version>5.15.3-2</font-awesome-api.version>
-    <echarts-api.version>5.1.0-3-rc443.de651a379c4a</echarts-api.version>
+    <echarts-api.version>5.1.0-3-rc454.dbbdd5633ce2</echarts-api.version>
     <bootstrap5-api.version>5.0.0-beta3-1</bootstrap5-api.version>
     <error_prone_annotations.version>2.6.0</error_prone_annotations.version>
 
diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction/floatingBox.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction/floatingBox.jelly
index 359c2d5e43..7a292a1c7d 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction/floatingBox.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/AggregatedTrendAction/floatingBox.jelly
@@ -1,8 +1,12 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:c="/charts">
+<j:jelly xmlns:j="jelly:core" xmlns:c="/charts" xmlns:st="jelly:stapler">
 
   <j:if test="${!from.trendEmpty}">
+
+    <st:adjunct includes="io.jenkins.plugins.analysis.warnings.charts"/>
+
     <c:trend-chart it="${from}" title="${%Aggregated Analysis Results}" configurationId="default"/>
   </j:if>
+
 </j:jelly>
 
diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
index 230c455e73..cce88cfc8e 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
@@ -1,5 +1,5 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:issues="/issues" xmlns:dt="/data-tables" xmlns:c="/charts" xmlns:bs="/bootstrap5" xmlns:st="jelly:stapler" >
+<j:jelly xmlns:j="jelly:core" xmlns:issues="/issues" xmlns:dt="/data-tables" xmlns:c="/charts" xmlns:bs="/bootstrap5">
 
   <div class="row py-3 flex-nowrap">
 
@@ -134,6 +134,4 @@
 
   </div>
 
-  <st:adjunct includes="io.jenkins.plugins.echarts-trend-default-setup"/>
-
 </j:jelly>
diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/JobAction/floatingBox.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/JobAction/floatingBox.jelly
index e81ad896a3..75a1c3fe06 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/JobAction/floatingBox.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/JobAction/floatingBox.jelly
@@ -1,10 +1,12 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:c="/charts" xmlns:st="jelly:stapler">
 
-  <st:adjunct includes="io.jenkins.plugins.analysis.warnings.charts"/>
-
   <j:if test="${!from.trendEmpty}">
+
+    <st:adjunct includes="io.jenkins.plugins.analysis.warnings.charts"/>
+
     <c:trend-chart it="${from}" title="${from.trendName}" enableLinks="true" configurationId="warnings"/>
+
   </j:if>
 
 </j:jelly>
diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/warnings/charts.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/warnings/charts.jelly
index d28e1c535c..ae023f46fb 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/warnings/charts.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/warnings/charts.jelly
@@ -1,5 +1,7 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:c="/charts">
+<j:jelly xmlns:j="jelly:core" xmlns:c="/charts" xmlns:st="jelly:stapler">
+
+  <st:adjunct includes="io.jenkins.plugins.echarts"/>
 
   <!-- Trend chart configuration that adds a selection of the trend chart type. -->
   <c:trend-setup suffix="warnings">
diff --git a/plugin/src/main/resources/issues/history.jelly b/plugin/src/main/resources/issues/history.jelly
index 4c36d1ff0a..07e3c94042 100644
--- a/plugin/src/main/resources/issues/history.jelly
+++ b/plugin/src/main/resources/issues/history.jelly
@@ -1,5 +1,5 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:bs="/bootstrap5">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:bs="/bootstrap5" xmlns:c="/charts">
 
   <st:documentation>
     Renders a chart with the build history in a bootstrap card.
@@ -36,4 +36,6 @@
 
   </bs:card>
 
+  <c:chart-setup id="history"/>
+
 </j:jelly>
diff --git a/plugin/src/main/webapp/js/issues-detail.js b/plugin/src/main/webapp/js/issues-detail.js
index f570604af6..70d5c15138 100644
--- a/plugin/src/main/webapp/js/issues-detail.js
+++ b/plugin/src/main/webapp/js/issues-detail.js
@@ -1,6 +1,6 @@
 /* global jQuery3, view, echartsJenkinsApi, bootstrap5, trendDefaultStorageId */
 (function ($) {
-    const trendConfigurationDialogId = 'trend-configuration-default';
+    const trendConfigurationDialogId = 'chart-configuration-history';
 
     $('#' + trendConfigurationDialogId).on('hidden.bs.modal', function () {
         redrawTrendCharts();
@@ -82,7 +82,7 @@
      * redraws the trend charts.
      */
     function redrawTrendCharts () {
-        const configuration = JSON.stringify(echartsJenkinsApi.readConfiguration(trendDefaultStorageId));
+        const configuration = JSON.stringify(echartsJenkinsApi.readFromLocalStorage('jenkins-echarts-chart-configuration-history'));
 
         /**
          * Creates a build trend chart that shows the number of issues for a couple of builds.

From 4c7e8b9b7cb8d3b9421cf71149d9d30f86e8c1fe Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Thu, 3 Jun 2021 01:37:21 +0200
Subject: [PATCH 20/31] Extract configuration of charts.

Now configuration of trend charts in job page and trend charts in details pages use a different dialog.
---
 plugin/src/main/resources/issues/history.jelly | 2 +-
 plugin/src/main/webapp/js/issues-detail.js     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugin/src/main/resources/issues/history.jelly b/plugin/src/main/resources/issues/history.jelly
index 07e3c94042..975d02a0de 100644
--- a/plugin/src/main/resources/issues/history.jelly
+++ b/plugin/src/main/resources/issues/history.jelly
@@ -36,6 +36,6 @@
 
   </bs:card>
 
-  <c:chart-setup id="history"/>
+  <c:chart-setup id="issues-history"/>
 
 </j:jelly>
diff --git a/plugin/src/main/webapp/js/issues-detail.js b/plugin/src/main/webapp/js/issues-detail.js
index 70d5c15138..a862d3ca12 100644
--- a/plugin/src/main/webapp/js/issues-detail.js
+++ b/plugin/src/main/webapp/js/issues-detail.js
@@ -1,6 +1,6 @@
 /* global jQuery3, view, echartsJenkinsApi, bootstrap5, trendDefaultStorageId */
 (function ($) {
-    const trendConfigurationDialogId = 'chart-configuration-history';
+    const trendConfigurationDialogId = 'chart-configuration-issues-history';
 
     $('#' + trendConfigurationDialogId).on('hidden.bs.modal', function () {
         redrawTrendCharts();
@@ -82,7 +82,7 @@
      * redraws the trend charts.
      */
     function redrawTrendCharts () {
-        const configuration = JSON.stringify(echartsJenkinsApi.readFromLocalStorage('jenkins-echarts-chart-configuration-history'));
+        const configuration = JSON.stringify(echartsJenkinsApi.readFromLocalStorage('jenkins-echarts-chart-configuration-issues-history'));
 
         /**
          * Creates a build trend chart that shows the number of issues for a couple of builds.

From 33fa53f2f7ba03989f8d334d74e97da0c2091281 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Wed, 9 Jun 2021 11:38:09 +0200
Subject: [PATCH 21/31] Remove unused global `trendDefaultStorageId`.

---
 plugin/src/main/webapp/js/issues-detail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/src/main/webapp/js/issues-detail.js b/plugin/src/main/webapp/js/issues-detail.js
index a862d3ca12..aab9dc1189 100644
--- a/plugin/src/main/webapp/js/issues-detail.js
+++ b/plugin/src/main/webapp/js/issues-detail.js
@@ -1,4 +1,4 @@
-/* global jQuery3, view, echartsJenkinsApi, bootstrap5, trendDefaultStorageId */
+/* global jQuery3, view, echartsJenkinsApi, bootstrap5 */
 (function ($) {
     const trendConfigurationDialogId = 'chart-configuration-issues-history';
 

From b0ac16232e662310de7367d4b2b9780fc15fe8dc Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Wed, 9 Jun 2021 11:38:32 +0200
Subject: [PATCH 22/31] Fix Bootstrap 5 version.

---
 plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index 4e4e8e1844..b055b7ef50 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -36,7 +36,7 @@
     <font-awesome-api.version>5.15.3-2</font-awesome-api.version>
     <echarts-api.version>5.1.0-3-rc464.d7d9d5650d0a</echarts-api.version>
     <jquery3-api.version>3.6.0-1</jquery3-api.version>
-    <bootstrap4-api.version>4.6.0-3</bootstrap4-api.version>
+    <bootstrap5-api.version>5.0.1-2</bootstrap5-api.version>
     <popper-api.version>1.16.1-2</popper-api.version>
     <error_prone_annotations.version>2.7.1</error_prone_annotations.version>
     <pull-request-monitoring.version>1.7.1</pull-request-monitoring.version>

From 1e83282b37cb29a7d0435ac6bc71c949f77bc146 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Wed, 9 Jun 2021 11:46:54 +0200
Subject: [PATCH 23/31] Bump version of echarts and datatables to latest.

---
 plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index b055b7ef50..595d69887c 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -32,7 +32,7 @@
     <forensics-api-plugin.version>1.0.0</forensics-api-plugin.version>
     <plugin-util-api.version>2.2.0</plugin-util-api.version>
 
-    <data-tables-api.version>1.10.23-3</data-tables-api.version>
+    <data-tables-api.version>1.10.25-1-rc455.e1e526c7d720</data-tables-api.version>
     <font-awesome-api.version>5.15.3-2</font-awesome-api.version>
     <echarts-api.version>5.1.0-3-rc464.d7d9d5650d0a</echarts-api.version>
     <jquery3-api.version>3.6.0-1</jquery3-api.version>

From 195bf90db27b12babfef92c5025ea89b28c92b06 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Wed, 9 Jun 2021 14:10:55 +0200
Subject: [PATCH 24/31] Simplify API of `LineChart`.

---
 .../plugins/analysis/core/charts/HealthTrendChart.java        | 3 +--
 .../analysis/core/charts/NewVersusFixedTrendChart.java        | 4 +---
 .../plugins/analysis/core/charts/SeverityTrendChart.java      | 4 +---
 .../jenkins/plugins/analysis/core/charts/ToolsTrendChart.java | 4 +---
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/charts/HealthTrendChart.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/charts/HealthTrendChart.java
index 4130047c8f..3ce55b1993 100644
--- a/plugin/src/main/java/io/jenkins/plugins/analysis/core/charts/HealthTrendChart.java
+++ b/plugin/src/main/java/io/jenkins/plugins/analysis/core/charts/HealthTrendChart.java
@@ -37,8 +37,7 @@ public LinesChartModel create(final Iterable<? extends BuildResult<AnalysisBuild
         HealthSeriesBuilder builder = new HealthSeriesBuilder(healthDescriptor);
         LinesDataSet dataSet = builder.createDataSet(configuration, results);
 
-        LinesChartModel model = new LinesChartModel();
-        model.setDomainAxisLabels(dataSet.getDomainAxisLabels());
+        LinesChartModel model = new LinesChartModel(dataSet);
 
         if (healthDescriptor.isEnabled()) {
             LineSeries healthy = createSeries(Messages.Healthy_Name(), Palette.GREEN);
diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/charts/NewVersusFixedTrendChart.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/charts/NewVersusFixedTrendChart.java
index bbb2bf2c5e..50cc48e9ab 100644
--- a/plugin/src/main/java/io/jenkins/plugins/analysis/core/charts/NewVersusFixedTrendChart.java
+++ b/plugin/src/main/java/io/jenkins/plugins/analysis/core/charts/NewVersusFixedTrendChart.java
@@ -22,9 +22,7 @@ public LinesChartModel create(final Iterable<? extends BuildResult<AnalysisBuild
             final ChartModelConfiguration configuration) {
         NewVersusFixedSeriesBuilder builder = new NewVersusFixedSeriesBuilder();
         LinesDataSet dataSet = builder.createDataSet(configuration, results);
-
-        LinesChartModel model = new LinesChartModel();
-        model.setDomainAxisLabels(dataSet.getDomainAxisLabels());
+        LinesChartModel model = new LinesChartModel(dataSet);
 
         LineSeries newSeries = getSeries(dataSet, Messages.New_Warnings_Short(), Palette.RED,
                 NewVersusFixedSeriesBuilder.NEW);
diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/charts/SeverityTrendChart.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/charts/SeverityTrendChart.java
index 78d7c2d668..5e66484644 100644
--- a/plugin/src/main/java/io/jenkins/plugins/analysis/core/charts/SeverityTrendChart.java
+++ b/plugin/src/main/java/io/jenkins/plugins/analysis/core/charts/SeverityTrendChart.java
@@ -48,9 +48,7 @@ public LinesChartModel aggregate(final List<Iterable<? extends BuildResult<Analy
     }
 
     private LinesChartModel createChartFromDataSet(final LinesDataSet dataSet) {
-        LinesChartModel model = new LinesChartModel();
-        model.setDomainAxisLabels(dataSet.getDomainAxisLabels());
-        model.setBuildNumbers(dataSet.getBuildNumbers());
+        LinesChartModel model = new LinesChartModel(dataSet);
 
         Severity[] visibleSeverities
                 = {Severity.WARNING_LOW, Severity.WARNING_NORMAL, Severity.WARNING_HIGH, Severity.ERROR};
diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/charts/ToolsTrendChart.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/charts/ToolsTrendChart.java
index e1d25bcdf4..87fa35cdeb 100644
--- a/plugin/src/main/java/io/jenkins/plugins/analysis/core/charts/ToolsTrendChart.java
+++ b/plugin/src/main/java/io/jenkins/plugins/analysis/core/charts/ToolsTrendChart.java
@@ -23,7 +23,7 @@ public LinesChartModel create(final Iterable<? extends BuildResult<AnalysisBuild
         ToolSeriesBuilder builder = new ToolSeriesBuilder();
         LinesDataSet lineModel = builder.createDataSet(configuration, results);
 
-        LinesChartModel model = new LinesChartModel();
+        LinesChartModel model = new LinesChartModel(lineModel);
 
         Palette[] colors = Palette.values();
         int index = 0;
@@ -37,8 +37,6 @@ public LinesChartModel create(final Iterable<? extends BuildResult<AnalysisBuild
             model.addSeries(lineSeries);
         }
 
-        model.setDomainAxisLabels(lineModel.getDomainAxisLabels());
-
         return model;
     }
 }

From a7539f041821c556e90e453fe3f1e5a3b616cad2 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Wed, 9 Jun 2021 14:29:46 +0200
Subject: [PATCH 25/31] Use released versions of echarts and datatables.

---
 plugin/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index 595d69887c..17d34dd077 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -32,9 +32,9 @@
     <forensics-api-plugin.version>1.0.0</forensics-api-plugin.version>
     <plugin-util-api.version>2.2.0</plugin-util-api.version>
 
-    <data-tables-api.version>1.10.25-1-rc455.e1e526c7d720</data-tables-api.version>
+    <data-tables-api.version>1.10.25-1</data-tables-api.version>
     <font-awesome-api.version>5.15.3-2</font-awesome-api.version>
-    <echarts-api.version>5.1.0-3-rc464.d7d9d5650d0a</echarts-api.version>
+    <echarts-api.version>5.1.2-1</echarts-api.version>
     <jquery3-api.version>3.6.0-1</jquery3-api.version>
     <bootstrap5-api.version>5.0.1-2</bootstrap5-api.version>
     <popper-api.version>1.16.1-2</popper-api.version>

From 668331fc557dce9b5bf6d5f68df74922a63ee825 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Wed, 9 Jun 2021 22:59:22 +0200
Subject: [PATCH 26/31] Bump version of pull request monitoring to 1.7.2.

---
 plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index 17d34dd077..5dfb67bccd 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -39,7 +39,7 @@
     <bootstrap5-api.version>5.0.1-2</bootstrap5-api.version>
     <popper-api.version>1.16.1-2</popper-api.version>
     <error_prone_annotations.version>2.7.1</error_prone_annotations.version>
-    <pull-request-monitoring.version>1.7.1</pull-request-monitoring.version>
+    <pull-request-monitoring.version>1.7.2</pull-request-monitoring.version>
 
     <eclipse-collections.version>9.2.0</eclipse-collections.version>
     <j2html.version>1.4.0</j2html.version>

From 1777f807bdf09afc6a3a3d37de24b59cd585e0b1 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Thu, 10 Jun 2021 00:01:46 +0200
Subject: [PATCH 27/31] Try to fix test failures.

---
 plugin/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index 5dfb67bccd..7193772607 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jvnet.hudson.plugins</groupId>
     <artifactId>analysis-pom</artifactId>
-    <version>5.7.0</version>
+    <version>5.8.0</version>
     <relativePath />
   </parent>
 
@@ -23,7 +23,7 @@
   <properties>
     <revision>9.2.0</revision>
     <changelist>-SNAPSHOT</changelist>
-
+    <jenkins.version>${jenkins.baseline}.2</jenkins.version>
     <module.name>${project.groupId}.warnings.ng</module.name>
 
     <analysis-model-api.version>10.2.5</analysis-model-api.version>

From 4401bbb639624b14885662ffaf42b45009f06917 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Thu, 10 Jun 2021 12:16:42 +0200
Subject: [PATCH 28/31] Fix font-awesome version.

---
 plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index 7193772607..a896870f4f 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -33,7 +33,7 @@
     <plugin-util-api.version>2.2.0</plugin-util-api.version>
 
     <data-tables-api.version>1.10.25-1</data-tables-api.version>
-    <font-awesome-api.version>5.15.3-2</font-awesome-api.version>
+    <font-awesome-api.version>5.15.3-3</font-awesome-api.version>
     <echarts-api.version>5.1.2-1</echarts-api.version>
     <jquery3-api.version>3.6.0-1</jquery3-api.version>
     <bootstrap5-api.version>5.0.1-2</bootstrap5-api.version>

From 4f0e1d3f9c4f11373d7cea42f0417f7f854d8b3a Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Thu, 10 Jun 2021 15:04:38 +0200
Subject: [PATCH 29/31] Bump version of Jenkins baseline to 2.263 to get all
 tests running.

---
 plugin/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index a896870f4f..4405bd73db 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -23,14 +23,14 @@
   <properties>
     <revision>9.2.0</revision>
     <changelist>-SNAPSHOT</changelist>
-    <jenkins.version>${jenkins.baseline}.2</jenkins.version>
+    <jenkins.baseline>2.263</jenkins.baseline>
     <module.name>${project.groupId}.warnings.ng</module.name>
 
     <analysis-model-api.version>10.2.5</analysis-model-api.version>
     <analysis-model-tests.version>10.2.5</analysis-model-tests.version>
 
-    <forensics-api-plugin.version>1.0.0</forensics-api-plugin.version>
-    <plugin-util-api.version>2.2.0</plugin-util-api.version>
+    <forensics-api-plugin.version>1.1.0</forensics-api-plugin.version>
+    <plugin-util-api.version>2.3.0</plugin-util-api.version>
 
     <data-tables-api.version>1.10.25-1</data-tables-api.version>
     <font-awesome-api.version>5.15.3-3</font-awesome-api.version>

From 4bb326916ecfce065b903385e79978e2e1f10122 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Fri, 11 Jun 2021 14:57:18 +0200
Subject: [PATCH 30/31] Fix selection of tabs using the new BS5 attribute
 `data-bs-toggle`.

---
 plugin/src/main/webapp/js/issues-detail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/src/main/webapp/js/issues-detail.js b/plugin/src/main/webapp/js/issues-detail.js
index aab9dc1189..68a180554e 100644
--- a/plugin/src/main/webapp/js/issues-detail.js
+++ b/plugin/src/main/webapp/js/issues-detail.js
@@ -45,7 +45,7 @@
     /**
      * Store the selected tab in browser's local storage.
      */
-    const tabToggleLink = $('a[data-toggle="tab"]');
+    const tabToggleLink = $('a[data-bs-toggle="tab"]');
     tabToggleLink.on('show.bs.tab', function (e) {
         window.location.hash = e.target.hash;
         const activeTab = $(e.target).attr('href');

From a50d54cd55d1a25a947639efca31f2fb7766e7a9 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Fri, 11 Jun 2021 16:15:26 +0200
Subject: [PATCH 31/31] Fix some PMD warnings.

---
 .../core/util/AffectedFilesResolver.java      |  2 +-
 .../analysis/core/util/QualityGate.java       |  4 +--
 .../analysis/warnings/tasks/TaskScanner.java  | 33 +++++++++++--------
 .../warnings/tasks/TaskScannerBenchmark.java  |  1 +
 .../plugins/analysis/warnings/UiTest.java     | 13 +++++---
 5 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/util/AffectedFilesResolver.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/util/AffectedFilesResolver.java
index b1c4940885..e55c0c3541 100644
--- a/plugin/src/main/java/io/jenkins/plugins/analysis/core/util/AffectedFilesResolver.java
+++ b/plugin/src/main/java/io/jenkins/plugins/analysis/core/util/AffectedFilesResolver.java
@@ -106,7 +106,7 @@ public void copyAffectedFilesToBuildFolder(final Report report, final FilePath b
         copyAffectedFilesToBuildFolder(report, new RemoteFacade(buildFolder, affectedFilesFolder));
     }
 
-    @VisibleForTesting
+    @VisibleForTesting @SuppressWarnings("PMD.CognitiveComplexity")
     void copyAffectedFilesToBuildFolder(final Report report, final RemoteFacade remoteFacade)
             throws InterruptedException {
         int copied = 0;
diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/core/util/QualityGate.java b/plugin/src/main/java/io/jenkins/plugins/analysis/core/util/QualityGate.java
index 98e9c72c93..115fe09b09 100644
--- a/plugin/src/main/java/io/jenkins/plugins/analysis/core/util/QualityGate.java
+++ b/plugin/src/main/java/io/jenkins/plugins/analysis/core/util/QualityGate.java
@@ -164,7 +164,7 @@ public enum QualityGateResult {
         /** The build will be marked as failed. */
         FAILURE(QualityGateStatus.FAILED);
 
-        private QualityGateStatus status;
+        private final QualityGateStatus status;
 
         QualityGateResult(final QualityGateStatus status) {
             this.status = status;
@@ -188,7 +188,7 @@ public QualityGateStatus getStatus() {
      *
      * @return the list of quality gates
      */
-    @SuppressWarnings({"deprecation", "PMD.NPathComplexity", "PMD.CyclomaticComplexity"})
+    @SuppressWarnings({"deprecation", "PMD.NPathComplexity", "PMD.CyclomaticComplexity", "PMD.CognitiveComplexity"})
     public static List<QualityGate> map(@CheckForNull final Thresholds thresholds) {
         if (thresholds == null) {
             return Collections.emptyList();
diff --git a/plugin/src/main/java/io/jenkins/plugins/analysis/warnings/tasks/TaskScanner.java b/plugin/src/main/java/io/jenkins/plugins/analysis/warnings/tasks/TaskScanner.java
index 90d6bb614e..164d547665 100644
--- a/plugin/src/main/java/io/jenkins/plugins/analysis/warnings/tasks/TaskScanner.java
+++ b/plugin/src/main/java/io/jenkins/plugins/analysis/warnings/tasks/TaskScanner.java
@@ -244,26 +244,31 @@ Report scanTasks(final Iterator<String> lines, final IssueBuilder builder) {
 
             for (Severity severity : Severity.getPredefinedValues()) {
                 if (patterns.containsKey(severity)) {
-                    Matcher matcher = patterns.get(severity).matcher(line);
-                    if (matcher.matches() && matcher.groupCount() == 2) {
-                        String message = StringUtils.defaultString(matcher.group(2)).trim();
-                        builder.setMessage(StringUtils.removeStart(message, ":").trim());
-
-                        String tag = StringUtils.defaultString(matcher.group(1));
-                        if (isUppercase) {
-                            builder.setType(StringUtils.upperCase(tag));
-                        }
-                        else {
-                            builder.setType(tag);
-                        }
-                        report.add(builder.setSeverity(severity).setLineStart(lineNumber).build());
-                    }
+                    createTask(builder, report, lineNumber, line, severity);
                 }
             }
         }
         return report;
     }
 
+    private void createTask(final IssueBuilder builder, final Report report, final int lineNumber, final String line,
+            final Severity severity) {
+        Matcher matcher = patterns.get(severity).matcher(line);
+        if (matcher.matches() && matcher.groupCount() == 2) {
+            String message = StringUtils.defaultString(matcher.group(2)).trim();
+            builder.setMessage(StringUtils.removeStart(message, ":").trim());
+
+            String tag = StringUtils.defaultString(matcher.group(1));
+            if (isUppercase) {
+                builder.setType(StringUtils.upperCase(tag));
+            }
+            else {
+                builder.setType(tag);
+            }
+            report.add(builder.setSeverity(severity).setLineStart(lineNumber).build());
+        }
+    }
+
     private static class IgnoreSection {
         private static final String IGNORE_BEGIN = " task-scanner-ignore-begin";
         private static final String IGNORE_END = " task-scanner-ignore-end";
diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/tasks/TaskScannerBenchmark.java b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/tasks/TaskScannerBenchmark.java
index b612923b5d..69c1a08764 100644
--- a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/tasks/TaskScannerBenchmark.java
+++ b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/tasks/TaskScannerBenchmark.java
@@ -33,6 +33,7 @@
  * @author Oliver Scholz
  * @author Andreas Riepl
  */
+@SuppressWarnings("PMD.JUnit5TestShouldBePackagePrivate")
 @BenchmarkMode(Mode.AverageTime)
 @Fork(value = 1, warmups = 3)
 public class TaskScannerBenchmark extends ResourceTest {
diff --git a/ui-tests/src/test/java/io/jenkins/plugins/analysis/warnings/UiTest.java b/ui-tests/src/test/java/io/jenkins/plugins/analysis/warnings/UiTest.java
index 38b3006a70..f0b1cb22ae 100644
--- a/ui-tests/src/test/java/io/jenkins/plugins/analysis/warnings/UiTest.java
+++ b/ui-tests/src/test/java/io/jenkins/plugins/analysis/warnings/UiTest.java
@@ -338,13 +338,13 @@ protected void verifyPep8(final Build build, final int referenceBuild) {
                         "-> found 8 issues (skipped 0 duplicates)")
                 .hasErrorMessages("Can't create fingerprints for some files:");
 
-        if(referenceBuild > 0) {
+        if (referenceBuild > 0) {
             assertThat(openInfoView(build, PEP8_ID))
                     .hasInfoMessages("Issues delta (vs. reference build): outstanding: 0, new: 8, fixed: 0");
         }
     }
 
-    protected AnalysisResult verifyPep8Details (final AnalysisSummary pep8) {
+    protected AnalysisResult verifyPep8Details(final AnalysisSummary pep8) {
         AnalysisResult pep8Details = pep8.openOverallResult();
         assertThat(pep8Details).hasActiveTab(Tab.ISSUES)
                 .hasOnlyAvailableTabs(Tab.CATEGORIES, Tab.ISSUES);
@@ -359,13 +359,16 @@ protected Build shouldBuildSuccessfully(final Job job) {
         return job.startBuild().waitUntilFinished().shouldSucceed();
     }
 
-    protected DashboardView createDashboardWithStaticAnalysisPortlet(final boolean hideCleanJobs, final boolean showIcons) {
+    protected DashboardView createDashboardWithStaticAnalysisPortlet(final boolean hideCleanJobs,
+            final boolean showIcons) {
         return createDashboardWithStaticAnalysisPortlet(jenkins, hideCleanJobs, showIcons);
     }
 
-    protected DashboardView createDashboardWithStaticAnalysisPortlet(final Container container, final boolean hideCleanJobs, final boolean showIcons) {
+    protected DashboardView createDashboardWithStaticAnalysisPortlet(final Container container,
+            final boolean hideCleanJobs, final boolean showIcons) {
         DashboardView view = createDashboardView(container);
-        StaticAnalysisIssuesPerToolAndJobPortlet portlet = view.addTopPortlet(StaticAnalysisIssuesPerToolAndJobPortlet.class);
+        StaticAnalysisIssuesPerToolAndJobPortlet portlet = view.addTopPortlet(
+                StaticAnalysisIssuesPerToolAndJobPortlet.class);
         if (hideCleanJobs) {
             portlet.toggleHideCleanJobs();
         }