Update License & modify properties in aaf/cadi

Updated license file & sitepath modified and O-parent latest added to
parent pom of aaf/cadi,Javadocs plugin version added & duplicate staging plugin
removed.

Issue-id: AAF-59
Change-Id: Ia52c18b6c42445e3b858476dcb0b029c681c121e
Signed-off-by: sg481n <sg481n@att.com>

diff --git a/LICENSE b/LICENSE
index cd88bf0..b885083 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,23 +1,39 @@
-<!--
- ============LICENSE_START====================================================
-* org.onap.aaf
-* ===========================================================================
+/*
+* ============LICENSE_START==========================================
+* ===================================================================
 * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-* ===========================================================================
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
+* ===================================================================
+*
+* Unless otherwise specified, all software contained herein is licensed
+* under the Apache License, Version 2.0 (the "License");
+* you may not use this software except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*             http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*
+*
+* Unless otherwise specified, all documentation contained herein is licensed
+* under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+* you may not use this documentation except in compliance with the License.
 * You may obtain a copy of the License at
-* 
- *      http://www.apache.org/licenses/LICENSE-2.0
-* 
- * Unless required by applicable law or agreed to in writing, software
+*
+*             https://creativecommons.org/licenses/by/4.0/
+*
+* Unless required by applicable law or agreed to in writing, documentation
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
-* ============LICENSE_END====================================================
+*
+* ============LICENSE_END============================================
 *
 * ECOMP is a trademark and service mark of AT&T Intellectual Property.
 *
-
--->
\ No newline at end of file
+*/
\ No newline at end of file

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

diff --git a/cass/pom.xml b/cass/pom.xml
index 9af30fa..6e07ded 100644 (file)
--- a/cass/pom.xml
+++ b/cass/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
        <dependencies>\r
                <dependency>\r
@@ -77,7 +84,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
@@ -115,6 +123,57 @@
                                        <serverId>ecomp-staging</serverId>\r
                                </configuration>\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
                </plugins>\r
        </build>\r
                <distributionManagement>\r
@@ -133,32 +192,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

diff --git a/client/pom.xml b/client/pom.xml
index 45615cb..219b936 100644 (file)
--- a/client/pom.xml
+++ b/client/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
        <dependencies>\r
                <dependency>\r
@@ -66,10 +73,11 @@
                                <groupId>org.apache.maven.plugins</groupId>\r
                                <artifactId>maven-jarsigner-plugin</artifactId>\r
                        </plugin>\r
-                                               <plugin>\r
+                       <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
@@ -107,7 +115,59 @@
                                        <stagingProfileId>176c31dfe190a</stagingProfileId>\r
                                        <serverId>ecomp-staging</serverId>\r
                                </configuration>\r
-                       </plugin> \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
@@ -126,32 +186,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

diff --git a/core/pom.xml b/core/pom.xml
index 80fb699..dd3415f 100644 (file)
--- a/core/pom.xml
+++ b/core/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
        <dependencies>\r
 \r
@@ -93,7 +100,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
@@ -131,6 +139,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
@@ -149,32 +209,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

diff --git a/pom.xml b/pom.xml
index bd918f2..3d9bcca 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,13 @@
        <organizationUrl></organizationUrl>
                </developer>
        </developers>
+       
+       <parent>             
+       <groupId>org.onap.oparent</groupId>
+       <artifactId>oparent</artifactId>
+       <version>0.1.1</version>
+    </parent>
+       
        <properties>
                <skipSigning>true</skipSigning>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -59,6 +66,13 @@
                <!-- 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.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>true</sonar.jacoco.reportMissing.force.zero>
+               <sonar.projectVersion>${project.version}</sonar.projectVersion>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
@@ -320,18 +334,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 +364,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 +453,58 @@
                                        <serverId>ecomp-staging</serverId>
                                </configuration>
                        </plugin> 
+                       
+                       <plugin>
+                               <groupId>org.jacoco</groupId>
+                               <artifactId>jacoco-maven-plugin</artifactId>
+                               <version>0.7.7.201606060606</version>
+                               <configuration>
+                                       <dumpOnExit>true</dumpOnExit>
+                                       <includes>
+                                               <include>org.onap.aaf.*</include>
+                                       </includes>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>pre-unit-test</id>
+                                               <goals>
+                                                       <goal>prepare-agent</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+                                                       <!-- <append>true</append> -->
+                                               </configuration>
+                                       </execution>
+                                       <execution>
+                                               <id>pre-integration-test</id>
+                                               <phase>pre-integration-test</phase>
+                                               <goals>
+                                                       <goal>prepare-agent</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+                                                       <!-- <append>true</append> -->
+                                               </configuration>
+                                       </execution>
+                                       <execution>
+                        <goals>
+                            <goal>merge</goal>
+                        </goals>
+                        <phase>post-integration-test</phase>
+                        <configuration>
+                            <fileSets>
+                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
+                                    <directory>${project.build.directory}/coverage-reports</directory>
+                                    <includes>
+                                        <include>*.exec</include>
+                                    </includes>
+                                </fileSet>
+                            </fileSets>
+                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
+                        </configuration>
+                    </execution>
+                               </executions>
+                       </plugin>
                        </plugins>                      
        </build>
        <distributionManagement>
@@ -467,32 +523,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>