summaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml20
1 files changed, 12 insertions, 8 deletions
diff --git a/pom.xml b/pom.xml
index 9f453d4ee8..ea3f635f71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,8 +32,8 @@
<module>cloudify-client</module>
<module>cxf-logging</module>
<module>so-monitoring</module>
- <module>packages</module>
<module>so-simulator</module>
+ <module>packages</module>
</modules>
<properties>
<project.mso.base.folder>.</project.mso.base.folder>
@@ -42,12 +42,12 @@
<sonar.language>java</sonar.language>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
- <sonar.jacoco.reportPath>${project.build.directory}/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
+ <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
<!--sonar.jacoco.itReportPath>${project.mso.base.folder}/packages/arquillian-unit-tests/target/mso-automated-tests/jacoco-it.exec</sonar.jacoco.itReportPath -->
<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
<sonar.projectVersion>${project.version}</sonar.projectVersion>
<sonar.cpd.exclusions>**/*</sonar.cpd.exclusions>
- <jacoco.version>0.7.5.201505241946</jacoco.version>
+ <jacoco.version>0.8.5</jacoco.version>
<org.apache.maven.user-settings />
<openstack.version>1.5.1</openstack.version>
<maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
@@ -342,16 +342,20 @@
<version>${jacoco.version}</version>
<executions>
<execution>
- <id>default-prepare-agent</id>
+ <id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
- <id>default-report</id>
+ <id>report</id>
<goals>
<goal>report</goal>
</goals>
+ <configuration>
+ <dataFile>${project.build.directory}/code-coverage/jacoco.exec</dataFile>
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -666,17 +670,17 @@
<dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-slf4j</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.4</version>
</dependency>
<dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-filter-base</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.6.4</version>
</dependency>
<dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-filter-spring</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.4</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>