Fix optf-cmso clm and sonar reports

Change-Id: I9a818d717667290c8794ed055191fc24adedb68b
Signed-off-by: vrvarma <vikas.varma@att.com>
Issue-ID: OPTFRA-694

16 files changed, 78 insertions, 35 deletions

diff --git a/cmso-database/src/main/docker/Dockerfile b/cmso-database/src/main/docker/Dockerfile
index 8c4074c..89d2934 100644
--- a/cmso-database/src/main/docker/Dockerfile
+++ b/cmso-database/src/main/docker/Dockerfile
@@ -15,7 +15,7 @@ RUN test -n "$http_proxy" && echo "Acquire::Proxy \"http://$http_proxy\";" > /et
     apt-get update &&  \
     apt-get -y dist-upgrade &&  \
     apt-get install -y openjdk-11-jre-headless && \
-	apt-get install -y curl
+	apt-get install -y curl unzip wget netcat
 
 RUN groupadd onap \
     && useradd -m -g onap onap
diff --git a/cmso-optimizer/pom.xml b/cmso-optimizer/pom.xml
index 5c83477..1ce329d 100644
--- a/cmso-optimizer/pom.xml
+++ b/cmso-optimizer/pom.xml
@@ -47,8 +47,6 @@
 		<jacoco.itPath>${basedir}/target/jacoco_itReport</jacoco.itPath>
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-		<sonar.jacoco.reportPath>${basedir}/target/jacoco-ut.exec</sonar.jacoco.reportPath>
-		<sonar.jacoco.itReportPath>${basedir}/target/jacoco-it.exec</sonar.jacoco.itReportPath>
 		<sonar.surefire.reportsPath>${basedir}/target/surefire-reports</sonar.surefire.reportsPath>
 		<sonar.failsafe.reportsPath>${basedir}/target/failsafe-reports</sonar.failsafe.reportsPath>
 
@@ -56,7 +54,8 @@
 		<docker.skip.push>false</docker.skip.push>
 		<docker.skip.tag>false</docker.skip.tag>
 		<skip.staging.artifacts>false</skip.staging.artifacts>
-
+		<sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/optimizer-it/jacoco.xml,${project.build.directory}/site/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+		
 	</properties>
 
 	<dependencyManagement>
diff --git a/cmso-optimizer/src/main/docker/Dockerfile b/cmso-optimizer/src/main/docker/Dockerfile
index b5a5477..a10bbc1 100644
--- a/cmso-optimizer/src/main/docker/Dockerfile
+++ b/cmso-optimizer/src/main/docker/Dockerfile
@@ -22,7 +22,7 @@ RUN test -n "$http_proxy" && echo "Acquire::Proxy \"http://$http_proxy\";" > /et
     apt-get -y dist-upgrade &&  \
     apt-get install -y openjdk-11-jre-headless && \
     apt-get install -y wget && \
-    apt-get install -y curl && \
+    apt-get install -y curl unzip wget netcat && \
     set && \
     wget -q $MZN_DL_URL -O mz.tgz && \
     tar xzf mz.tgz && \
diff --git a/cmso-service/pom.xml b/cmso-service/pom.xml
index f3df62e..fdb0077 100644
--- a/cmso-service/pom.xml
+++ b/cmso-service/pom.xml
@@ -58,8 +58,6 @@
 		<jacoco.itPath>${basedir}/target/jacoco_itReport</jacoco.itPath>

 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>

 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>

-		<sonar.jacoco.reportPath>${basedir}/target/jacoco-ut.exec</sonar.jacoco.reportPath>

-		<sonar.jacoco.itReportPath>${basedir}/target/jacoco-it.exec</sonar.jacoco.itReportPath>

 		<sonar.surefire.reportsPath>${basedir}/target/surefire-reports</sonar.surefire.reportsPath>

 		<sonar.failsafe.reportsPath>${basedir}/target/failsafe-reports</sonar.failsafe.reportsPath>

 

@@ -67,7 +65,8 @@
 		<docker.skip.push>false</docker.skip.push>

 		<docker.skip.tag>false</docker.skip.tag>

 		<skip.staging.artifacts>false</skip.staging.artifacts>

-

+		<sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/service-it/jacoco.xml,${project.build.directory}/site/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>

+	

 	</properties>

 

 	<dependencyManagement>

diff --git a/cmso-service/src/main/docker/Dockerfile b/cmso-service/src/main/docker/Dockerfile
index e46cdeb..c9c6f4a 100644
--- a/cmso-service/src/main/docker/Dockerfile
+++ b/cmso-service/src/main/docker/Dockerfile
@@ -14,7 +14,7 @@ RUN test -n "$http_proxy" && echo "Acquire::Proxy \"http://$http_proxy\";" > /et
     apt-get update &&  \

     apt-get -y dist-upgrade &&  \

     apt-get install -y openjdk-11-jre-headless && \

-	apt-get install -y curl

+	apt-get install -y curl unzip wget netcat

 

 RUN groupadd onap \

     && useradd -m -g onap onap

diff --git a/cmso-sonar/docker/integration/cmso-optimizer/etc/startJacocoService.sh b/cmso-sonar/docker/integration/cmso-optimizer/etc/startJacocoService.sh
index b4be6b1..bd484c3 100755
--- a/cmso-sonar/docker/integration/cmso-optimizer/etc/startJacocoService.sh
+++ b/cmso-sonar/docker/integration/cmso-optimizer/etc/startJacocoService.sh
@@ -2,9 +2,9 @@
 apt update
 apt install wget
 apt install unzip  --assume-yes
-wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.2/org.jacoco.agent-0.8.2.jar
-unzip org.jacoco.agent-0.8.2.jar
-cp org.jacoco.agent-0.8.2/jacocoagent.jar .
+wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.5/org.jacoco.agent-0.8.5.jar
+unzip org.jacoco.agent-0.8.5.jar
+cp org.jacoco.agent-0.8.5/jacocoagent.jar .
 ls -l
 
 VM_ARGS="${VM_ARGS} -javaagent:./jacocoagent.jar=destfile=/share/logs/optimizer.jacoco.exec,dumponexit=true,jmx=true,append=true,output=file,includes=org.onap.*"
diff --git a/cmso-sonar/docker/integration/cmso-service/etc/startJacocoService.sh b/cmso-sonar/docker/integration/cmso-service/etc/startJacocoService.sh
index f049e5c..6bd100f 100755
--- a/cmso-sonar/docker/integration/cmso-service/etc/startJacocoService.sh
+++ b/cmso-sonar/docker/integration/cmso-service/etc/startJacocoService.sh
@@ -2,9 +2,9 @@
 apt update
 apt install wget
 apt install unzip  --assume-yes
-wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.2/org.jacoco.agent-0.8.2.jar
-unzip org.jacoco.agent-0.8.2.jar
-cp org.jacoco.agent-0.8.2/jacocoagent.jar .
+wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.5/org.jacoco.agent-0.8.5.jar
+unzip org.jacoco.agent-0.8.5.jar
+cp org.jacoco.agent-0.8.5/jacocoagent.jar .
 ls -l
 
 VM_ARGS="${VM_ARGS} -javaagent:./jacocoagent.jar=destfile=/share/logs/service.jacoco.exec,dumponexit=true,jmx=true,append=true,output=file,includes=org.onap.*"
diff --git a/cmso-sonar/docker/integration/cmso-ticketmgt/etc/startJacocoService.sh b/cmso-sonar/docker/integration/cmso-ticketmgt/etc/startJacocoService.sh
index 1331bcf..a7de3ec 100755
--- a/cmso-sonar/docker/integration/cmso-ticketmgt/etc/startJacocoService.sh
+++ b/cmso-sonar/docker/integration/cmso-ticketmgt/etc/startJacocoService.sh
@@ -2,9 +2,9 @@
 apt update
 apt install wget
 apt install unzip  --assume-yes
-wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.2/org.jacoco.agent-0.8.2.jar
-unzip org.jacoco.agent-0.8.2.jar
-cp org.jacoco.agent-0.8.2/jacocoagent.jar .
+wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.5/org.jacoco.agent-0.8.5.jar
+unzip org.jacoco.agent-0.8.5.jar
+cp org.jacoco.agent-0.8.5/jacocoagent.jar .
 ls -l
 
 VM_ARGS="${VM_ARGS} -javaagent:./jacocoagent.jar=destfile=/share/logs/ticketmgt.jacoco.exec,dumponexit=true,jmx=true,append=true,output=file,includes=org.onap.*"
diff --git a/cmso-sonar/docker/integration/cmso-topology/etc/startJacocoService.sh b/cmso-sonar/docker/integration/cmso-topology/etc/startJacocoService.sh
index 8c7df11..78fac60 100755
--- a/cmso-sonar/docker/integration/cmso-topology/etc/startJacocoService.sh
+++ b/cmso-sonar/docker/integration/cmso-topology/etc/startJacocoService.sh
@@ -2,9 +2,9 @@
 apt update
 apt install wget
 apt install unzip  --assume-yes
-wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.2/org.jacoco.agent-0.8.2.jar
-unzip org.jacoco.agent-0.8.2.jar
-cp org.jacoco.agent-0.8.2/jacocoagent.jar .
+wget https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.5/org.jacoco.agent-0.8.5.jar
+unzip org.jacoco.agent-0.8.5.jar
+cp org.jacoco.agent-0.8.5/jacocoagent.jar .
 ls -l
 
 VM_ARGS="${VM_ARGS} -javaagent:./jacocoagent.jar=destfile=/share/logs/topology.jacoco.exec,dumponexit=true,jmx=true,append=true,output=file,includes=org.onap.*"
diff --git a/cmso-sonar/pom.xml b/cmso-sonar/pom.xml
index 7bcd0a9..beb0655 100644
--- a/cmso-sonar/pom.xml
+++ b/cmso-sonar/pom.xml
@@ -102,7 +102,7 @@
 				<artifactId>jacoco-maven-plugin</artifactId>

 				<executions>

 					<execution>

-						<id>post-integration-test1</id>

+						<id>post-integration-test</id>

 						<phase>post-integration-test</phase>

 						<goals>

 							<goal>report</goal>

@@ -110,7 +110,7 @@
 						<configuration>

 							<skip>${skipIntegrationTests}</skip>

 							<dataFile>${project.basedir}/target/code-coverage/service.jacoco.exec</dataFile>

-							<outputDirectory>${project.basedir}/target/site/service-it</outputDirectory>

+							<outputDirectory>${project.basedir}/../cmso-service/target/site/service-it</outputDirectory>

 							<includes>

 								<include>service/**</include>

 							</includes>

@@ -123,7 +123,7 @@
 						</configuration>

 					</execution>

 					<execution>

-						<id>post-integration-test2</id>

+						<id>post-integration-optimizer</id>

 						<phase>post-integration-test</phase>

 						<goals>

 							<goal>report</goal>

@@ -131,7 +131,7 @@
 						<configuration>

 							<skip>${skipIntegrationTests}</skip>

 							<dataFile>${project.basedir}/target/code-coverage/optimizer.jacoco.exec</dataFile>

-							<outputDirectory>${project.basedir}/target/site/optimizer-it</outputDirectory>

+							<outputDirectory>${project.basedir}/../cmso-optimizer/target/site/optimizer-it</outputDirectory>

 							<includes>

 								<include>optimizer/**</include>

 							</includes>

@@ -143,6 +143,48 @@
 							</excludes>

 						</configuration>

 					</execution>

+					<execution>

+						<id>post-integration-topology</id>

+						<phase>post-integration-test</phase>

+						<goals>

+							<goal>report</goal>

+						</goals>

+						<configuration>

+							<skip>${skipIntegrationTests}</skip>

+							<dataFile>${project.basedir}/target/code-coverage/topology.jacoco.exec</dataFile>

+							<outputDirectory>${project.basedir}/../cmso-topology/target/site/topology-it</outputDirectory>

+							<includes>

+								<include>topology/**</include>

+							</includes>

+							<excludes>

+								<exclude>**/gen/**</exclude>

+								<exclude>**/generated-sources/**</exclude>

+								<exclude>**/yang-gen/**</exclude>

+								<exclude>**/pax/**</exclude>

+							</excludes>

+						</configuration>

+					</execution>

+					<execution>

+						<id>post-integration-ticketmgt</id>

+						<phase>post-integration-test</phase>

+						<goals>

+							<goal>report</goal>

+						</goals>

+						<configuration>

+							<skip>${skipIntegrationTests}</skip>

+							<dataFile>${project.basedir}/target/code-coverage/ticketmgt.jacoco.exec</dataFile>

+							<outputDirectory>${project.basedir}/../cmso-ticketmgt/target/site/ticketmgt-it</outputDirectory>

+							<includes>

+								<include>ticketmgt/**</include>

+							</includes>

+							<excludes>

+								<exclude>**/gen/**</exclude>

+								<exclude>**/generated-sources/**</exclude>

+								<exclude>**/yang-gen/**</exclude>

+								<exclude>**/pax/**</exclude>

+							</excludes>

+						</configuration>

+					</execution>

 				</executions>

 			</plugin>

 		</plugins>

diff --git a/cmso-sonar/src/test/resources/integration.properties b/cmso-sonar/src/test/resources/integration.properties
index 4e0e21b..f3052c3 100644
--- a/cmso-sonar/src/test/resources/integration.properties
+++ b/cmso-sonar/src/test/resources/integration.properties
@@ -1,7 +1,7 @@
 base.path=./
 jacoco.exec.dest=target/code-coverage
 jacoco.exec.classes=target/classes
-source.classes.folders=service|../cmso-service/target/classes,optimizer|../cmso-optimizer/target/classes
-jacoco.exec.source.files=docker/integration/cmso-service/logs/service.jacoco.exec,docker/integration/cmso-optimizer/logs/optimizer.jacoco.exec
+source.classes.folders=service|../cmso-service/target/classes,optimizer|../cmso-optimizer/target/classes,topology|../cmso-topology/target/classes,ticketmgt|../cmso-ticketmgt/target/classes
+jacoco.exec.source.files=docker/integration/cmso-service/logs/service.jacoco.exec,docker/integration/cmso-optimizer/logs/optimizer.jacoco.exec,docker/integration/cmso-topology/logs/topology.jacoco.exec,docker/integration/cmso-ticketmgt/logs/ticketmgt.jacoco.exec
 
 copy.jacoco.for.sonar=docker/integration/cmso-service/logs/service.jacoco.exec|../cmso-service/target/jacoco-it.exec,docker/integration/cmso-optimizer/logs/optimizer.jacoco.exec|../cmso-optimizer/target/jacoco-it.exec,docker/integration/cmso-topology/logs/topology.jacoco.exec|../cmso-topology/target/jacoco-it.exec,docker/integration/cmso-ticketmgt/logs/ticketmgt.jacoco.exec|../cmso-ticketmgt/target/jacoco-it.exec
\ No newline at end of file
diff --git a/cmso-ticketmgt/pom.xml b/cmso-ticketmgt/pom.xml
index 0eb1ebd..1569d92 100644
--- a/cmso-ticketmgt/pom.xml
+++ b/cmso-ticketmgt/pom.xml
@@ -47,8 +47,6 @@
 		<jacoco.itPath>${basedir}/target/jacoco_itReport</jacoco.itPath>
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-		<sonar.jacoco.reportPath>${basedir}/target/jacoco-ut.exec</sonar.jacoco.reportPath>
-		<sonar.jacoco.itReportPath>${basedir}/target/jacoco-it.exec</sonar.jacoco.itReportPath>
 		<sonar.surefire.reportsPath>${basedir}/target/surefire-reports</sonar.surefire.reportsPath>
 		<sonar.failsafe.reportsPath>${basedir}/target/failsafe-reports</sonar.failsafe.reportsPath>
 
@@ -56,6 +54,7 @@
 		<docker.skip.push>false</docker.skip.push>
 		<docker.skip.tag>false</docker.skip.tag>
 		<skip.staging.artifacts>false</skip.staging.artifacts>
+		<sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/ticketmgt-it/jacoco.xml,${project.build.directory}/site/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
 
 	</properties>
 
diff --git a/cmso-ticketmgt/src/main/docker/Dockerfile b/cmso-ticketmgt/src/main/docker/Dockerfile
index b846a9c..5b47773 100644
--- a/cmso-ticketmgt/src/main/docker/Dockerfile
+++ b/cmso-ticketmgt/src/main/docker/Dockerfile
@@ -15,7 +15,7 @@ RUN test -n "$http_proxy" && echo "Acquire::Proxy \"http://$http_proxy\";" > /et
     apt-get update &&  \
     apt-get -y dist-upgrade &&  \
     apt-get install -y openjdk-11-jre-headless && \
-	apt-get install -y curl
+	apt-get install -y curl unzip wget netcat
 
 RUN groupadd onap \
     && useradd -m -g onap onap
diff --git a/cmso-topology/pom.xml b/cmso-topology/pom.xml
index 6ffc597..ba39fa3 100644
--- a/cmso-topology/pom.xml
+++ b/cmso-topology/pom.xml
@@ -47,8 +47,6 @@
 		<jacoco.itPath>${basedir}/target/jacoco_itReport</jacoco.itPath>
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-		<sonar.jacoco.reportPath>${basedir}/target/jacoco-ut.exec</sonar.jacoco.reportPath>
-		<sonar.jacoco.itReportPath>${basedir}/target/jacoco-it.exec</sonar.jacoco.itReportPath>
 		<sonar.surefire.reportsPath>${basedir}/target/surefire-reports</sonar.surefire.reportsPath>
 		<sonar.failsafe.reportsPath>${basedir}/target/failsafe-reports</sonar.failsafe.reportsPath>
 
@@ -56,6 +54,9 @@
 		<docker.skip.push>false</docker.skip.push>
 		<docker.skip.tag>false</docker.skip.tag>
 		<skip.staging.artifacts>false</skip.staging.artifacts>
+		<sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/topology-it/jacoco.xml,${project.build.directory}/site/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+
+		
 
 	</properties>
 
diff --git a/cmso-topology/src/main/docker/Dockerfile b/cmso-topology/src/main/docker/Dockerfile
index 015a794..f0ffc94 100644
--- a/cmso-topology/src/main/docker/Dockerfile
+++ b/cmso-topology/src/main/docker/Dockerfile
@@ -15,7 +15,7 @@ RUN test -n "$http_proxy" && echo "Acquire::Proxy \"http://$http_proxy\";" > /et
     apt-get update &&  \
     apt-get -y dist-upgrade &&  \
     apt-get install -y openjdk-11-jre-headless && \
-	apt-get install -y curl
+	apt-get install -y curl unzip wget netcat
 
 RUN groupadd onap \
     && useradd -m -g onap onap
diff --git a/pom.xml b/pom.xml
index fdb5b08..0a723ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,8 +62,9 @@
 		<java.version>11</java.version>
 		<maven.compiler.target>11</maven.compiler.target>
 		<maven.compiler.source>11</maven.compiler.source>
-        <spring.version>5.1.5.RELEASE</spring.version>
-		<spring.boot.version>2.1.6.RELEASE</spring.boot.version>
+        <spring.version>5.2.4.RELEASE</spring.version>
+		<spring.boot.version>2.2.5.RELEASE</spring.boot.version>
+		<quartz.version>2.3.2</quartz.version>
 		<release-tag>Dublin</release-tag>
 		<name.space>org.onap.optf</name.space>
 		<image.namespace>onap</image.namespace>
@@ -76,6 +77,8 @@
 		<docker.https_proxy></docker.https_proxy>
 		<docker.maven.plugin.version>0.30.0</docker.maven.plugin.version>
 		<checkstyle.skip>true</checkstyle.skip>
+		
+				
 	</properties>
 	
     <scm>