X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=appc-adapters%2Fappc-rest-adapter%2Fappc-rest-adapter-bundle%2Fpom.xml;h=c98a950d07eda9d6a00e2f3544344481a9bf2c2a;hb=9f69f002bc27b24e849fb2048b0ee4a8224e1708;hp=b67b3bd5cfacd103d03421358390a8e83a48ec18;hpb=261bd4b9808506773cef3014eb791ca8a94b764d;p=appc.git

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 b67b3bd5c..c98a950d0 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
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   ONAP : APPC
   ================================================================================
-  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
   Copyright (C) 2017 Amdocs
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>org.onap.appc.parent</groupId>
 		<artifactId>binding-parent</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
                 <relativePath />
 	</parent>
 
@@ -66,6 +66,12 @@
 			<artifactId>cdp-pal-common</artifactId>
 			<scope>compile</scope>
                         <version>${cdp.pal.version}</version>
+                        <exclusions>
+                            <exclusion>
+                                 <groupId>ch.qos.logback</groupId>
+                                 <artifactId>logback-classic</artifactId>
+                            </exclusion>
+                        </exclusions>
 		</dependency>
 
 		<dependency>
@@ -73,6 +79,12 @@
 			<artifactId>cdp-pal-openstack</artifactId>
 			<scope>compile</scope>
                         <version>${cdp.pal.version}</version>
+                        <exclusions>
+                            <exclusion>
+                                 <groupId>com.att.cdp</groupId>
+                                 <artifactId>cdp-pal-common</artifactId>
+                            </exclusion>
+                        </exclusions>
 		</dependency>
 
 		<dependency>
@@ -166,13 +178,19 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
-			</dependency>
+		</dependency>
 
 			<dependency>
 				<groupId>org.mariadb.jdbc</groupId>
 				<artifactId>mariadb-java-client</artifactId>
                 <version>${mariadb.client.version}</version>
-			</dependency>
+		</dependency>
+
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.core</artifactId>
+			<scope>provided</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>com.vmware</groupId>
@@ -201,11 +219,13 @@
 						<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>
 			</plugin>
 		</plugins>
 	</build>
+	<version>1.6.1</version>
 </project>