From d7175fbbaa1b750b3d025770631d96edd3531b5f Mon Sep 17 00:00:00 2001
From: "Balaji, Ramya (rb111y)" <rb111y@att.com>
Date: Thu, 3 Jan 2019 16:15:00 -0500
Subject: Dependency changes to overcome linkage error

Issue-ID: APPC-1289
Change-Id: I7a424430bc3510c87b087913fad8992378e27a1b
Signed-off-by: Balaji, Ramya (rb111y) <rb111y@att.com>
---
 .../appc-dmaap-adapter-bundle/pom.xml              | 23 +++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

(limited to 'appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml')

diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml
index 6df3940ed..171d099db 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml
@@ -49,6 +49,22 @@
 			<version>${project.version}</version>
 		</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>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -108,7 +124,7 @@
 			<artifactId>powermock-module-junit4</artifactId>
 			<scope>test</scope>
 		</dependency>
-        <dependency>
+        <!-- <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
@@ -116,7 +132,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            </dependency>
+            </dependency>-->
 		<dependency>
 			<groupId>org.onap.ccsdk.sli.core</groupId>
 			<artifactId>sli-common</artifactId>
@@ -179,7 +195,8 @@
 						<Bundle-Activator>org.onap.appc.adapter.messaging.dmaap.AppcDmaapAdapterActivator</Bundle-Activator>
 						<Export-Package>org.onap.appc.adapter.messaging.*</Export-Package>
 						<Import-Package>com.att.eelf.configuration,*;resolution:=optional</Import-Package>
-						<Embed-Dependency>dmaapClient,eelf-core</Embed-Dependency>
+						<!-- <Embed-Dependency>dmaapClient,eelf-core</Embed-Dependency>-->
+                        <Embed-Dependency>logback-classic, logback-core,dmaapClient;scope=compile|runtime;artifactId=!org.eclipse.osgi|slf4j-api|slf4j-simple|jcl-over-slf4j|</Embed-Dependency>						
 						<Embed-Transitive>true</Embed-Transitive>
 						<Bundle-Blueprint>OSGI-INF/blueprint/blueprint.xml</Bundle-Blueprint>
 					</instructions>
-- 
cgit 1.2.3-korg