Fix sonar issues & modify deploy property

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

diff --git a/cadi/pom.xml b/cadi/pom.xml
index 133ee67..5c72f5b 100644 (file)
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -21,7 +21,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">
        <modelVersion>4.0.0</modelVersion>
-       <groupId>org.onap.aaf.cadi</groupId>
+       <groupId>org.onap.aaf.authz.cadi</groupId>
        <artifactId>parent</artifactId>
        <name>AAF CADI Parent (Code, Access, Data, Identity)</name>
        <version>1.5.0-SNAPSHOT</version>
@@ -31,6 +31,12 @@
        </organization>
        <packaging>pom</packaging>
 
+   <parent>             
+        <groupId>org.onap.oparent</groupId>
+        <artifactId>oparent</artifactId>
+        <version>1.1.0</version>
+    </parent>
+       
        <properties>
                <skipSigning>true</skipSigning>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -131,7 +137,6 @@
                <module>client</module>
                <module>aaf</module>
                <module>cass</module>
-               
                <module>oauth-enduser</module>
                <module>shiro</module>
        </modules>
@@ -142,19 +147,19 @@
        <dependencyManagement>
                <dependencies>
                        <dependency>
-                               <groupId>org.onap.aaf.auth</groupId>
+                               <groupId>org.onap.aaf.authz.auth</groupId>
                                <artifactId>aaf-auth-client</artifactId>
                                <version>${project.authClientVersion}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.cadi</groupId>
+                               <groupId>org.onap.aaf.authz.cadi</groupId>
                                <artifactId>aaf-cadi-core</artifactId>
                                <version>${project.version}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.cadi</groupId>
+                               <groupId>org.onap.aaf.authz.cadi</groupId>
                                <artifactId>aaf-cadi-oauth</artifactId>
                                <version>${project.version}</version>
                        </dependency>
@@ -162,57 +167,57 @@
 
                        <!-- Prevent Cycles in Testing  -->
                        <dependency>
-                               <groupId>org.onap.aaf.cadi</groupId>
+                               <groupId>org.onap.aaf.authz.cadi</groupId>
                                <artifactId>aaf-cadi-core</artifactId>
                                <version>${project.version}</version>
                                <classifier>tests</classifier>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.cadi</groupId>
+                               <groupId>org.onap.aaf.authz.cadi</groupId>
                                <artifactId>aaf-cadi-jetty</artifactId>
                                <version>${project.version}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.cadi</groupId>
+                               <groupId>org.onap.aaf.authz.cadi</groupId>
                                <artifactId>aaf-cadi-cass</artifactId>
                                <version>${project.version}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.cadi</groupId>
+                               <groupId>org.onap.aaf.authz.cadi</groupId>
                                <artifactId>aaf-cadi-aaf</artifactId>
                                <version>${project.version}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.cadi</groupId>
+                               <groupId>org.onap.aaf.authz.cadi</groupId>
                                <artifactId>aaf-cadi-aaf</artifactId>
                                <version>${project.version}</version>
                                <classifier>full</classifier>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.cadi</groupId>
+                               <groupId>org.onap.aaf.authz.cadi</groupId>
                                <artifactId>aaf-cadi-client</artifactId>
                                <version>${project.version}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.misc</groupId>
+                               <groupId>org.onap.aaf.authz.misc</groupId>
                                <artifactId>aaf-misc-env</artifactId>
                                <version>${project.miscVersion}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.misc</groupId>
+                               <groupId>org.onap.aaf.authz.misc</groupId>
                                <artifactId>aaf-misc-rosetta</artifactId>
                                <version>${project.miscVersion}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.misc</groupId>
+                               <groupId>org.onap.aaf.authz.misc</groupId>
                                <artifactId>aaf-misc-log4j</artifactId>
                                <version>${project.miscVersion}</version>
                        </dependency>
@@ -345,7 +350,6 @@
                                        <artifactId>maven-surefire-plugin</artifactId>
                                        <version>2.17</version>
                                        <configuration>
-                                               <skipTests>true</skipTests>
                                        </configuration>
                                </plugin>
                                
@@ -393,56 +397,69 @@
                                </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>
                </pluginManagement>                     
        </build>