Remove Code from cadi, it is now in authz

[aaf/cadi.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 1568559..fc65a9a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.onap.aaf.cadi</groupId>
        <artifactId>parent</artifactId>
-       <name>CADI Parent POM (Code, Access, Data, Identity)</name>
+       <name>aaf-cadi</name>
        <version>1.0.0-SNAPSHOT</version>
        <inceptionYear>2015-07-20</inceptionYear>       
        <packaging>pom</packaging>
@@ -44,6 +44,13 @@
        <organizationUrl></organizationUrl>
                </developer>
        </developers>
+       
+       <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>
@@ -59,6 +66,16 @@
                <!-- jetty-version>7.2.0.v20101020</jetty-version -->
                <!-- project.jettyVersion>9.0.3.v20130506</project.jettyVersion -->
                <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>
+               
+               <!--  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>
@@ -89,14 +106,6 @@
        <!-- Define sub-projects (modules) -->
        <!-- ============================================================== -->
        <modules>
-               <module>core</module>
-               <module>client</module>
-               <module>aaf</module> 
-               <module>cass</module>
-               <!-- module>jetty</module -->
-               <!-- module>weblogic</module -->
-               <!-- always build last -->
-               <!--module>swm</module -->
        </modules>
 
        <!-- ============================================================== -->
@@ -104,6 +113,12 @@
        <!-- ============================================================== -->
        <dependencyManagement>
                <dependencies>
+               <dependency>
+                       <groupId>org.mockito</groupId>
+                       <artifactId>mockito-all</artifactId>
+                       <version>1.9.5</version>
+                       <scope>test</scope>
+                       </dependency>
                        <dependency>
                                <groupId>org.onap.aaf.authz</groupId>
                                <artifactId>authz-client</artifactId>
@@ -271,16 +286,16 @@
                                          <include>**/JU*.java</include>
                                        </includes>
                                        <excludes>
-                                               <exclude>**/JU_LocalLur.java</exclude>
-                                               <exclude>**/JU_BufferedServletInputStream.java</exclude>
-                                               <exclude>**/JU_Passcode.java</exclude>
-                                               <exclude>**/JU_XReader.java</exclude>
+                                               <!-- <exclude>**/JU_LocalLur.java</exclude> -->
+                                               <!-- <exclude>**/JU_BufferedServletInputStream.java</exclude> -->
+                                               <!--<exclude>**/JU_Passcode.java</exclude> -->
+                                               <!--<exclude>**/JU_XReader.java</exclude>  -->
                                                <exclude>**/JU_CASS.java</exclude>
                                                <exclude>**/JU_PropertyLocator.java</exclude>
                                                <exclude>**/JU_PermEval.java</exclude>
                                                <exclude>**/JU_JMeter.java</exclude>
                                                <exclude>**/JU_Lur2_0Call.java</exclude>
-                                       </excludes>
+                                       </excludes>   
                                  </configuration>
                                </plugin>
 
@@ -320,18 +335,7 @@
                                        </configuration>
                                </plugin>
                
-       
-       
-                               <!-- Define the javadoc plugin -->
-                               <!-- <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-javadoc-plugin</artifactId>
-                                       <version>2.10</version>
-                                       <configuration>
-                                               <excludePackageNames>org.opendaylight.*</excludePackageNames>
-                                       </configuration>
-                               </plugin> -->
-       
+               
                                <plugin>
                                        <artifactId>maven-release-plugin</artifactId>
                                        <version>2.5.2</version>
@@ -361,10 +365,11 @@
                                        <version>2.10</version>
                                </plugin>
                                
-                               <plugin>
+               <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-javadoc-plugin</artifactId>
-                                       <configuration>
+                       <version>2.10.4</version>
+                       <configuration>
                        <failOnError>false</failOnError>
                        </configuration>
                        <executions>
@@ -449,6 +454,72 @@
                                        <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>                      
        </build>
        <distributionManagement>
@@ -467,32 +538,4 @@
                        <url>dav:${nexusproxy}${sitePath}</url>
                </site>
        </distributionManagement>
-<pluginRepositories>
-        <pluginRepository>
-            <id>onap-plugin-snapshots</id>
-            <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-        </pluginRepository>
-    </pluginRepositories>
-       
-       <repositories>
-               <repository>
-                       <id>central</id>
-                       <name>Maven 2 repository 2</name>
-                       <url>http://repo2.maven.org/maven2/</url>
-               </repository>
-               <repository>
-            <id>onap-jar-snapshots</id>
-            <url>https://nexus.onap.org/content/repositories/snapshots</url>
-        </repository>
-               <repository>
-                       <id>spring-repo</id>
-                       <name>Spring repo</name>
-                       <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>
-               </repository>
-               <repository>
-                       <id>repository.jboss.org-public</id>
-                       <name>JBoss.org Maven repository</name>
-                       <url>https://repository.jboss.org/nexus/content/groups/public</url>
-               </repository>
-       </repositories>
 </project>