Merge "Copy oparent sonar setup"

11 files changed, 162 insertions, 75 deletions

diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml
index 932454cc..b2fc5c46 100644
--- a/aai-annotations/pom.xml
+++ b/aai-annotations/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.6.4-SNAPSHOT</version>
+        <version>1.6.5-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-annotations</artifactId>
diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml
index 223e1b53..ac1f0623 100644
--- a/aai-auth/pom.xml
+++ b/aai-auth/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.6.4-SNAPSHOT</version>
+        <version>1.6.5-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-auth</artifactId>
diff --git a/aai-common-docker/pom.xml b/aai-common-docker/pom.xml
index c7055968..61f8f0e1 100644
--- a/aai-common-docker/pom.xml
+++ b/aai-common-docker/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.6.4-SNAPSHOT</version>
+        <version>1.6.5-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index e5ba7329..7ac32cf3 100644
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.onap.aai.aai-common</groupId>
 		<artifactId>aai-parent</artifactId>
-		<version>1.6.4-SNAPSHOT</version>
+		<version>1.6.5-SNAPSHOT</version>
 		<relativePath>../aai-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>aai-core</artifactId>
@@ -36,17 +36,13 @@
 	<packaging>jar</packaging>
 	<properties>
 		<springframework.version>4.3.24.RELEASE</springframework.version>
-		<sonar.language>java</sonar.language>
-		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
-		<sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/coverage-reports/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
-		<sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
-		<sonar.projectVersion>${project.version}</sonar.projectVersion>
+
 		<httpclient.version>4.5.5</httpclient.version>
 		<jackson.version>2.2.3</jackson.version>
 		<eelf.core.version>1.0.1-oss</eelf.core.version>
 		<logback.version>1.2.3</logback.version>
 		<freemarker.version>2.3.21</freemarker.version>
+
 		<jacoco.line.coverage.limit>0.50</jacoco.line.coverage.limit>
 		<gremlin.version>3.2.2</gremlin.version>
 		<groovy.version>2.4.15</groovy.version>
@@ -114,67 +110,54 @@
 			<plugin>
 			  <groupId>org.sonarsource.scanner.maven</groupId>
 			  <artifactId>sonar-maven-plugin</artifactId>
-			  <version>3.6.1.1688</version>
 			</plugin>
 			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.5</version>
-				<configuration>
-					<dumpOnExit>true</dumpOnExit>
-				</configuration>
-				<executions>
-					<execution>
-						<id>jacoco-initialize-unit-tests</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-						<configuration>
-							<destFile>${project.build.directory}/coverage-reports/jacoco.xml</destFile>
-							<!-- <append>true</append> -->
-						</configuration>
-					</execution>
-					<execution>
-						<id>post-unit-test</id>
-						<phase>test</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-						<configuration>
-							<!-- Sets the path to the file which contains the execution data. -->
-							<dataFile>${project.build.directory}/coverage-reports/jacoco.xml</dataFile>
-							<!-- Sets the output directory for the code coverage report. -->
-							<outputDirectory>${project.reporting.outputDirectory}/jacoco</outputDirectory>
-						</configuration>
-					</execution>
-					<execution>
-						<id>default-check</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<configuration>
-							<dataFile>${project.build.directory}/coverage-reports/jacoco.xml</dataFile>
-							<rules>
-								<rule implementation="org.jacoco.maven.RuleConfiguration">
-									<element>BUNDLE</element>
-									<limits>
-										<limit implementation="org.jacoco.report.check.Limit">
-											<counter>LINE</counter>
-											<value>COVEREDRATIO</value>
-											<minimum>${jacoco.line.coverage.limit}</minimum>
-										</limit>
-									</limits>
-								</rule>
-							</rules>
-						</configuration>
-					</execution>
-				</executions>
+			  <groupId>org.jacoco</groupId>
+			  <artifactId>jacoco-maven-plugin</artifactId>
+			  <configuration>
+			    <dumpOnExit>true</dumpOnExit>
+			  </configuration>
+			  <executions>
+			    <execution>
+			      <id>default-prepare-agent</id>
+			      <goals>
+				<goal>prepare-agent</goal>
+			      </goals>
+			    </execution>
+			    <execution>
+			      <id>default-report</id>
+			      <goals>
+				<goal>report</goal>
+			      </goals>
+			    </execution>
+			    <execution>
+			      <id>default-check</id>
+			      <goals>
+				<goal>check</goal>
+			      </goals>
+			      <configuration>
+				<dataFile>${project.build.directory}/coverage-reports/jacoco.xml</dataFile>
+				<rules>
+				  <rule implementation="org.jacoco.maven.RuleConfiguration">
+				    <element>BUNDLE</element>
+				    <limits>
+				      <limit implementation="org.jacoco.report.check.Limit">
+					<counter>LINE</counter>
+					<value>COVEREDRATIO</value>
+					<minimum>${jacoco.line.coverage.limit}</minimum>
+				      </limit>
+				    </limits>
+				  </rule>
+				</rules>
+			      </configuration>
+			    </execution>
+			  </executions>
 			</plugin>
 			<plugin>
-				<!-- explicitly define maven-deploy-plugin after other to force exec 
-					order -->
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
+			  <!-- explicitly define maven-deploy-plugin after other to force exec 
+			       order -->
+			  <groupId>org.apache.maven.plugins</groupId>
+			  <artifactId>maven-deploy-plugin</artifactId>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml
index ef0538c7..490a385d 100644
--- a/aai-parent/pom.xml
+++ b/aai-parent/pom.xml
@@ -27,7 +27,7 @@
 	<parent>
 		<groupId>org.onap.aai.aai-common</groupId>
 		<artifactId>aai-common</artifactId>
-		<version>1.6.4-SNAPSHOT</version>
+		<version>1.6.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>aai-parent</artifactId>
 	<name>aai-parent</name>
@@ -97,6 +97,14 @@
 		<reflections.version>0.9.10</reflections.version>
 		<snakeyaml.version>1.25</snakeyaml.version>
 		<spring.boot.version>1.5.22.RELEASE</spring.boot.version>
+		<jacoco.version>0.8.5</jacoco.version>
+		<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+		<sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+		<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+		
+		<sonar.scanner.version>3.7.0.1746</sonar.scanner.version>
+		
 		<spring.web.version>4.3.25.RELEASE</spring.web.version>
 		<spring.jms.version>4.3.25.RELEASE</spring.jms.version>
 		<spring.test.version>4.3.25.RELEASE</spring.test.version>
@@ -642,8 +650,104 @@
 					<artifactId>docker-maven-plugin</artifactId>
 					<version>${docker.fabric.version}</version>
 				</plugin>
-			</plugins>
+				
+				<plugin>
+				  <groupId>org.sonarsource.scanner.maven</groupId>
+				  <artifactId>sonar-maven-plugin</artifactId>
+				  <version>${sonar.scanner.version}</version>
+				</plugin>
 
+				<plugin>
+				  <groupId>org.jacoco</groupId>
+				  <artifactId>jacoco-maven-plugin</artifactId>
+				  <version>${jacoco.version}</version>
+				  <configuration>
+				    <!-- Note: This exclusion list should match <sonar.exclusions>
+					 property above -->
+				    <excludes>
+				      <exclude>**/gen/**</exclude>
+				      <exclude>**/generated-sources/**</exclude>
+				      <exclude>**/yang-gen/**</exclude>
+				      <exclude>**/pax/**</exclude>
+				    </excludes>
+				  </configuration>
+				  <executions>
+				    <!--
+					Prepares the property pointing to the JaCoCo runtime agent which
+					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>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+					<!--
+					    Sets the name of the property containing the settings
+					    for JaCoCo runtime agent.
+					-->
+					<propertyName>surefireArgLine</propertyName>
+				      </configuration>
+				    </execution>
+				    <!--
+					Ensures that the code coverage report for unit tests is created after
+					unit tests have been run.
+				    -->
+				    <execution>
+				      <id>post-unit-test</id>
+				      <phase>test</phase>
+				      <goals>
+					<goal>report</goal>
+				      </goals>
+				      <configuration>
+					<!-- Sets the path to the file which contains the execution data
+					     . -->
+					<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+					<!-- Sets the output directory for the code coverage report. -->
+					<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+				      </configuration>
+				    </execution>
+				    <execution>
+				      <id>pre-integration-test</id>
+				      <phase>pre-integration-test</phase>
+				      <goals>
+					<goal>prepare-agent</goal>
+				      </goals>
+				      <configuration>
+					<!-- Sets the path to the file which contains the execution data
+					     . -->
+					<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+					<!--
+					    Sets the name of the property containing the settings
+					    for JaCoCo runtime agent.
+					-->
+					<propertyName>failsafeArgLine</propertyName>
+				      </configuration>
+				    </execution>
+				    <!--
+					Ensures that the code coverage report for integration tests after
+					integration tests have been run.
+				    -->
+				    <execution>
+				      <id>post-integration-test</id>
+				      <phase>post-integration-test</phase>
+				      <goals>
+					<goal>report</goal>
+				      </goals>
+				      <configuration>
+					<!-- Sets the path to the file which contains the execution data
+					     . -->
+					<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+					<!-- Sets the output directory for the code coverage report. -->
+					<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+				      </configuration>
+				    </execution>
+			    </executions>
+			  </plugin>
+			</plugins>
 		</pluginManagement>
 	</build>
 
diff --git a/aai-rest/pom.xml b/aai-rest/pom.xml
index c271ccc0..d2716c0b 100644
--- a/aai-rest/pom.xml
+++ b/aai-rest/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.6.4-SNAPSHOT</version>
+        <version>1.6.5-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-rest</artifactId>
diff --git a/aai-schema-abstraction/pom.xml b/aai-schema-abstraction/pom.xml
index fb212640..581a36b6 100644
--- a/aai-schema-abstraction/pom.xml
+++ b/aai-schema-abstraction/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-parent</artifactId>
-    <version>1.6.4-SNAPSHOT</version>
+    <version>1.6.5-SNAPSHOT</version>
     <relativePath>../aai-parent/pom.xml</relativePath>
   </parent>
   
diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml
index c684d9dd..d5e20ea6 100644
--- a/aai-schema-ingest/pom.xml
+++ b/aai-schema-ingest/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.onap.aai.aai-common</groupId>
 		<artifactId>aai-parent</artifactId>
-		<version>1.6.4-SNAPSHOT</version>
+		<version>1.6.5-SNAPSHOT</version>
 		<relativePath>../aai-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>aai-schema-ingest</artifactId>
diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml
index 8c7eba9f..1930e98c 100644
--- a/aai-utils/pom.xml
+++ b/aai-utils/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.6.4-SNAPSHOT</version>
+        <version>1.6.5-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index f5e9a7df..9253a49d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-common</artifactId>
-    <version>1.6.4-SNAPSHOT</version>
+    <version>1.6.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>aai-aai-common</name>
     <description>Contains all of the common code for resources and traversal repos</description>
diff --git a/version.properties b/version.properties
index fc0709cd..716f7d49 100644
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major_version=1
 minor_version=6
-patch_version=4
+patch_version=5
 
 base_version=${major_version}.${minor_version}.${patch_version}