Dependency changes to overcome

linkage error

Issue-ID: APPC-1289
Change-Id: I7a424430bc3510c87b087913fad8992378e27a1b
Signed-off-by: Balaji, Ramya (rb111y) <rb111y@att.com>

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 6df3940..171d099 100644 (file)
--- 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>

diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml
index b06c850..7b9dd19 100644 (file)
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml
@@ -146,7 +146,7 @@
                                                <Bundle-Version>${project.version}</Bundle-Version>
                                                <Export-Package>org.onap.appc.adapter.message.*</Export-Package>
                                                <!--<Export-Serice>org.onap.appc.adapter.message.EventSender</Export-Serice>-->
-                                               <Import-Package>org.w3c.*,org.onap.appc.metricservice.*,com.att.nsa.*,org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets</Import-Package>
+                                               <Import-Package>org.w3c.*,org.onap.appc.metricservice.*,com.att.nsa.*,org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets</Import-Package>
                                                <!--<Embed-Dependency>appc-common-bundle</Embed-Dependency>-->
                                                <Embed-Dependency>*;scope=compile|runtime;artifactId=!appc-metric-bundle|sli-common|sli-provider|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|pax-*</Embed-Dependency>
                                                <Embed-Transitive>true</Embed-Transitive>

diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml
index 989dfac..c4a6aa8 100644 (file)
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml
@@ -156,7 +156,7 @@
                                                <Export-Package>org.onap.appc.adapter.factory</Export-Package>
                                                <Bundle-Activator>org.onap.appc.adapter.factory.DmaapMessageAdapterFactoryActivator</Bundle-Activator>
                                                <Export-Service>org.onap.appc.adapter.message.MessageAdapterFactory</Export-Service>
-                                               <Import-Package>org.onap.appc.adapter.messaging.*,org.onap.appc.adapter.message.*,org.onap.appc.metricservice.*,com.att.nsa.*org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets</Import-Package>
+                                               <Import-Package>org.onap.appc.adapter.messaging.*,org.onap.appc.adapter.message.*,org.onap.appc.metricservice.*,com.att.nsa.*org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets</Import-Package>
                                                <Embed-Dependency>*;scope=compile|runtime;artifactId=!appc-metric-bundle|sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|pax-*</Embed-Dependency>
                                                <Embed-Transitive>true</Embed-Transitive>
                                                <Bundle-Blueprint>OSGI-INF/blueprint/blueprint.xml</Bundle-Blueprint>

diff --git a/appc-dg/appc-dg-shared/appc-dg-common/pom.xml b/appc-dg/appc-dg-shared/appc-dg-common/pom.xml
index 34e487c..4697fd3 100644 (file)
--- a/appc-dg/appc-dg-shared/appc-dg-common/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-common/pom.xml
@@ -57,6 +57,19 @@
                                </exclusion>
                        </exclusions>
                </dependency>
+               <dependency>
+                       <groupId>org.onap.appc</groupId>
+                       <artifactId>appc-dmaap-adapter-bundle</artifactId>
+                       <version>${project.version}</version>
+                       <scope>provided</scope>
+                       <!-- TODO: WA for fixing build, clueanup dependency tree -->
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>equinoxSDK381</groupId>
+                                       <artifactId>org.eclipse.osgi</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
                <dependency>
                        <groupId>org.onap.appc</groupId>
                        <artifactId>appc-message-adapter-factory</artifactId>
@@ -213,7 +226,7 @@
                                                <Private-Package>org.onap.appc.dg.common.impl.*</Private-Package>
                                                <Import-Package>org.onap.appc.adapter.message.*,org.onap.appc.adapter.factory.*,org.onap.appc.adapter.messaging.*,
                                                        *;resolution:=optional</Import-Package>
-                                               <Embed-Dependency>appc-dmaap-adapter-bundle,appc-dg-mdsal-bundle,appc-dg-domain-model-lib,appc-dg-dependency-model,jackson-dataformat-yaml,jackson-databind,jackson-core,jackson-annotations;scope=compile|runtime;inline=false;artifactId=!org.eclipse.osgi</Embed-Dependency>
+                                               <Embed-Dependency>appc-dg-mdsal-bundle,appc-dg-domain-model-lib,appc-dg-dependency-model,jackson-dataformat-yaml,jackson-databind,jackson-core,jackson-annotations;scope=compile|runtime;inline=false;artifactId=!org.eclipse.osgi</Embed-Dependency>
 
                                                <!--Embed-Dependency>eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false</Embed-Dependency-->
                                                <Embed-Transitive>true</Embed-Transitive>