From 62bbc7e648a9ea977704b084bbd420e24cce2ddf Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Thu, 23 Sep 2021 23:03:33 +0200
Subject: [PATCH] Add a better coverage Jenkinsfile.

---
 etc/Jenkinsfile.coverage | 31 ++++++++++++++++++++++++++-----
 package-lock.json        |  1 +
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/etc/Jenkinsfile.coverage b/etc/Jenkinsfile.coverage
index 8928546d2..22ceac342 100644
--- a/etc/Jenkinsfile.coverage
+++ b/etc/Jenkinsfile.coverage
@@ -1,12 +1,33 @@
-node {
+node('java11-agent') {
     stage ('Checkout') {
         checkout scm
     }
 
-    stage ('Coverage') {
-        withMaven(maven: 'mvn-default', mavenLocalRepo: '/var/data/m2repository', mavenOpts: '-Xmx768m -Xms512m') {
-            sh "mvn -V -U -e jacoco:prepare-agent test jacoco:report -Djenkins.test.timeout=240 -Dmaven.test.failure.ignore"
+    stage ('Git mining') {
+        discoverGitReferenceBuild()
+        mineRepository()
+    }
+
+    stage ('Build, Test, and Static Analysis') {
+        withMaven(mavenLocalRepo: '/var/data/m2repository', mavenOpts: '-Xmx768m -Xms512m') {
+            sh 'mvn -V -e clean verify -Dmaven.test.failure.ignore -Dgpg.skip'
         }
-        publishCoverage adapters: [jacocoAdapter('target/site/jacoco/jacoco.xml')]
+
+        recordIssues tools: [java(), javaDoc()], aggregatingResults: 'true', id: 'java', name: 'Java'
+        recordIssues tool: errorProne(), healthy: 1, unhealthy: 20
+
+        junit testResults: '**/target/*-reports/TEST-*.xml'
+        publishCoverage adapters: [jacocoAdapter('**/*/jacoco.xml')], sourceFileResolver: sourceFiles('STORE_ALL_BUILD')
+
+        recordIssues tools: [checkStyle(pattern: 'target/checkstyle-result.xml'),
+            spotBugs(pattern: 'target/spotbugsXml.xml'),
+            pmdParser(pattern: 'target/pmd.xml'),
+            cpd(pattern: 'target/cpd.xml'),
+            taskScanner(highTags:'FIXME', normalTags:'TODO', includePattern: '**/*.java', excludePattern: 'target/**/*')],
+            qualityGates: [[threshold: 1, type: 'TOTAL', unstable: true]]
+    }
+
+    stage ('Collect Maven Warnings') {
+        recordIssues tool: mavenConsole()
     }
 }
diff --git a/package-lock.json b/package-lock.json
index 5cedfa5e0..f5867b556 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,6 +5,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "analysis-model",
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {