Update AAF project version to release docker image

[aaf/authz.git] / authz-cmd / pom.xml

diff --git a/authz-cmd/pom.xml b/authz-cmd/pom.xml
index e1a14e2..197414b 100644 (file)
--- a/authz-cmd/pom.xml
+++ b/authz-cmd/pom.xml
@@ -27,7 +27,7 @@
   <parent>\r
     <groupId>org.onap.aaf.authz</groupId>\r
     <artifactId>parent</artifactId>\r
-    <version>1.0.0-SNAPSHOT</version>\r
+    <version>1.0.1-SNAPSHOT</version>\r
     <relativePath>../pom.xml</relativePath>\r
   </parent>\r
   \r
@@ -55,6 +55,13 @@
     <maven.test.failure.ignore>false</maven.test.failure.ignore>\r
     <project.swmVersion>21</project.swmVersion>\r
        <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+               <sonar.language>java</sonar.language>\r
+               <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
+               <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
+               <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
+               <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>\r
+               <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
+               <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
         <nexusproxy>https://nexus.onap.org</nexusproxy>\r
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
@@ -66,11 +73,13 @@
     <dependency>\r
       <groupId>org.onap.aaf.cadi</groupId>\r
       <artifactId>cadi-aaf</artifactId>\r
+         <version>${project.cadiVersion}</version>\r
     </dependency>\r
     \r
     <dependency>\r
       <groupId>org.onap.aaf.authz</groupId>\r
       <artifactId>authz-core</artifactId>\r
+         <version>${project.version}</version>\r
     </dependency>\r
     \r
     <dependency> \r
@@ -114,16 +123,7 @@
                                        </execution>\r
                                </executions>\r
                        </plugin>\r
-       \r
-                               <plugin>\r
-                                       <groupId>org.apache.maven.plugins</groupId>\r
-                                       <artifactId>maven-deploy-plugin</artifactId>\r
-                                       <configuration>\r
-                                               <skip>true</skip>\r
-                                       </configuration>\r
-                               </plugin>\r
-                               \r
-                               \r
+               \r
                <plugin>\r
                        <groupId>org.apache.maven.plugins</groupId>\r
                        <artifactId>maven-javadoc-plugin</artifactId>\r
@@ -164,7 +164,58 @@
                                        <stagingProfileId>176c31dfe190a</stagingProfileId>\r
                                        <serverId>ecomp-staging</serverId>\r
                                </configuration>\r
-                       </plugin> \r
+                       </plugin>               \r
+                       <plugin>\r
+                               <groupId>org.jacoco</groupId>\r
+                               <artifactId>jacoco-maven-plugin</artifactId>\r
+                               <version>0.7.7.201606060606</version>\r
+                               <configuration>\r
+                                       <dumpOnExit>true</dumpOnExit>\r
+                                       <includes>\r
+                                               <include>org.onap.aaf.*</include>\r
+                                       </includes>\r
+                               </configuration>\r
+                               <executions>\r
+                                       <execution>\r
+                                               <id>pre-unit-test</id>\r
+                                               <goals>\r
+                                                       <goal>prepare-agent</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>\r
+                                                       <!-- <append>true</append> -->\r
+                                               </configuration>\r
+                                       </execution>\r
+                                       <execution>\r
+                                               <id>pre-integration-test</id>\r
+                                               <phase>pre-integration-test</phase>\r
+                                               <goals>\r
+                                                       <goal>prepare-agent</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>\r
+                                                       <!-- <append>true</append> -->\r
+                                               </configuration>\r
+                                       </execution>\r
+                                       <execution>\r
+                        <goals>\r
+                            <goal>merge</goal>\r
+                        </goals>\r
+                        <phase>post-integration-test</phase>\r
+                        <configuration>\r
+                            <fileSets>\r
+                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">\r
+                                    <directory>${project.build.directory}/coverage-reports</directory>\r
+                                    <includes>\r
+                                        <include>*.exec</include>\r
+                                    </includes>\r
+                                </fileSet>\r
+                            </fileSets>\r
+                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>\r
+                        </configuration>\r
+                    </execution>\r
+                               </executions>\r
+                       </plugin>\r
                \r
                        </plugins>\r
                <pluginManagement>\r