integrate echarts-api plugin (#197)

jenkinsci · May 22, 2021 · 0c5c4b3 · 0c5c4b3
1 parent cba5c38
commit 0c5c4b3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -20,6 +20,7 @@
         <trove4j.version>3.0.3</trove4j.version>
         <saxon-he.version>9.9.1-4</saxon-he.version>
         <assertj-core.version>3.16.1</assertj-core.version>
+        <echarts-api.version>5.1.0-2</echarts-api.version>
         <!-- Other properties you may want to use:
           ~ jenkins-test-harness.version: Jenkins Test Harness version you use to test the plugin. For Jenkins version >= 1.580.1 use JTH 2.0 or higher.
           ~ hpi-plugin.version: The HPI Maven Plugin version used by the plugin..
@@ -85,6 +86,11 @@
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>branch-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.jenkins.plugins</groupId>
+            <artifactId>echarts-api</artifactId>
+            <version>${echarts-api.version}</version>
+        </dependency>
 
         <!-- Test Dependencies -->
         <dependency>

diff --git a/src/main/resources/io/jenkins/plugins/coverage/CoverageProjectAction/floatingBox.jelly b/src/main/resources/io/jenkins/plugins/coverage/CoverageProjectAction/floatingBox.jelly
@@ -1,9 +1,9 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
-    <script src="${rootURL}/plugin/code-coverage-api/scripts/echarts.min.js">
-    </script>
-    <script src="${rootURL}/plugin/code-coverage-api/scripts/custom-chart.js">
-    </script>
+
+    <st:adjunct includes="io.jenkins.plugins.echarts"/>
+    <script src="${rootURL}/plugin/code-coverage-api/scripts/custom-chart.js"/>
+
     <j:set var="lastResult" value="${from.getLastResult().getResult()}"/>
     <j:if test="${lastResult != null}">
         <div align="bottom">

diff --git a/src/main/resources/io/jenkins/plugins/coverage/targets/CoverageResult/index.jelly b/src/main/resources/io/jenkins/plugins/coverage/targets/CoverageResult/index.jelly
@@ -1,10 +1,10 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
     <l:layout css="/plugin/code-coverage-api/css/style.css" norefresh="true">
-        <script src="${rootURL}/plugin/code-coverage-api/scripts/echarts.min.js">
-        </script>
-        <script src="${rootURL}/plugin/code-coverage-api/scripts/custom-chart.js">
-        </script>
+
+        <st:adjunct includes="io.jenkins.plugins.echarts"/>
+        <script src="${rootURL}/plugin/code-coverage-api/scripts/custom-chart.js"/>
+
         <st:include it="${it.owner}" page="sidepanel.jelly"/>
         <l:main-panel>
             <h1>${%Code Coverage}</h1>

diff --git a/src/main/webapp/scripts/echarts.min.js b/src/main/webapp/scripts/echarts.min.js