From: Patrick Brady <patrick.brady@att.com>
Date: Wed, 24 Oct 2018 22:53:36 +0000 (-0700)
Subject: Fix jersey and javax dependencies
X-Git-Tag: 1.4.1~10
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9e0ae459688defe45071b8a48f46120402609bb3;p=appc.git

Fix jersey and javax dependencies

Change-Id: Ib2865fea0bd4c0ed73d8db0b9326bbc3d19c12c6
Signed-off-by: Patrick Brady <patrick.brady@att.com>
Issue-ID: APPC-1219
---

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml
index b67f36cf0..0dd0b6245 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml
@@ -250,10 +250,10 @@
                         <Bundle-SymbolicName>appc-iaas-adapter</Bundle-SymbolicName>
                         <Bundle-Activator>org.onap.appc.adapter.iaas.AppcProviderAdapterActivator</Bundle-Activator>
                         <Export-Package>org.onap.appc.adapter.iaas,com.att.cdp.zones.model</Export-Package>
-                        <Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,javax.net.ssl,org.xml.sax</Import-Package>
+                        <Import-Package>javax.ws.rs.*,org.glassfish.jersey.*,org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,javax.net.ssl,org.xml.sax</Import-Package>
                         <!-- <Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,javax.ws.rs.*,javax.net.*,javax.xml.*,org.xml.*</Import-Package> -->
                         <!-- <Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*,javax.xml.*</Import-Package> -->
-                        <Embed-Dependency>*;scope=compile|runtime;artifactId=!org.eclipse.osgi|slf4j-api|jcl-over-slf4j|</Embed-Dependency>
+                        <Embed-Dependency>!javax.ws.rs-api,!jersey-client,!jersey-server,!jersey-common,*;scope=compile|runtime;artifactId=!org.eclipse.osgi|slf4j-api|jcl-over-slf4j|</Embed-Dependency>
                         <!-- <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis</Embed-Dependency> -->
                         <Embed-Transitive>true</Embed-Transitive>
                     </instructions>