From 7678396a1df3122d80d838c958d857f03e2aefbb Mon Sep 17 00:00:00 2001
From: Tal Gitelman <tg851x@intl.att.com>
Date: Thu, 6 Sep 2018 18:16:24 +0300
Subject: [PATCH] fix security vilation SONATYPE-2015-0002

Change-Id: Ib526b8dfc3e7be9a2fc5d8ddfc3e32d2f0e4852f
Issue-ID: SDC-1717
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
---
 asdctool/pom.xml       | 10 ++++++++++
 catalog-be/pom.xml     |  4 ++++
 catalog-dao/pom.xml    |  4 ++++
 catalog-model/pom.xml  |  4 ++++
 common-app-api/pom.xml | 12 ++++++++++++
 test-apis-ci/pom.xml   | 10 ++++++++++
 6 files changed, 44 insertions(+)

diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 010edceea9..e1feb7f630 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -218,6 +218,12 @@
 			<artifactId>commons-configuration</artifactId>
 			<version>1.6</version>
 			<scope>compile</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>commons-collections</artifactId>
+					<groupId>commons-collections</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- TITAN -->
@@ -235,6 +241,10 @@
 					<groupId>org.slf4j</groupId>
 					<artifactId>slf4j-log4j12</artifactId>
 				</exclusion>
+				<exclusion>
+					<artifactId>commons-collections</artifactId>
+					<groupId>commons-collections</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index f0113df130..a375c6ae3a 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -323,6 +323,10 @@
                     <artifactId>slf4j-log4j12</artifactId>
                     <groupId>org.slf4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>commons-collections</artifactId>
+                    <groupId>commons-collections</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
 
diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml
index c15a585310..2a2e02ae81 100644
--- a/catalog-dao/pom.xml
+++ b/catalog-dao/pom.xml
@@ -252,6 +252,10 @@ Modifications copyright (c) 2018 Nokia
 					<artifactId>slf4j-log4j12</artifactId>
 					<groupId>org.slf4j</groupId>
 				</exclusion>
+				<exclusion>
+					<artifactId>commons-collections</artifactId>
+					<groupId>commons-collections</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml
index 0a6c7cc75d..ed352764de 100644
--- a/catalog-model/pom.xml
+++ b/catalog-model/pom.xml
@@ -114,6 +114,10 @@
 					<artifactId>slf4j-log4j12</artifactId>
 					<groupId>org.slf4j</groupId>
 				</exclusion>
+				<exclusion>
+					<artifactId>commons-collections</artifactId>
+					<groupId>commons-collections</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml
index 4b58258dc6..3b6731f17e 100644
--- a/common-app-api/pom.xml
+++ b/common-app-api/pom.xml
@@ -189,8 +189,20 @@
 			<groupId>commons-validator</groupId>
 			<artifactId>commons-validator</artifactId>
 			<version>1.6</version>
+			<exclusions>
+                <exclusion>
+                    <artifactId>commons-collections</artifactId>
+                    <groupId>commons-collections</groupId>
+                </exclusion>
+            </exclusions>
 		</dependency>
 
+        <dependency>
+            <artifactId>commons-collections</artifactId>
+            <groupId>commons-collections</groupId>
+            <version>3.2.2</version>
+        </dependency>
+
 		<dependency>
 			<groupId>org.codehaus.jettison</groupId>
 			<artifactId>jettison</artifactId>
diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml
index 14d6611fc0..5fd06ecf57 100644
--- a/test-apis-ci/pom.xml
+++ b/test-apis-ci/pom.xml
@@ -235,6 +235,10 @@
                     <artifactId>slf4j-log4j12</artifactId>
                     <groupId>org.slf4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>commons-collections</artifactId>
+                    <groupId>commons-collections</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -335,6 +339,12 @@
             <artifactId>mockserver-netty</artifactId>
             <version>3.10.4</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-collections</artifactId>
+                    <groupId>commons-collections</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
-- 
2.16.6