X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=oparent%2Fpom.xml;h=b76a1f89908fd356d0ad69b76eae20f58489a67a;hb=4e988c2184dadf3b5ffbc21578e3db9530480674;hp=7e5f2742eaf813cbbc5c2dbf18c15c7c41f1966c;hpb=5a4892d3f1842b80ac5d28f035a6d1e151b9897d;p=oparent.git

diff --git a/oparent/pom.xml b/oparent/pom.xml
index 7e5f274..b76a1f8 100644
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>version</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.0.2-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>oparent</artifactId>
@@ -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 -->
@@ -280,7 +279,7 @@
       <dependency>
         <groupId>org.onap.oparent</groupId>
         <artifactId>dependencies</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.0.2-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -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>
@@ -437,7 +436,7 @@
           <dependency>
             <groupId>org.onap.oparent</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>3.0.2-SNAPSHOT</version>
           </dependency>
         </dependencies>
         <executions>
@@ -452,7 +451,9 @@
               <includeResources>false</includeResources>
               <includeTestSourceDirectory>true</includeTestSourceDirectory>
               <includeTestResources>false</includeTestResources>
-              <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
+              <sourceDirectories>
+                <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+              </sourceDirectories>
               <excludes>
               </excludes>
               <consoleOutput>true</consoleOutput>
@@ -471,7 +472,9 @@
                    with minor changes -->
               <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
               <!-- <sourceDirectories> is needed so that checkstyle ignores the generated sources directory -->
-              <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
+              <sourceDirectories>
+                <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+              </sourceDirectories>
               <includeResources>true</includeResources>
               <includeTestSourceDirectory>true</includeTestSourceDirectory>
               <includeTestResources>true</includeTestResources>