Fix sonar issues & modify deploy property

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

diff --git a/cadi/pom.xml b/cadi/pom.xml
index 1928f7d..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>
@@ -38,6 +44,20 @@
                <project.authClientVersion>2.10-SNAPSHOT</project.authClientVersion>
                <project.jettyVersion>9.3.9.v20160517</project.jettyVersion>
                <powermock.version>1.5.1</powermock.version>
+               <!--  SONAR  -->
+                <jacoco.version>0.7.7.201606060606</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>
+           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
+           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+               <nexusproxy>https://nexus.onap.org</nexusproxy>
+               <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
+               <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+               <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
+               <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
        </properties>
 
        <!-- ============================================================== -->
@@ -117,7 +137,6 @@
                <module>client</module>
                <module>aaf</module>
                <module>cass</module>
-               
                <module>oauth-enduser</module>
                <module>shiro</module>
        </modules>
@@ -128,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>
@@ -148,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>
@@ -331,7 +350,6 @@
                                        <artifactId>maven-surefire-plugin</artifactId>
                                        <version>2.17</version>
                                        <configuration>
-                                               <skipTests>true</skipTests>
                                        </configuration>
                                </plugin>
                                
@@ -367,11 +385,101 @@
                                                </lifecycleMappingMetadata>
                                        </configuration>
                                </plugin>
-                               
+                                                               <plugin>
+                               <groupId>org.sonatype.plugins</groupId>
+                               <artifactId>nexus-staging-maven-plugin</artifactId>
+                               <version>1.6.7</version>
+                               <extensions>true</extensions>
+                               <configuration>
+                                       <nexusUrl>${nexusproxy}</nexusUrl>
+                                       <stagingProfileId>176c31dfe190a</stagingProfileId>
+                                       <serverId>ecomp-staging</serverId>
+                               </configuration>
+                       </plugin>               
+                       <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>
 
 
+       <distributionManagement>
+               <repository>
+                       <id>ecomp-releases</id>
+                       <name>AAF Release Repository</name>
+                       <url>${nexusproxy}${releaseNexusPath}</url>
+               </repository>
+               <snapshotRepository>
+                       <id>ecomp-snapshots</id>
+                       <name>AAF Snapshot Repository</name>
+                       <url>${nexusproxy}${snapshotNexusPath}</url>
+               </snapshotRepository>
+               <site>
+                       <id>ecomp-site</id>
+                       <url>dav:${nexusproxy}${sitePath}</url>
+               </site>
+       </distributionManagement>
        
 </project>