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>

1 files changed, 62 insertions, 30 deletions

diff --git a/cass/pom.xml b/cass/pom.xml
index 9af30fa..6e07ded 100644
--- a/cass/pom.xml
+++ b/cass/pom.xml
@@ -37,11 +37,18 @@
 <properties>

 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

 		<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>

 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>

-		<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>

+		<sitePath>/content/sites/site/org/onap/aaf/cadi/${project.artifactId}/${project.version}</sitePath>

 	</properties>

 	<dependencies>

 		<dependency>

@@ -77,7 +84,8 @@
 		<plugin>

 			<groupId>org.apache.maven.plugins</groupId>

 			<artifactId>maven-javadoc-plugin</artifactId>

-					<configuration>

+			<version>2.10.4</version>

+			<configuration>

 			<failOnError>false</failOnError>

 			</configuration>

 			<executions>

@@ -115,6 +123,57 @@
 					<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>

@@ -133,32 +192,5 @@
 			<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>