summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--oparent/pom.xml11
-rw-r--r--pom.xml4
2 files changed, 8 insertions, 7 deletions
diff --git a/oparent/pom.xml b/oparent/pom.xml
index 7e5f274..af6c025 100644
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -34,12 +34,11 @@
<url>https://wiki.onap.org/display/DW/Integration+Project</url>
</scm>
<properties>
- <jacoco.version>0.8.2</jacoco.version>
+ <jacoco.version>0.8.5</jacoco.version>
<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
<!-- Default Sonar configuration -->
- <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
- <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+ <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
<!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
<!-- If following file exist, auto-generation of swagger.json will be done -->
@@ -378,7 +377,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.0</version>
+ <version>3.0.0-M4</version>
<configuration>
<!-- Sets the VM argument line used when unit tests are run. -->
<argLine>${surefireArgLine}</argLine>
@@ -391,7 +390,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.22.0</version>
+ <version>3.0.0-M4</version>
<executions>
<!--
Ensures that both integration-test and verify goals of the Failsafe Maven
@@ -414,7 +413,7 @@
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
- <version>3.2</version>
+ <version>${sonar.scanner.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index c85ecaa..7003823 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,8 @@
<!-- sitePath may be overridden in the inheriting POM if desired -->
<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
<maven.compiler.release>11</maven.compiler.release>
+ <sonar.scanner.version>3.7.0.1746</sonar.scanner.version>
+
<!--
In the java 8 version of oparent there were two variables defined for 1.8 source and target. These are no longer
applicable in Java 11 but you may be referencing them in your child poms so review and update as appropriate.
@@ -148,7 +150,7 @@
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
- <version>3.2</version>
+ <version>${sonar.scanner.version}</version>
</plugin>
</plugins>
</pluginManagement>