From e12824f490c9d39f3060c5a0f75bb36286209979 Mon Sep 17 00:00:00 2001 From: Remigiusz Janeczek Date: Fri, 26 Feb 2021 10:07:24 +0100 Subject: Update coverage reporting for BPGen Coverage submodule added in order to aggregate reports from other submodules. Added lombok configuration to annotate generated methods with @Generated, so that those can be skipped during coverage calculation. Formatted pom.xml Issue-ID: DCAEGEN2-2636 Signed-off-by: Remigiusz Janeczek Change-Id: Ie08d1ecd3880b295be99b5b1713e92db060292da --- mod/bpgenerator/coverage/pom.xml | 80 +++++++++ mod/bpgenerator/lombok.config | 2 + mod/bpgenerator/pom.xml | 344 ++++++++++++++++++++------------------- 3 files changed, 255 insertions(+), 171 deletions(-) create mode 100644 mod/bpgenerator/coverage/pom.xml create mode 100644 mod/bpgenerator/lombok.config (limited to 'mod') diff --git a/mod/bpgenerator/coverage/pom.xml b/mod/bpgenerator/coverage/pom.xml new file mode 100644 index 0000000..b831b8e --- /dev/null +++ b/mod/bpgenerator/coverage/pom.xml @@ -0,0 +1,80 @@ + + + + + blueprint-generator + org.onap.dcaegen2.platform.mod + 1.7.3-SNAPSHOT + + 4.0.0 + + coverage + + Coverage + This module is used to generate aggregated coverage report + + + true + + + + + org.onap.dcaegen2.platform.mod + blueprint-generator-common + 1.7.3-SNAPSHOT + + + org.onap.dcaegen2.platform.mod + blueprint-generator-onap + 1.7.3-SNAPSHOT + + + org.onap.dcaegen2.platform.mod + blueprint-generator-onap-executable + 1.7.3-SNAPSHOT + + + + + + + org.jacoco + jacoco-maven-plugin + + + verify + report + + report-aggregate + + + + **/jacoco-ut.exec + **/jacoco-it.exec + + + + + + + + + diff --git a/mod/bpgenerator/lombok.config b/mod/bpgenerator/lombok.config new file mode 100644 index 0000000..df71bb6 --- /dev/null +++ b/mod/bpgenerator/lombok.config @@ -0,0 +1,2 @@ +config.stopBubbling = true +lombok.addLombokGeneratedAnnotation = true diff --git a/mod/bpgenerator/pom.xml b/mod/bpgenerator/pom.xml index dd157d9..179a57b 100644 --- a/mod/bpgenerator/pom.xml +++ b/mod/bpgenerator/pom.xml @@ -5,7 +5,7 @@ ~ * org.onap.dcae ~ * ================================================================================ ~ * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. - ~ * Copyright (c) 2020 Nokia. All rights reserved. + ~ * Copyright (c) 2020-2021 Nokia. All rights reserved. ~ * ================================================================================ ~ * Licensed under the Apache License, Version 2.0 (the "License"); ~ * you may not use this file except in compliance with the License. @@ -24,183 +24,185 @@ --> - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.onap.dcaegen2.platform.mod - blueprint-generator - 1.7.3-SNAPSHOT - pom + org.onap.dcaegen2.platform.mod + blueprint-generator + 1.7.3-SNAPSHOT + pom - - common - onap - onap-executable - + + common + onap + onap-executable + coverage + - BlueprintGenerator - This is Parent Module used by DCAE and ONAP to generate Blueprints + BlueprintGenerator + This is Parent Module used by DCAE and ONAP to generate Blueprints - - org.onap.oparent - oparent - 2.0.0 - - + + org.onap.oparent + oparent + 2.0.0 + + - - UTF-8 - UTF-8 - 11 - ${java.version} - ${java.version} - 2.2.9.RELEASE - 2.9.7 - 1.18.10 - 2.8.6 - 2.6 - 1.4 - 2.22.2 - 3.8.1 - 1.4.10 - onap/${project.groupId}.${project.artifactId} - 3.0.2 - ${project.basedir}/target/surefire-reports - - ${project.basedir}/target/surefire-reports - - ${project.basedir}/target/site/jacoco-ut/jacoco.xml - - + + UTF-8 + UTF-8 + 11 + ${java.version} + ${java.version} + 2.2.9.RELEASE + 2.9.7 + 1.18.10 + 2.8.6 + 2.6 + 1.4 + 2.22.2 + 3.8.1 + 1.4.10 + onap/${project.groupId}.${project.artifactId} + 3.0.2 + ${project.basedir}/target/surefire-reports + + ${project.basedir}/target/surefire-reports + + coverage/** + ${project.basedir}/../coverage/target/site/jacoco-aggregate/jacoco.xml + + - - - org.springframework - spring-context - 5.2.0.RELEASE - - - org.springframework - spring-core - 5.2.0.RELEASE - - - org.springframework.boot - spring-boot-starter - 2.2.5.RELEASE - - - org.springframework.boot - spring-boot-starter-test - 2.2.5.RELEASE - test - - - org.springframework.boot - spring-boot-starter-validation - 2.2.5.RELEASE - - - org.projectlombok - lombok - ${lombok.version} - provided - - - com.google.code.gson - gson - ${gson.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${jackson.version} - - - junit - junit - 4.12 - test - - - org.mockito - mockito-core - 3.1.0 - test - - - info.picocli - picocli - 3.9.6 - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - commons-io - commons-io - ${commons.io.version} - - - commons-cli - commons-cli - ${commons.cli.version} - - - org.apache.maven - maven-model - 3.3.9 - - + + + org.springframework + spring-context + 5.2.0.RELEASE + + + org.springframework + spring-core + 5.2.0.RELEASE + + + org.springframework.boot + spring-boot-starter + 2.2.5.RELEASE + + + org.springframework.boot + spring-boot-starter-test + 2.2.5.RELEASE + test + + + org.springframework.boot + spring-boot-starter-validation + 2.2.5.RELEASE + + + org.projectlombok + lombok + ${lombok.version} + provided + + + com.google.code.gson + gson + ${gson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${jackson.version} + + + junit + junit + 4.12 + test + + + org.mockito + mockito-core + 3.1.0 + test + + + info.picocli + picocli + 3.9.6 + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + commons-io + commons-io + ${commons.io.version} + + + commons-cli + commons-cli + ${commons.cli.version} + + + org.apache.maven + maven-model + 3.3.9 + + - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.2 - - -Xdoclint:all - -Xlint:all - - + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.2 + + -Xdoclint:all + -Xlint:all + + - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.6 - - - test - - report - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compilerplugin.version} - - ${maven.compiler.source} - ${maven.compiler.target} - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - ${sonar.maven.plugin} - - - + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.6 + + + test + + report + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compilerplugin.version} + + ${maven.compiler.source} + ${maven.compiler.target} + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + ${sonar.maven.plugin} + + + -- cgit 1.2.3-korg