Update sonar and surefire cfg

Issue-ID: AAI-2793
Signed-off-by: Jimmy  Forsyth <jf2512@att.com>
Change-Id: I6b42b5712bfbae72776e021d3a4f18c0b8b2a69e

1 files changed, 30 insertions, 80 deletions

diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index 7ac32cf3..886c728b 100644
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    ============LICENSE_START=======================================================
-    org.onap.aai
-    ================================================================================
-    Copyright © 2017-2018 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.
-    You may obtain a copy of the License at
+============LICENSE_START======================================================
+org.onap.aai
+===============================================================================
+Copyright © 2019 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.
+You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+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.
-    ============LICENSE_END=========================================================
+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.
+===========LICENSE_END=========================================================
 
 -->
 <project
@@ -37,17 +37,14 @@
 	<properties>
 		<springframework.version>4.3.24.RELEASE</springframework.version>
 
-		<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>
+		<!-- <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>
-		<jetty.version>9.4.11.v20180605</jetty.version>
-
+		<groovy.version>2.4.15</groovy.version> 
+		<!--	<jetty.version>9.4.11.v20180605</jetty.version> -->
 		<!-- Start of Default ONAP Schema Properties -->
 		<aai.wiki.link>https://wiki.onap.org/</aai.wiki.link>
 		<gendoc.version>v15</gendoc.version>
@@ -61,8 +58,8 @@
 		<schema.version.app.root.start>v11</schema.version.app.root.start>
 		<schema.version.namespace.change.start>v12</schema.version.namespace.change.start>
 		<schema.version.edge.label.start>v12</schema.version.edge.label.start>
-		<schema.version.api.default>v15</schema.version.api.default>
-		<schema.version.list>v10,v11,v12,v13,v14,v15</schema.version.list>
+		<schema.version.api.default>v19</schema.version.api.default>
+		<schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19</schema.version.list>
 		<schema.translator.list>config</schema.translator.list>
 		<!-- End of Default ONAP Schema Properties -->
 	</properties>
@@ -81,8 +78,8 @@
 				<schema.version.app.root.start>v11</schema.version.app.root.start>
 				<schema.version.edge.label.start>v12</schema.version.edge.label.start>
 				<schema.version.namespace.change.start>v12</schema.version.namespace.change.start>
-				<schema.version.api.default>v15</schema.version.api.default>
-				<schema.version.list>v10,v11,v12,v13,v14,v15</schema.version.list>
+				<schema.version.api.default>v19</schema.version.api.default>
+				<schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19</schema.version.list>
 				<gendoc.version>v15</gendoc.version>
 			</properties>
 		</profile>
@@ -93,9 +90,8 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.12.4</version>
 				<configuration>
-					<argLine>-noverify ${argLine}</argLine>
+					<argLine>${argLine}</argLine>
 					<systemPropertyVariables>
 						<AJSC_HOME>.</AJSC_HOME>
 						<BUNDLECONFIG_DIR>bundleconfig-local</BUNDLECONFIG_DIR>
@@ -108,56 +104,10 @@
 				<version>2.8</version>
 			</plugin>
 			<plugin>
-			  <groupId>org.sonarsource.scanner.maven</groupId>
-			  <artifactId>sonar-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-			  <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>