AT&T 2.0.19 Code drop, stage 2

[aaf/authz.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index e3e8b58..ba5bab1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -34,15 +34,10 @@
        <parent>             
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>0.1.1</version>
+        <version>1.1.0</version>
     </parent>
        
-       <licenses>
-               <license>
-               <name>BSD License</name>
-               <url> </url>
-               </license>
-       </licenses>
+
        <developers>
                <developer>
                <name>Jonathan Gathman</name>
@@ -63,13 +58,15 @@
                <project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>
                <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>
                <project.dme2Version>3.1.200</project.dme2Version>
-               <sonar.language>java</sonar.language>
-               <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-               <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
-               <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
-               <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
-               <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
-               <sonar.projectVersion>${project.version}</sonar.projectVersion>
+       <!--  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>
@@ -117,15 +114,28 @@
                                          <exclude>**/JU_CredDAO.java</exclude>
                                          <exclude>**/JU_CacheInfoDAO.java</exclude>
                                          <exclude>**/JU_ApprovalDAO.java</exclude>
-                                         <exclude>**/JU_Define.java</exclude>
+                                       <!--  <exclude>**/JU_Define.java</exclude>  -->
+                                       <exclude>**/JU_Identities.java</exclude>
                                          <exclude>**/JU_AuthzTransFilter.java</exclude>
                                          <exclude>**/JU_CachingFileAccess.java</exclude>
-                                         <!-- <exclude>**/AbsServiceTest.java</exclude> -->
-                                         <exclude>**/JU_DefaultOrg.java</exclude>
+                                         <!-- <exclude>**/AbsServiceTest.java</exclude>  -->
+                                 <!--            <exclude>**/JU_DefaultOrg.java</exclude> -->
                                          <exclude>**/JU_FileServer.java</exclude>
                                          <exclude>**/JU_DirectAAFLur.java</exclude>
                                          <exclude>**/JU_AuthAPI.java</exclude>
-                                         <exclude>**/JU_GwAPI.java</exclude>  
+                                         <exclude>**/JU_GwAPI.java</exclude>
+                                         <exclude>**/JU_NsDAO.java</exclude>
+                                         <exclude>**/JU_Delete.java</exclude>
+                                         <exclude>**/JU_Create.java</exclude>
+                                         <exclude>**/JU_Admin.java</exclude>
+                                         <exclude>**/JU_Attrib.java</exclude>
+                                         <exclude>**/JU_Describe.java</exclude>
+                                         <exclude>**/JU_ListUsersInRole.java</exclude>
+                                         <exclude>**/JU_ListUsersWithPerm.java</exclude>
+                                         <exclude>**/JU_Responsible.java</exclude>
+                                       
+                                         
+                                         
                                          
                                          <!-- <exclude>**/JU_Perm_2_0*.java</exclude> -->
                                          <!-- <exclude>**/JU_Role_2_0*.java</exclude>                             -->
@@ -261,13 +271,11 @@
                                        <serverId>ecomp-staging</serverId>
                                </configuration>
                        </plugin>               
-                       <plugin>
+               <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
           <version>${jacoco.version}</version>
           <configuration>
-            <!-- Note: This exclusion list should match <sonar.exclusions>
-         property above -->
             <excludes>
               <exclude>**/gen/**</exclude>
               <exclude>**/generated-sources/**</exclude>
@@ -276,29 +284,19 @@
             </excludes>
           </configuration>
           <executions>
-            <!--
-        Prepares the property pointing to the JaCoCo runtime agent which
-        is passed as VM argument when Maven the Surefire plugin is executed.
-        -->
+
             <execution>
               <id>pre-unit-test</id>
               <goals>
                 <goal>prepare-agent</goal>
               </goals>
               <configuration>
-                <!-- Sets the path to the file which contains the execution data. -->
                 <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                <!--
-            Sets the name of the property containing the settings
-            for JaCoCo runtime agent.
-        -->
                 <propertyName>surefireArgLine</propertyName>
               </configuration>
             </execution>
-            <!--
-        Ensures that the code coverage report for unit tests is created after
-        unit tests have been run.
-        -->
+            
+       
             <execution>
               <id>post-unit-test</id>
               <phase>test</phase>
@@ -306,9 +304,7 @@
                 <goal>report</goal>
               </goals>
               <configuration>
-                <!-- Sets the path to the file which contains the execution data. -->
                 <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                <!-- Sets the output directory for the code coverage report. -->
                 <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
               </configuration>
             </execution>
@@ -319,19 +315,13 @@
                 <goal>prepare-agent</goal>
               </goals>
               <configuration>
-                <!-- Sets the path to the file which contains the execution data. -->
                 <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-                <!--
-            Sets the name of the property containing the settings
-            for JaCoCo runtime agent.
-        -->
+
                 <propertyName>failsafeArgLine</propertyName>
               </configuration>
             </execution>
-            <!--
-        Ensures that the code coverage report for integration tests after
-        integration tests have been run.
-        -->
+
+       
             <execution>
               <id>post-integration-test</id>
               <phase>post-integration-test</phase>
@@ -339,15 +329,12 @@
                 <goal>report</goal>
               </goals>
               <configuration>
-                <!-- Sets the path to the file which contains the execution data. -->
                 <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                <!-- Sets the output directory for the code coverage report. -->
                 <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
               </configuration>
             </execution>
           </executions>
-        </plugin>                    
-
+        </plugin>      
                                
                </plugins>
                </pluginManagement>                     
@@ -384,22 +371,6 @@
        </dependencies>         
 
        <modules>
-               <!-- 
-                  <module> auth-client</module>
-                  complile manually with mvn -N independently
-               -->
-               <module>authz-client</module>
-               <module>authz-core</module>
-               <module>authz-cass</module>
-               <module>authz-defOrg</module>
-               <module>authz-cmd</module>
-               <!--  <module>authz-batch</module>-->
-               <module>authz-test</module>
-               <!--  <module>authz-gui</module> -->
-               <module>authz-gw</module>
-               <module>authz-certman</module>
-               <module>authz-fs</module>
-               <module>authz-service</module>
        </modules>
        
        <dependencyManagement>