diff --git a/dashboard/plugin.properties b/dashboard/plugin.properties index f8dd8201..f2cfe778 100644 --- a/dashboard/plugin.properties +++ b/dashboard/plugin.properties @@ -60,6 +60,19 @@ maven.dashboard.runreactor = true # aggregators. maven.dashboard.report.showempty = true +# Images used when generating the progress bar for the dashboard HTML color +# for left bar +maven.dashboard.report.bar.left = green + +# HTML color for right bar +maven.dashboard.report.bar.right = red + +# Image to set cells with (should be transparent) +maven.dashboard.report.bar.image = ${plugin.resources}/images/trans.gif +maven.dashboard.report.bar.height = 10 +maven.dashboard.report.bar.border = 0 +maven.dashboard.report.bar.displayLabel = true + # Properties for gathering dashboard data for a single project # ------------------------------------------------------------ @@ -189,3 +202,18 @@ maven.dashboard.aggregator.jcoverageloc.artifact = ${maven.build.dir}/jcoverage/ maven.dashboard.aggregator.jcoverageloc.label = JCoverage LOC maven.dashboard.aggregator.jcoverageloc.goal = maven-jcoverage-plugin:report maven.dashboard.aggregator.jcoverageloc.description = JCoverage total lines of code + +# Properties for the FindBugs file violations aggregator +maven.dashboard.aggregator.fbfiles.script = ${maven.dashboard.aggregators.dir}/fbfiles.jelly +maven.dashboard.aggregator.fbfiles.artifact = ${maven.build.dir}/findbugs-raw-report.xml +maven.dashboard.aggregator.fbfiles.label = FindBugs Files with Violations +maven.dashboard.aggregator.fbfiles.goal = maven-findbugs-plugin:report +maven.dashboard.aggregator.fbfiles.description = Number of files with FindBugs violations + +# Properties for the FindBugs violations aggregator +maven.dashboard.aggregator.fbviolations.script = ${maven.dashboard.aggregators.dir}/fbviolations.jelly +maven.dashboard.aggregator.fbviolations.artifact = ${maven.build.dir}/findbugs-raw-report.xml +maven.dashboard.aggregator.fbviolations.label = FindBugs Violations +maven.dashboard.aggregator.fbviolations.goal = maven-findbugs-plugin:report +maven.dashboard.aggregator.fbviolations.description = Number of FindBugs violations + diff --git a/dashboard/src/plugin-resources/images/trans.gif b/dashboard/src/plugin-resources/images/trans.gif new file mode 100644 index 00000000..d7944344 Binary files /dev/null and b/dashboard/src/plugin-resources/images/trans.gif differ diff --git a/dashboard/src/plugin-resources/templates/dashboard.jsl b/dashboard/src/plugin-resources/templates/dashboard.jsl index b1b4586e..7a979ab6 100644 --- a/dashboard/src/plugin-resources/templates/dashboard.jsl +++ b/dashboard/src/plugin-resources/templates/dashboard.jsl @@ -25,6 +25,7 @@ xmlns:j="jelly:core" xmlns:jsl="jelly:jsl" xmlns:x="jelly:xml" + xmlns:u="jelly:util" xmlns="dummy" trim="false"> @@ -78,7 +79,81 @@ - + + + + + + + + + + + + + + + + + + + + + + 2 + + + + + + + + + + + + 0 + 0 + + + + + + + + + + ${percent} + ${percent}% + + + + + + + + + + 0 + 0 + + + + + + + + + + ${cpercent} + ${cpercent}% + + + + +
+
+
diff --git a/dashboard/src/plugin-test/maven.xml b/dashboard/src/plugin-test/maven.xml index 4623db7b..71e8c1e0 100644 --- a/dashboard/src/plugin-test/maven.xml +++ b/dashboard/src/plugin-test/maven.xml @@ -49,7 +49,7 @@ name="${maven.gen.docs}/dashboard-report.xml"/> - + diff --git a/dashboard/xdocs/changes.xml b/dashboard/xdocs/changes.xml index faa9b610..dab3588f 100644 --- a/dashboard/xdocs/changes.xml +++ b/dashboard/xdocs/changes.xml @@ -25,6 +25,17 @@ + + Added new fbfiles aggregator that computes FindBugs total + number of files with violations. + + + Added new fbviolations aggregator that computes FindBugs + total number of violations. + + + Added percentage bar graphs to the report. + Added new jcoverageloc aggregator that computes JCoverage total lines of code.