Change parent version

[appc.git] / appc-adapters / appc-iaas-adapter / appc-iaas-adapter-bundle / pom.xml

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 b91dfdc..d79c891 100644 (file)
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml
@@ -1,12 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  ONAP : APPC
+  ================================================================================
+  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");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
+       <parent>
+               <groupId>org.onap.appc.parent</groupId>
+               <artifactId>binding-parent</artifactId>
+               <version>2.5.0</version>
+                <relativePath />
+       </parent>
         <groupId>org.onap.appc</groupId>
-        <artifactId>appc-iaas-adapter</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
-    </parent>
 
     <artifactId>appc-iaas-adapter-bundle</artifactId>
     <packaging>bundle</packaging>
@@ -15,7 +37,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.appc</groupId>
-            <artifactId>appc-common</artifactId>
+            <artifactId>appc-common-bundle</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
             <exclusions>
@@ -26,16 +48,31 @@
             </exclusions>
         </dependency>
 
+
         <dependency>
             <groupId>com.att.cdp</groupId>
-            <artifactId>cdp-pal-openstack</artifactId>
+            <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>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
+            <groupId>com.att.cdp</groupId>
+            <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>
@@ -45,11 +82,6 @@
             <scope>compile</scope>
         </dependency>
 
-<dependency>
-<groupId>org.mockito</groupId>
-<artifactId>mockito-core</artifactId>
-<scope>test</scope>
-</dependency>
 
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
@@ -65,6 +97,12 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- <dependency> -->
         <!-- <groupId>javax</groupId> -->
         <!-- <artifactId>javaee-api</artifactId> -->
@@ -112,7 +150,7 @@
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.2</version>
+            <version>2.2.3</version>
             <scope>compile</scope>
         </dependency>
 
@@ -146,7 +184,7 @@
         <!-- <dependency> -->
         <!-- <groupId>org.codehaus.jackson</groupId> -->
         <!-- <artifactId>jackson-jaxrs</artifactId> -->
-        <!-- <version>1.9.12</version> -->
+        <!-- <version>1.9.13</version> -->
         <!-- </dependency> -->
 
         <!-- <dependency> -->
@@ -157,7 +195,7 @@
         <!-- <dependency> -->
         <!-- <groupId>org.apache.httpcomponents</groupId> -->
         <!-- <artifactId>httpclient</artifactId> -->
-        <!-- <version>4.5.1</version> -->
+        <!-- <version>4.5.3</version> -->
         <!-- </dependency> -->
 
         <dependency>
@@ -165,8 +203,11 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-
-
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <!-- <dependency> -->
         <!-- <groupId>equinoxSDK381</groupId> -->
@@ -215,11 +256,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>
-                        <DynamicImport-Package>javax.*</DynamicImport-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.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>*;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>
@@ -247,4 +287,5 @@
             </build>
         </profile>
     </profiles>
+    <version>1.5.0-SNAPSHOT</version>
 </project>