Update License & modify properties in aaf/cadi

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

diff --git a/aaf/pom.xml b/aaf/pom.xml
index 4545082..0a96679 100644 (file)
--- a/aaf/pom.xml
+++ b/aaf/pom.xml
@@ -37,11 +37,18 @@
        <properties>\r
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\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
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
-               <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>\r
+               <sitePath>/content/sites/site/org/onap/aaf/cadi/${project.artifactId}/${project.version}</sitePath>\r
        </properties>\r
        \r
        <dependencies>\r
@@ -124,7 +131,8 @@
                <plugin>\r
                        <groupId>org.apache.maven.plugins</groupId>\r
                        <artifactId>maven-javadoc-plugin</artifactId>\r
-                                       <configuration>\r
+                       <version>2.10.4</version>\r
+                       <configuration>\r
                        <failOnError>false</failOnError>\r
                        </configuration>\r
                        <executions>\r
@@ -152,17 +160,7 @@
                      </executions>\r
                    </plugin>\r
        \r
-       <plugin>\r
-                       <groupId>org.sonatype.plugins</groupId>\r
-                       <artifactId>nexus-staging-maven-plugin</artifactId>\r
-                       <version>1.6.7</version>\r
-                       <extensions>true</extensions>\r
-                       <configuration>\r
-                       <serverId>ossrhdme</serverId>\r
-                       <nexusUrl>https://oss.sonatype.org/</nexusUrl>\r
-                       <autoReleaseAfterClose>true</autoReleaseAfterClose>\r
-                       </configuration>\r
-               </plugin>\r
+\r
 \r
                        <plugin>\r
                                <!-- Also sign "full" -->\r
@@ -203,6 +201,58 @@
                                        <serverId>ecomp-staging</serverId>\r
                                </configuration>\r
                        </plugin> \r
+                       \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
                </plugins>\r
        </build>\r
                <distributionManagement>\r
@@ -221,32 +271,5 @@
                        <url>dav:${nexusproxy}${sitePath}</url>\r
                </site>\r
        </distributionManagement>\r
-<pluginRepositories>\r
-        <pluginRepository>\r
-            <id>onap-plugin-snapshots</id>\r
-            <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
-        </pluginRepository>\r
-    </pluginRepositories>\r
-       \r
-       <repositories>\r
-               <repository>\r
-                       <id>central</id>\r
-                       <name>Maven 2 repository 2</name>\r
-                       <url>http://repo2.maven.org/maven2/</url>\r
-               </repository>\r
-               <repository>\r
-            <id>onap-jar-snapshots</id>\r
-            <url>https://nexus.onap.org/content/repositories/snapshots</url>\r
-        </repository>\r
-               <repository>\r
-                       <id>spring-repo</id>\r
-                       <name>Spring repo</name>\r
-                       <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>\r
-               </repository>\r
-               <repository>\r
-                       <id>repository.jboss.org-public</id>\r
-                       <name>JBoss.org Maven repository</name>\r
-                       <url>https://repository.jboss.org/nexus/content/groups/public</url>\r
-               </repository>\r
-       </repositories>\r
+\r
 </project>\r