From 28da5021fad45b2c4da1bd1b7db794863e5ef7f3 Mon Sep 17 00:00:00 2001
From: Patrick Brady <pb071s@att.com>
Date: Mon, 17 Sep 2018 12:52:55 -0700
Subject: Remove logback 1.1.3 security issue

cdp-pal and eelf are the dependencies using logback-classic
1.1.3. Need to use exclusions option in pom file

Change-Id: Id8f5817ec955e2b7b486bc0215c35541086606aa
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-1018
---
 appc-outbound/appc-aai-client/provider/pom.xml          | 17 ++++++++++++++---
 .../appc-network-inventory-client/provider/pom.xml      | 11 +++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'appc-outbound')

diff --git a/appc-outbound/appc-aai-client/provider/pom.xml b/appc-outbound/appc-aai-client/provider/pom.xml
index 126e46136..11d42210c 100755
--- a/appc-outbound/appc-aai-client/provider/pom.xml
+++ b/appc-outbound/appc-aai-client/provider/pom.xml
@@ -60,14 +60,24 @@
 			<artifactId>commons-io</artifactId>
 			<version>2.5</version>
 		</dependency>
-        <dependency>
+                <dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
 		</dependency>
-
+                <dependency>
+                        <groupId>ch.qos.logback</groupId>
+                        <artifactId>logback-classic</artifactId>
+	                <version>${logback.version}</version>
+                </dependency>
 		<dependency>
 			<groupId>com.att.eelf</groupId>
 			<artifactId>eelf-core</artifactId>
+                        <exclusions>
+                            <exclusion>
+                                 <groupId>ch.qos.logback</groupId>
+                                 <artifactId>logback-classic</artifactId>
+                            </exclusion>
+                        </exclusions>
 		</dependency>
 
 		<dependency>
@@ -135,7 +145,8 @@
 						<Bundle-SymbolicName>org.onap.appc.aai.client</Bundle-SymbolicName>
 						<Bundle-Activator>org.onap.appc.aai.client.AppcAaiClientActivator</Bundle-Activator>
 						<Export-Package>org.onap.appc.aai.client,org.onap.appc.aai.client.*</Export-Package>
-						<Import-Package>*</Import-Package>
+						<Import-Package>groovy.lang;resolution:=optional,
+						    org.codehaus.groovy.*;resolution:=optional,*</Import-Package>
 						<DynamicImport-Package>*</DynamicImport-Package>
 						<Embed-Dependency>eelf-core,logback-core,logback-classic</Embed-Dependency>
 					</instructions>
diff --git a/appc-outbound/appc-network-inventory-client/provider/pom.xml b/appc-outbound/appc-network-inventory-client/provider/pom.xml
index e2edfbac2..b91cbe6d7 100755
--- a/appc-outbound/appc-network-inventory-client/provider/pom.xml
+++ b/appc-outbound/appc-network-inventory-client/provider/pom.xml
@@ -48,9 +48,20 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
+        <dependency>
+         <groupId>ch.qos.logback</groupId>
+         <artifactId>logback-classic</artifactId>
+	 <version>${logback.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.att.eelf</groupId>
             <artifactId>eelf-core</artifactId>
+            <exclusions>
+                 <exclusion>
+                      <groupId>ch.qos.logback</groupId>
+                      <artifactId>logback-classic</artifactId>
+                 </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.sun.jersey</groupId>
-- 
cgit 1.2.3-korg