aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--hv-collector-coverage/pom.xml27
-rw-r--r--pom.xml15
2 files changed, 22 insertions, 20 deletions
diff --git a/hv-collector-coverage/pom.xml b/hv-collector-coverage/pom.xml
index 6417340a..f988f8ec 100644
--- a/hv-collector-coverage/pom.xml
+++ b/hv-collector-coverage/pom.xml
@@ -53,11 +53,21 @@
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
- <id>default-report</id>
- <phase>package</phase>
+ <id>jacoco-aggregate-report</id>
+ <phase>verify</phase>
<goals>
<goal>report-aggregate</goal>
</goals>
+ <configuration>
+ <excludes>
+ <!-- Exclute Protobuf-generated classes -->
+ <exclude>org/onap/ves/*</exclude>
+ </excludes>
+ <dataFileIncludes>
+ <dataFileInclude>**/jacoco-ut.exec</dataFileInclude>
+ <dataFileInclude>**/jacoco-it.exec</dataFileInclude>
+ </dataFileIncludes>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -77,22 +87,27 @@
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>hv-collector-main</artifactId>
+ <artifactId>hv-collector-dcae-app-simulator</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>hv-collector-utils</artifactId>
+ <artifactId>hv-collector-domain</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>hv-collector-domain</artifactId>
+ <artifactId>hv-collector-health-check</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>hv-collector-dcae-app-simulator</artifactId>
+ <artifactId>hv-collector-main</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>hv-collector-utils</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index e61bf45d..2781799b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
<arrow.version>0.7.3</arrow.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<build-helper-maven-plugin.version>1.7</build-helper-maven-plugin.version>
- <jacoco.version>0.8.1</jacoco.version>
+ <jacoco.version>0.8.2</jacoco.version>
<!-- Protocol buffers -->
<protobuf.version>3.5.1</protobuf.version>
@@ -465,19 +465,6 @@
<pluginRepositories>
<pluginRepository>
- <id>40_openecomp-release</id>
- <name>40_openecomp-release</name>
- <url>https://nexus.onap.org/content/repositories/releases/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
-
- <pluginRepository>
<id>arturbosch-code-analysis</id>
<name>arturbosch-code-analysis (for detekt)</name>
<url>https://dl.bintray.com/arturbosch/code-analysis/</url>