X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=appc-adapters%2Fappc-netconf-adapter%2Fappc-netconf-adapter-bundle%2Fpom.xml;h=90e0cab6443200ce5f27eeb48152f68e94c2d3ff;hb=e7d0f02ef389b70096d7820d63d29db4a26abd91;hp=8ef6ebeea972a0f0973a77b2c01c04c34dfb0c18;hpb=ed9fd62c6060a3a5ae34a6fd61939f13be07973c;p=appc.git

diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml
index 8ef6ebeea..90e0cab64 100644
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml
@@ -1,13 +1,36 @@
 <?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>
-        <groupId>org.openecomp.appc</groupId>
-        <artifactId>appc-netconf-adapter</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>2.7.2</version>
+        <relativePath/>
     </parent>
 
     <artifactId>appc-netconf-adapter-bundle</artifactId>
+    <groupId>org.onap.appc</groupId>
+    <version>1.7.2</version>
     <packaging>bundle</packaging>
     <name>NETCONF Adapter - bundle</name>
     <properties>
@@ -18,8 +41,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
-            <artifactId>appc-common</artifactId>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-common-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
 
@@ -33,12 +56,26 @@
             <groupId>com.att.cdp</groupId>
             <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>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>
@@ -46,21 +83,10 @@
             <artifactId>javax.ws.rs-api</artifactId>
             </dependency>
 
-        <!-- Jersey support needed for OpenStack connector and API version logic -->
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-            </dependency>
-
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-json</artifactId>
-            </dependency>
-
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
+            <version>2.2.3</version>
         </dependency>
 
         <!-- Needed to run test cases -->
@@ -73,7 +99,7 @@
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-jaxrs</artifactId>
-            <version>1.9.12</version>
+            <version>1.9.13</version>
         </dependency>
 
         <dependency>
@@ -84,7 +110,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.1</version>
+            <version>4.5.3</version>
         </dependency>
 
         <dependency>
@@ -104,6 +130,12 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -154,7 +186,12 @@
             <artifactId>jsch</artifactId>
             <version>0.1.54</version>
         </dependency>
-
+        <dependency>
+          <groupId>org.hamcrest</groupId>
+          <artifactId>hamcrest-all</artifactId>
+          <version>1.3</version>
+          <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -166,10 +203,10 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>appc-netconf-adapter</Bundle-SymbolicName>
-                        <Bundle-Activator>org.openecomp.appc.adapter.netconf.AppcNetconfAdapterActivator</Bundle-Activator>
-                        <Export-Package>org.openecomp.appc.adapter.netconf,org.openecomp.appc.adapter.netconf.dao,org.openecomp.appc.adapter.netconf.util,org.openecomp.appc.adapter.netconf.exception</Export-Package>
+                        <Bundle-Activator>org.onap.appc.adapter.netconf.AppcNetconfAdapterActivator</Bundle-Activator>
+                        <Export-Package>org.onap.appc.adapter.netconf,org.onap.appc.adapter.netconf.dao,org.onap.appc.adapter.netconf.util,org.onap.appc.adapter.netconf.exception</Export-Package>
                         <Import-Package>
-                            !org.slf4j.event,org.w3c.dom.*,com.sun.org.apache.xerces.*,javax.sql.*,javax.sql.rowset.*,javax.xml.*,org.openecomp.appc.adapter.messaging.*,javax.crypto.*,org.openecomp.appc.common.exception.*,org.mariadb.*,org.onap.ccsdk.sli.core.sli.*,org.onap.ccsdk.sli.core.dblib,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*
+                            !org.slf4j.event,org.w3c.dom.*,com.sun.org.apache.xerces.*,javax.sql.*,javax.sql.rowset.*,javax.xml.*,org.onap.appc.adapter.messaging.*,javax.crypto.*,org.onap.appc.common.exception.*,org.mariadb.*,org.onap.ccsdk.sli.core.sli.*,org.onap.ccsdk.sli.core.dblib,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=!dblib-provider|sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|appc-dmaap-adapter-bundle</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>