From 1d88b1d5eba90b943756e57340c257c00e6e8e5c Mon Sep 17 00:00:00 2001
From: Sunil Unnava <su622b@att.com>
Date: Thu, 8 Mar 2018 16:37:10 -0500
Subject: [PATCH] fixes for security issues

Issue-ID: DMAAP-204
Change-Id: I878c012916e74fd8ee16a8f1a17fcd95ec4ff50d
Signed-off-by: Sunil Unnava <su622b@att.com>
---
 pom.xml | 68 ++++++++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6be8e51..55926f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -278,7 +278,7 @@
 		<testRouteOffer>workstation</testRouteOffer>
 		<testEnv>DEV</testEnv>
 		<dmaapImg>${project.version}</dmaapImg>
-		<camel.version>2.15.5</camel.version>
+		<camel.version>2.16.0</camel.version>
 		<sitePath>/content/sites/site/org/onap/dmaap/messagerouter/messageservice/${project.artifactId}/${project.version}</sitePath>
 		<skip.docker.build>true</skip.docker.build>
 		<skip.docker.push>true</skip.docker.push>
@@ -374,6 +374,10 @@
 					<artifactId>tomcat-util</artifactId>
 				</exclusion>
 
+				<exclusion>
+					<groupId>commons-beanutils</groupId>
+					<artifactId>commons-beanutils</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -394,34 +398,46 @@
 			<version>1.6.4</version>
 			<scope>test</scope>
 		</dependency>
+		<!-- <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-jaxrs</artifactId> 
+			<version>1.9.13</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> 
+			<artifactId>jackson-mapper-asl</artifactId> <version>1.9.13</version> </dependency> 
+			<dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> 
+			<version>1.9.13</version> </dependency> -->
+        
 		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-jaxrs</artifactId>
-			<version>1.9.13</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.9.13</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-core-asl</artifactId>
-			<version>1.9.13</version>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<artifactId>jackson-jaxrs-json-provider</artifactId>
+			<version>2.2.3</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
-			<version>2.4.3</version>
+			<version>2.8.11</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.3.3</version>
+			<version>2.8.11.1</version>
 		</dependency>
+		<dependency>
+		<groupId>org.grails</groupId>
+	<artifactId>grails-web</artifactId>
+	<version>2.4.4</version>
+        </dependency>
+        <dependency>
+		<groupId>org.codehaus.groovy</groupId>
+		<artifactId>groovy-all</artifactId>
+		<version>2.4.4</version>
+		<scope>compile</scope>
+		<exclusions>
+			<exclusion>
+				<artifactId>jline</artifactId>
+				<groupId>jline</groupId>
+			</exclusion>
+		</exclusions>
+	</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>
@@ -463,7 +479,7 @@
 		<dependency>
 			<groupId>com.att.ajsc</groupId>
 			<artifactId>ajsc-archetype-parent</artifactId>
-			<version>1.0.0</version>
+			<version>2.0.0</version>
 			<type>pom</type>
 		</dependency>
 
@@ -528,7 +544,19 @@
 			<groupId>org.apache.camel</groupId>
 			<artifactId>camel-servlet</artifactId>
 			<version>${camel.version}</version>
+			<!-- <exclusions>
+				<exclusion>
+					<groupId>commons-httpclient</groupId>
+					<artifactId>commons-httpclient</artifactId>
+				</exclusion>
+			</exclusions> -->
 		</dependency>
+		<!-- <dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.0</version>
+		</dependency> -->
+
 		<dependency>
 			<groupId>org.apache.camel</groupId>
 			<artifactId>camel-http4</artifactId>
@@ -583,13 +611,13 @@
 		<dependency>
 			<groupId>com.att.ajsc</groupId>
 			<artifactId>ajsc-runner</artifactId>
-			<version>1.0.0</version>
+			<version>2.0.0</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.att.ajsc</groupId>
 			<artifactId>ajsc-core</artifactId>
-			<version>1.0.0</version>
+			<version>2.0.0</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
-- 
2.16.6