From f94ea25a8a70681b6de2bbd21a0632ce4b60328e Mon Sep 17 00:00:00 2001
From: jimmy <jf2512@att.com>
Date: Tue, 18 Feb 2020 12:13:04 -0500
Subject: [PATCH] Fix sonar settings

Issue-ID: AAI-2793
Change-Id: Ie2756804e6a15e42d46d42b01ab86d31425f53fe
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
---
 pom.xml            | 99 ++++--------------------------------------------------
 version.properties |  2 +-
 2 files changed, 7 insertions(+), 94 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9d63ed5..7aa8701 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,72 +22,24 @@ limitations under the License.
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.onap.oparent</groupId>
-      <artifactId>oparent</artifactId>
-      <version>2.0.0</version>
+      <groupId>org.onap.aai.aai-common</groupId>
+      <artifactId>aai-parent</artifactId>
+      <version>1.6.6-SNAPSHOT</version>
    </parent>
 
    <groupId>org.onap.aai.router-core</groupId>
    <artifactId>router-core</artifactId>
    <packaging>bundle</packaging>
-   <version>1.6.0-SNAPSHOT</version>
+   <version>1.6.4-SNAPSHOT</version>
    <name>aai-router-core</name>
    <properties>
       <checkstyle.config.location>google_checks.xml</checkstyle.config.location>
       <event.client.version>1.5.0</event.client.version>
       <!-- Sonar Properties -->
-      <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}/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-      <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
-      <sonar.projectVersion>${project.version}</sonar.projectVersion>
-      <camel-spring-boot.version>2.22.1</camel-spring-boot.version>
       <jacoco.line.coverage.limit>0.70</jacoco.line.coverage.limit>
-      <springframework.version>4.3.18.RELEASE</springframework.version>
+      <camel-spring-boot.version>2.22.1</camel-spring-boot.version>
    </properties>
 
-   <dependencyManagement>
-     <dependencies>
-       <dependency>
-         <groupId>ch.qos.logback</groupId>
-         <artifactId>logback-classic</artifactId>
-         <version>1.1.3</version>
-       </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${springframework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${springframework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${springframework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-expression</artifactId>
-            <version>${springframework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>${springframework.version}</version>
-        </dependency>
-         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${springframework.version}</version>
-            <scope>test</scope>
-        </dependency>
-     </dependencies>
-   </dependencyManagement>
-
    <dependencies>
       <dependency>
          <groupId>org.apache.camel</groupId>
@@ -132,13 +84,12 @@ limitations under the License.
       <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.5</version>
       </dependency>
 
       <dependency>
          <groupId>org.onap.aai.schema-service</groupId>
          <artifactId>aai-schema</artifactId>
-         <version>1.6.0</version>
+         <version>1.6.3</version>
       </dependency>
       <dependency>
          <groupId>org.onap.aai.aai-common</groupId>
@@ -157,7 +108,6 @@ limitations under the License.
       <dependency>
          <groupId>org.eclipse.jetty</groupId>
          <artifactId>jetty-security</artifactId>
-         <version>9.3.24.v20180605</version>
       </dependency>
       <!-- ECOMP REST Client Library. -->
       <dependency>
@@ -176,18 +126,15 @@ limitations under the License.
     <dependency>
        <groupId>org.mockito</groupId>
        <artifactId>mockito-all</artifactId>
-       <version>1.10.19</version>
        <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>4.3.18.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>4.3.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
    </dependencies>
@@ -263,40 +210,6 @@ limitations under the License.
             <artifactId>sonar-maven-plugin</artifactId>
             <version>3.2</version>
          </plugin>
-         <plugin>
-            <groupId>org.jacoco</groupId>
-            <artifactId>jacoco-maven-plugin</artifactId>
-            <version>0.7.7.201606060606</version>
-            <configuration>
-               <dumpOnExit>true</dumpOnExit>
-            </configuration>
-            <executions>
-                          
-               <execution>
-                    <id>default-check</id>
-                    <goals>
-                        <goal>check</goal>
-                    </goals>
-                    <configuration>
-                       <dataFile>${sonar.jacoco.reportPath}</dataFile>
-                        <rules>
-                            <!--  implementation is needed only for Maven 2  -->
-                           <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>
       </plugins>
    </build>
 
diff --git a/version.properties b/version.properties
index a0756ad..fe64195 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=1
 minor=6
-patch=0
+patch=4
 
 base_version=${major}.${minor}.${patch}
 
-- 
2.16.6