Fix for Sonar tests in POMs

[aaf/authz.git] / auth / auth-batch / pom.xml

diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml
index 842bb0c..98cf0f3 100644 (file)
--- a/auth/auth-batch/pom.xml
+++ b/auth/auth-batch/pom.xml
@@ -155,56 +155,67 @@
                                </configuration>
                        </plugin>               
                        <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.7.201606060606</version>
-                               <configuration>
-                                       <dumpOnExit>true</dumpOnExit>
-                                       <includes>
-                                               <include>org.onap.aaf.*</include>
-                                       </includes>
-                               </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>
+                                       <groupId>org.jacoco</groupId>
+                                       <artifactId>jacoco-maven-plugin</artifactId>
+                                       <version>${jacoco.version}</version>
+                                       <configuration>
+                                               <excludes>
+                                                       <exclude>**/gen/**</exclude>
+                                                       <exclude>**/generated-sources/**</exclude>
+                                                       <exclude>**/yang-gen/**</exclude>
+                                                       <exclude>**/pax/**</exclude>
+                                               </excludes>
+                                       </configuration>
+                                       <executions>
+
+                                               <execution>
+                                                       <id>pre-unit-test</id>
+                                                       <goals>
+                                                               <goal>prepare-agent</goal>
+                                                       </goals>
+                                                       <configuration>
+                                                               <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+                                                               <propertyName>surefireArgLine</propertyName>
+                                                       </configuration>
+                                               </execution>
+
+
+                                               <execution>
+                                                       <id>post-unit-test</id>
+                                                       <phase>test</phase>
+                                                       <goals>
+                                                               <goal>report</goal>
+                                                       </goals>
+                                                       <configuration>
+                                                               <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+                                                               <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                                                       </configuration>
+                                               </execution>
+                                               <execution>
+                                                       <id>pre-integration-test</id>
+                                                       <phase>pre-integration-test</phase>
+                                                       <goals>
+                                                               <goal>prepare-agent</goal>
+                                                       </goals>
+                                                       <configuration>
+                                                               <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                                                               <propertyName>failsafeArgLine</propertyName>
+                                                       </configuration>
+                                               </execution>
+
+                                               <execution>
+                                                       <id>post-integration-test</id>
+                                                       <phase>post-integration-test</phase>
+                                                       <goals>
+                                                               <goal>report</goal>
+                                                       </goals>
+                                                       <configuration>
+                                                               <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+                                                               <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+                                                       </configuration>
+                                               </execution>
+                                       </executions>
+                               </plugin>
                </plugins>
        </build>