Fix sonar issues & modify deploy property

[aaf/authz.git] / cadi / aaf / pom.xml

diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml
index 7a8185c..25655d0 100644 (file)
--- a/cadi/aaf/pom.xml
+++ b/cadi/aaf/pom.xml
@@ -22,7 +22,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <parent>
-               <groupId>org.onap.aaf.cadi</groupId>
+               <groupId>org.onap.aaf.authz.cadi</groupId>
                <artifactId>parent</artifactId>
                <version>1.5.0-SNAPSHOT</version>
                <relativePath>..</relativePath>
@@ -88,22 +88,22 @@
 
        <dependencies>
                <dependency>
-                       <groupId>org.onap.aaf.auth</groupId>
+                       <groupId>org.onap.aaf.authz.auth</groupId>
                        <artifactId>aaf-auth-client</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aaf.cadi</groupId>
+                       <groupId>org.onap.aaf.authz.cadi</groupId>
                        <artifactId>aaf-cadi-client</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aaf.misc</groupId>
+                       <groupId>org.onap.aaf.authz.misc</groupId>
                        <artifactId>aaf-misc-env</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aaf.cadi</groupId>
+                       <groupId>org.onap.aaf.authz.cadi</groupId>
                        <artifactId>aaf-cadi-core</artifactId>
                </dependency>
 
@@ -130,55 +130,69 @@
                                </configuration>
                        </plugin>               
                        <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <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>
                        <!-- We want to create a Jar with Rosetta built in (since I don't want 
                                a separate deployment at this time Use this one as the jar to put in SWM 
                                packages <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration>