diff options
4 files changed, 6 insertions, 55 deletions
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml index c8990106e..13bdef93f 100644 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml @@ -101,7 +101,7 @@ <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-common</artifactId> - <version>2.9.1</version> + <version>2.27</version> </dependency> <dependency> 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 99b6ffbdc..9435be6c7 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>javax.naming,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>javax.naming,javax.ws.rs.*,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>!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>!javax.ws.rs-api,*;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> diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml index 317823d54..f513c96be 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml @@ -213,7 +213,8 @@ <Bundle-SymbolicName>appc-rest-adapter</Bundle-SymbolicName> <Bundle-Activator>org.onap.appc.adapter.rest.RestActivator</Bundle-Activator> <Export-Package>org.onap.appc.adapter.rest</Export-Package> - <Import-Package>*</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.*</Import-Package> + <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|jaxp-api</Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> </instructions> </configuration> diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml index 3b4647cae..8210316f6 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml @@ -61,56 +61,6 @@ limitations under the License. <artifactId>appc-rest-adapter-bundle</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.glassfish.jersey.bundles.repackaged</groupId> - <artifactId>jersey-guava</artifactId> - <version>2.25.1</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>2.8.6</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>2.8.6</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <version>2.8.6</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-base</artifactId> - <version>2.8.6</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>2.8.6</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-server</artifactId> - <version>2.25.1</version> - </dependency> - <dependency> - <groupId>com.ning</groupId> - <artifactId>async-http-client</artifactId> - <version>1.9.39</version> - </dependency> - <dependency> - <groupId>org.glassfish.grizzly</groupId> - <artifactId>grizzly-http-servlet</artifactId> - <version>2.3.28</version> - </dependency> - <dependency> - <groupId>org.glassfish.grizzly</groupId> - <artifactId>grizzly-http</artifactId> - <version>2.3.28</version> - </dependency> </dependencies> @@ -121,7 +71,7 @@ limitations under the License. <artifactId>karaf-maven-plugin</artifactId> <extensions>true</extensions> <configuration> - <includeTransitiveDependency>true</includeTransitiveDependency> + <includeTransitiveDependency>false</includeTransitiveDependency> <excludedArtifactIds> <excludedArtifactId>slf4j-api</excludedArtifactId> <excludedArtifactId>tomcat-jdbc</excludedArtifactId> |