From a2c2ad9eb342a0df5c28c8793a8610335a064a1f Mon Sep 17 00:00:00 2001
From: "Arul.Nambi" <arul.nambi@amdocs.com>
Date: Thu, 13 Sep 2018 11:57:01 -0400
Subject: [PATCH] Sonar fixes for camel and guava

Issue-ID: AAI-1583
Change-Id: I440646a053fa1fd9bc9f879e27636ff7a514543a
Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
---
 pom.xml                           | 8 +++++++-
 sparkybe-onap-application/pom.xml | 7 ++++---
 sparkybe-onap-service/pom.xml     | 7 ++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 45466fc..6f7dde8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,13 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
+	
+	<parent>
+        <groupId>org.onap.oparent</groupId>
+        <artifactId>oparent</artifactId>
+        <version>1.2.0</version>
+    </parent>
+    
     <groupId>org.onap.aai</groupId>
     <artifactId>sparky-be</artifactId>
     <version>1.3.0-SNAPSHOT</version>
diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml
index 983ea59..dbdeaef 100644
--- a/sparkybe-onap-application/pom.xml
+++ b/sparkybe-onap-application/pom.xml
@@ -22,7 +22,7 @@
 		<serverPort>9517</serverPort>
 		<sslport>8000</sslport>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
-		<camel-spring-boot.version>2.22.0</camel-spring-boot.version>
+		<camel-spring-boot.version>2.20.3</camel-spring-boot.version>
 		<config-home>${basedir}/</config-home>
 		<docker.location>${basedir}/target</docker.location>
 		<docker.image.name>sparky-be</docker.image.name>
@@ -190,7 +190,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>19.0</version>
+			<version>26.0-jre</version>
 		</dependency>
 
 		<dependency>
@@ -200,9 +200,10 @@
 		</dependency>
 
 		<dependency>
-			<groupId>dom4j</groupId>
+			<groupId>org.dom4j</groupId>
 			<artifactId>dom4j</artifactId>
 			<scope>provided</scope>
+			<version>2.1.1</version>
 		</dependency>
 
 		<dependency>
diff --git a/sparkybe-onap-service/pom.xml b/sparkybe-onap-service/pom.xml
index 44a1f98..51948b4 100644
--- a/sparkybe-onap-service/pom.xml
+++ b/sparkybe-onap-service/pom.xml
@@ -21,7 +21,7 @@
 		<serverPort>9517</serverPort>
 		<sslport>8000</sslport>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
-		<camel-spring-boot.version>2.22.0</camel-spring-boot.version>
+		<camel-spring-boot.version>2.20.3</camel-spring-boot.version>
 		<config-home>${basedir}/</config-home>
 		<version.aai.aai-schema-ingest>1.3.0-SNAPSHOT</version.aai.aai-schema-ingest>
 		<version.aai-schema>1.3.0-SNAPSHOT</version.aai-schema>
@@ -182,7 +182,7 @@ some of the depedencies should probably have a scope of provided so they don't a
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>19.0</version>
+			<version>26.0-jre</version>
 		</dependency>
 
 
@@ -194,9 +194,10 @@ some of the depedencies should probably have a scope of provided so they don't a
 
 
 		<dependency>
-			<groupId>dom4j</groupId>
+			<groupId>org.dom4j</groupId>
 			<artifactId>dom4j</artifactId>
 			<scope>provided</scope>
+			<version>2.1.1</version>
 		</dependency>
 
 		<dependency>
-- 
2.16.6