From fda60c9a17f1b13c6176940380ef41ecb58843c4 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 12 Sep 2018 01:31:30 +0200 Subject: [PATCH] Fix Sonar integration Use project-wide merged JaCoCo execution profile for Sonar purposes, providing real coverage provided by yangtools UTs. This patch is rather intrusive due to the need to override odlparent settings to make it work. Change-Id: I8aacec9bd2ab45d5a4ffe83d692b020d7bf32ab8 Signed-off-by: Robert Varga --- common/checkstyle-logging/pom.xml | 78 ++++++++++++++++---------- common/concepts/pom.xml | 19 +++++++ common/mockito-configuration/pom.xml | 19 +++++++ common/object-cache-api/pom.xml | 19 +++++++ common/object-cache-guava/pom.xml | 19 +++++++ common/testutils/pom.xml | 19 +++++++ common/util/pom.xml | 19 +++++++ pom.xml | 32 +++++++++++ third-party/triemap/pom.xml | 19 +++++++ yang/odlext-model-api/pom.xml | 19 +++++++ yang/odlext-parser-support/pom.xml | 19 +++++++ yang/openconfig-model-api/pom.xml | 19 +++++++ yang/openconfig-parser-support/pom.xml | 19 +++++++ yang/rfc6536-model-api/pom.xml | 19 +++++++ yang/rfc6536-parser-support/pom.xml | 19 +++++++ yang/rfc7952-model-api/pom.xml | 19 +++++++ yang/rfc7952-parser-support/pom.xml | 19 +++++++ yang/rfc8040-model-api/pom.xml | 19 +++++++ yang/rfc8040-parser-support/pom.xml | 19 +++++++ yang/yang-common/pom.xml | 19 +++++++ yang/yang-data-api/pom.xml | 19 +++++++ yang/yang-data-codec-gson/pom.xml | 19 +++++++ yang/yang-data-codec-xml/pom.xml | 19 +++++++ yang/yang-data-impl/pom.xml | 11 ++-- yang/yang-data-jaxen/pom.xml | 19 +++++++ yang/yang-data-util/pom.xml | 19 +++++++ yang/yang-maven-plugin-it/pom.xml | 16 ++++++ yang/yang-maven-plugin/pom.xml | 19 +++++++ yang/yang-model-api/pom.xml | 19 +++++++ yang/yang-model-export/pom.xml | 19 +++++++ yang/yang-model-util/pom.xml | 19 +++++++ yang/yang-parser-api/pom.xml | 19 +++++++ yang/yang-parser-impl/pom.xml | 19 +++++++ yang/yang-parser-reactor/pom.xml | 19 +++++++ yang/yang-parser-rfc7950/pom.xml | 19 +++++++ yang/yang-parser-spi/pom.xml | 19 +++++++ yang/yang-xpath-api/pom.xml | 19 +++++++ yang/yang-xpath-impl/pom.xml | 19 +++++++ 38 files changed, 750 insertions(+), 33 deletions(-) diff --git a/common/checkstyle-logging/pom.xml b/common/checkstyle-logging/pom.xml index bca02b42d3..9e37c5526e 100644 --- a/common/checkstyle-logging/pom.xml +++ b/common/checkstyle-logging/pom.xml @@ -8,42 +8,62 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - 4.0.0 + 4.0.0 org.opendaylight.odlparent bundle-parent 4.0.0-SNAPSHOT - org.opendaylight.yangtools - checkstyle-logging - 2.1.0-SNAPSHOT - bundle - - - - com.puppycrawl.tools - checkstyle - - - commons-logging - commons-logging - 1.2 - - + org.opendaylight.yangtools + checkstyle-logging + 2.1.0-SNAPSHOT + bundle - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - false - checkstyle.violationSeverity=error - - - - + + ${project.basedir}/../../target/jacoco.exec + + + + + + com.puppycrawl.tools + checkstyle + + + commons-logging + commons-logging + 1.2 + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + false + checkstyle.violationSeverity=error + + + + org.jacoco + jacoco-maven-plugin + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/code-coverage/jacoco.exec + + + + + + diff --git a/common/concepts/pom.xml b/common/concepts/pom.xml index 2fd9794706..00e1627363 100644 --- a/common/concepts/pom.xml +++ b/common/concepts/pom.xml @@ -24,6 +24,10 @@ ${project.artifactId} Common concepts + + ${project.basedir}/../../target/jacoco.exec + + @@ -63,6 +67,21 @@ true + + org.jacoco + jacoco-maven-plugin + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/code-coverage/jacoco.exec + + + + diff --git a/common/mockito-configuration/pom.xml b/common/mockito-configuration/pom.xml index d34ad0eb6b..f474f4fa67 100644 --- a/common/mockito-configuration/pom.xml +++ b/common/mockito-configuration/pom.xml @@ -24,6 +24,10 @@ jar ${project.artifactId} + + ${project.basedir}/../../target/jacoco.exec + + @@ -42,6 +46,21 @@ checkstyle.violationSeverity=error + + org.jacoco + jacoco-maven-plugin + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/code-coverage/jacoco.exec + + + + diff --git a/common/object-cache-api/pom.xml b/common/object-cache-api/pom.xml index f35cd2475e..295ff52094 100644 --- a/common/object-cache-api/pom.xml +++ b/common/object-cache-api/pom.xml @@ -22,6 +22,10 @@ object-cache-api 2.1.0-SNAPSHOT + + ${project.basedir}/../../target/jacoco.exec + + @@ -86,6 +90,21 @@ checkstyle.violationSeverity=error + + org.jacoco + jacoco-maven-plugin + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/code-coverage/jacoco.exec + + + + diff --git a/common/object-cache-guava/pom.xml b/common/object-cache-guava/pom.xml index 8a6fa22702..b27bedc471 100644 --- a/common/object-cache-guava/pom.xml +++ b/common/object-cache-guava/pom.xml @@ -22,6 +22,10 @@ object-cache-guava 2.1.0-SNAPSHOT + + ${project.basedir}/../../target/jacoco.exec + + @@ -69,6 +73,21 @@ checkstyle.violationSeverity=error + + org.jacoco + jacoco-maven-plugin + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/code-coverage/jacoco.exec + + + + diff --git a/common/testutils/pom.xml b/common/testutils/pom.xml index dad58d8cc5..20218972d2 100644 --- a/common/testutils/pom.xml +++ b/common/testutils/pom.xml @@ -14,6 +14,10 @@ 2.1.0-SNAPSHOT + + ${project.basedir}/../../target/jacoco.exec + + @@ -78,6 +82,21 @@ true + + org.jacoco + jacoco-maven-plugin + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/code-coverage/jacoco.exec + + + + diff --git a/common/util/pom.xml b/common/util/pom.xml index b898cfb9ef..5f877b99d1 100644 --- a/common/util/pom.xml +++ b/common/util/pom.xml @@ -21,6 +21,10 @@ util 2.1.0-SNAPSHOT + + ${project.basedir}/../../target/jacoco.exec + + @@ -78,6 +82,21 @@ true + + org.jacoco + jacoco-maven-plugin + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/code-coverage/jacoco.exec + + + + diff --git a/pom.xml b/pom.xml index c08d2a7029..91a5585d48 100644 --- a/pom.xml +++ b/pom.xml @@ -30,6 +30,10 @@ HEAD + + ${project.build.directory}/jacoco.exec + + artifacts benchmarks @@ -40,6 +44,34 @@ third-party + + + + org.jacoco + jacoco-maven-plugin + + + merge + + merge + + generate-resources + + + + ${project.basedir} + + **/target/code-coverage/*.exec + + + + + + + + + +