From 3d3d27326b311e024434cad7ac5151c43be3f88f Mon Sep 17 00:00:00 2001
From: Matthieu Geerebaert <matthieu.geerebaert@orange.com>
Date: Fri, 17 May 2019 14:39:40 +0200
Subject: Fix broken sonar code coverage

Change-Id: I351eaed02a4ddf3f20448a954efe4fd73f42f183
Issue-ID: EXTAPI-246
Signed-off-by: MatthieuGeerebaert <matthieu.geerebaert@orange.com>
---
 pom.xml | 109 +++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 53 insertions(+), 56 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index f2178cc..9a254a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -447,61 +447,59 @@
         <artifactId>sonar-maven-plugin</artifactId>
         <version>3.2</version>
       </plugin>
-      <!--       <plugin> -->
-      <!--         <groupId>org.jacoco</groupId> -->
-      <!--         <artifactId>jacoco-maven-plugin</artifactId> -->
-      <!--         <version>0.8.1</version> -->
-      <!--         <configuration> -->
-      <!--           <dumpOnExit>true</dumpOnExit> -->
-      <!--           <includes> -->
-      <!--             <include>org.onap.nbi.*</include> -->
-      <!--           </includes> -->
-      <!--           <excludes> -->
-      <!--             <exclude>**/model/**/*</exclude> -->
-      <!--           </excludes> -->
-      <!--         </configuration> -->
-      <!--         <executions> -->
-      <!--           <execution> -->
-      <!--             <id>pre-unit-test</id> -->
-      <!--             <goals> -->
-      <!--               <goal>prepare-agent</goal> -->
-      <!--             </goals> -->
-      <!--             <configuration> -->
-      <!--               <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile> -->
-      <!--               <append>true</append> -->
-      <!--             </configuration> -->
-      <!--           </execution> -->
-      <!--           <execution> -->
-      <!--             <id>pre-integration-test</id> -->
-      <!--             <phase>pre-integration-test</phase> -->
-      <!--             <goals> -->
-      <!--               <goal>prepare-agent</goal> -->
-      <!--             </goals> -->
-      <!--             <configuration> -->
-      <!--               <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile> -->
-      <!--               <append>true</append> -->
-      <!--             </configuration> -->
-      <!--           </execution> -->
-      <!--           <execution> -->
-      <!--             <goals> -->
-      <!--               <goal>merge</goal> -->
-      <!--             </goals> -->
-      <!--             <phase>post-integration-test</phase> -->
-      <!--             <configuration> -->
-      <!--               <fileSets> -->
-      <!--                 <fileSet -->
-      <!--                   implementation="org.apache.maven.shared.model.fileset.FileSet"> -->
-      <!--                   <directory>${project.build.directory}/coverage-reports</directory> -->
-      <!--                   <includes> -->
-      <!--                     <include>*.exec</include> -->
-      <!--                   </includes> -->
-      <!--                 </fileSet> -->
-      <!--               </fileSets> -->
-      <!--               <destFile>${project.build.directory}/jacoco-dev.exec</destFile> -->
-      <!--             </configuration> -->
-      <!--           </execution> -->
-      <!--         </executions> -->
-      <!--       </plugin> -->
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.1</version>
+        <configuration>
+          <dumpOnExit>true</dumpOnExit>
+          <includes>
+            <include>org.onap.nbi.*</include>
+          </includes>
+          <excludes>
+            <exclude>**/model/**/*</exclude>
+          </excludes>
+        </configuration>
+        <executions>
+          <execution>
+            <id>pre-unit-test</id>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+            <configuration>
+              <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+            </configuration>
+          </execution>
+          <execution>
+            <id>pre-integration-test</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+            <configuration>
+              <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+            </configuration>
+          </execution>
+          <execution>
+            <goals>
+              <goal>merge</goal>
+            </goals>
+            <phase>post-integration-test</phase>
+            <configuration>
+              <fileSets>
+                <fileSet
+                  implementation="org.apache.maven.shared.model.fileset.FileSet">
+                  <directory>${project.build.directory}/coverage-reports</directory>
+                  <includes>
+                    <include>*.exec</include>
+                  </includes>
+                </fileSet>
+              </fileSets>
+              <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
         <executions>
@@ -517,7 +515,6 @@
     </plugins>
   </build>
 
-
   <profiles>
     <profile>
       <id>docker</id>
-- 
cgit 1.2.3-korg