Configure sonar code coverage; use EPSDK 1.3.0

Also use this commit to mark delivery of many feature issues

Issue: PORTAL-26, PORTAL-28, PORTAL-29, PORTAL-50, PORTAL-69,
    PORTAL-76, PORTAL-82, PORTAL-89

Change-Id: Ib3e8487c5eb3d39dcdae1450deac6d255449debc
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

1 files changed, 59 insertions, 46 deletions

diff --git a/ecomp-portal-BE-os/pom.xml b/ecomp-portal-BE-os/pom.xml
index 22b13749..00e77c20 100644
--- a/ecomp-portal-BE-os/pom.xml
+++ b/ecomp-portal-BE-os/pom.xml
@@ -7,63 +7,50 @@
 	<version>1.1</version>
 
 	<properties>
+		<portal.version>1.3.0-SNAPSHOT</portal.version>
+		<epsdk.version>1.3.0</epsdk.version>
+		<!-- Jenkins SHOULD invoke mvn with argument -Dbuild.number=${BUILD_NUMBER} -->
+		<build.number>0</build.number>
 		<springframework.version>4.2.0.RELEASE</springframework.version>
 		<hibernate.version>4.3.11.Final</hibernate.version>
 		<eelf.version>1.0.0</eelf.version>
-		<epsdk.version>1.3.0-SNAPSHOT</epsdk.version>
-		<portal.version>1.3.0-SNAPSHOT</portal.version>
 		<encoding>UTF-8</encoding>
-		<!-- If Skiptests is false use mvn clean jacoco:prepare-agent install jacoco:report 
-			to run jacoco report -->
+		<!-- If skipTests is false use this command to generate the report:
+			mvn clean jacoco:prepare-agent install jacoco:report  -->
 		<skipTests>false</skipTests>
 		<skipCoverage>true</skipCoverage>		
-		<!-- Jenkins SHOULD invoke mvn with argument -Dbuild.number=${BUILD_NUMBER} -->
-		<build.number>0</build.number>
+		<jacoco.data.file>${project.build.directory}/coverage-reports/jacoco-ut.exec</jacoco.data.file>
+		<sonar-jacoco-listeners.version>3.8</sonar-jacoco-listeners.version>
+		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+		<sonar.jacoco.reportPath>${project.build.directory}/code-coverage/jacoco.exec</sonar.jacoco.reportPath>
+		<sonar.jacoco.itReportPath>${project.build.directory}/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+		<!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
 		<sonar.exclusions>**.js</sonar.exclusions>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
+		<stagingNexusPath>content/repositories/staging/</stagingNexusPath>
 		<releaseNexusPath>content/repositories/releases/</releaseNexusPath>
 	</properties>
 
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
-				<configuration>
-					<failOnError>false</failOnError>
-					<doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
-					<docletArtifact>
-						<groupId>org.umlgraph</groupId>
-						<artifactId>umlgraph</artifactId>
-						<version>5.6</version>
-					</docletArtifact>
-					<additionalparam>-views</additionalparam>
-					<useStandardDocletOptions>true</useStandardDocletOptions>
-				</configuration>
-			</plugin>
-			
-		</plugins>
-	</reporting>
-	<distributionManagement>
-		<site>
-			<id>ecomp-site</id>
-			<url>dav:${nexusproxy}/content/sites/site/org/onap/portal/${project.version}</url>
-		</site>
-	</distributionManagement>
 	<repositories>
 		<repository>
 			<id>onap-releases</id>
+			<name>ONAP - Release Repository</name>
 			<url>${nexusproxy}/${releaseNexusPath}</url>
 		</repository>
 		<repository>
+			<id>onap-staging</id>
+			<name>ONAP - Staging Repository</name>
+			<url>${nexusproxy}/${stagingNexusPath}</url>
+		</repository>
+		<repository>
 			<id>onap-snapshots</id>
+			<name>ONAP - Snapshot Repository</name>
 			<url>${nexusproxy}/${snapshotNexusPath}</url>
 		</repository>
 		<repository>
 			<id>onap-public</id>
-			<url>https://nexus.onap.org/content/groups/public</url>
+			<url>${nexusproxy}/content/groups/public</url>
 		</repository>
 	</repositories>
 
@@ -98,28 +85,25 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
-            <plugin>
+			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
 				<version>0.7.5.201505241946</version>
 				<executions>
-
 					<!-- Prepares the property pointing to the JaCoCo runtime agent which 
-						is passed as VM argument when Maven the Surefire plugin is executed. -->
+					     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>${basedir}/target/coverage-reports/jacoco-ut.exec</destFile>
-							<!-- Sets the name of the property containing the settings for JaCoCo 
-								runtime agent. -->
+							<!-- path to the file which contains the execution data. -->
+							<destFile>${jacoco.data.file}</destFile>
+							<!-- name of the property containing the settings for JaCoCo runtime agent. -->
 							<propertyName>surefireArgLine</propertyName>
 							<skip>${skipCoverage}</skip>
 						</configuration>
-
 					</execution>
 					<!-- Ensures that the code coverage report for unit tests is created 
 						after unit tests have been run. -->
@@ -130,12 +114,11 @@
 							<goal>report</goal>
 						</goals>
 						<configuration>
-							<!-- Sets the path to the file which contains the execution data. -->
-							<dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
-							<!-- Sets the output directory for the code coverage report. -->
+							<!-- path to the file which contains the execution data. -->
+							<dataFile>${jacoco.data.file}</dataFile>
+							<!-- output directory for the code coverage report. -->
 							<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
 							<skip>${skipCoverage}</skip>
-
 						</configuration>
 					</execution>
 					<!-- Will see build errors while running the test cases because of dual 
@@ -800,4 +783,34 @@
 		</dependency>
 
 	</dependencies>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+				<configuration>
+					<failOnError>false</failOnError>
+					<doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+					<docletArtifact>
+						<groupId>org.umlgraph</groupId>
+						<artifactId>umlgraph</artifactId>
+						<version>5.6</version>
+					</docletArtifact>
+					<additionalparam>-views</additionalparam>
+					<useStandardDocletOptions>true</useStandardDocletOptions>
+				</configuration>
+			</plugin>
+			
+		</plugins>
+	</reporting>
+
+	<distributionManagement>
+		<site>
+			<id>ecomp-site</id>
+			<url>dav:${nexusproxy}/content/sites/site/org/onap/portal/${project.version}</url>
+		</site>
+	</distributionManagement>
+
 </project>