X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=appc-dg-util%2Fappc-dg-util-bundle%2Fpom.xml;h=7a987c035690f1b7c6de90a894df4b71e5df6ea6;hb=2d0e9d3450ceac0afdf0cd721ef65d87e94e456e;hp=6398076adb30700314d5146d3dd61e595dce920b;hpb=d0b708b96a3ce5a289b10194dc3e7f331d07258a;p=appc.git

diff --git a/appc-dg-util/appc-dg-util-bundle/pom.xml b/appc-dg-util/appc-dg-util-bundle/pom.xml
index 6398076ad..7a987c035 100644
--- a/appc-dg-util/appc-dg-util-bundle/pom.xml
+++ b/appc-dg-util/appc-dg-util-bundle/pom.xml
@@ -1,13 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<!--
+  ============LICENSE_START=======================================================
+  ONAP : APPC
+  ================================================================================
+  Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017 Amdocs
+  ================================================================================
+  Modifications Copyright (C) 2018 Nokia
+  ================================================================================
+  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-dg-util</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
+	<parent>
+		<groupId>org.onap.appc.parent</groupId>
+		<artifactId>binding-parent</artifactId>
+		<version>2.6.1</version>
+                <relativePath />
+	</parent>
+	<groupId>org.onap.appc</groupId>
     <artifactId>appc-dg-util-bundle</artifactId>
+    <version>1.6.3</version>
     <packaging>bundle</packaging>
     <name>appc-dg-util - bundle</name>
     <properties>
@@ -18,8 +43,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>
         <dependency>
@@ -27,125 +52,91 @@
             <artifactId>javaee-api</artifactId>
             <version>7.0</version>
         </dependency>
-
-             <dependency>
-          <groupId>org.openecomp.sdnc.adaptors</groupId>
-          <artifactId>aai-service-provider</artifactId>
-      </dependency>
-
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>aai-service-provider</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <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>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
+            <version>2.2.3</version>
         </dependency>
-
         <dependency>
             <groupId>javax.xml</groupId>
             <artifactId>jaxp-api</artifactId>
             <version>1.4.2</version>
         </dependency>
-
         <!-- Needed to run test cases -->
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-common</artifactId>
             <version>2.9.1</version>
         </dependency>
-
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-jaxrs</artifactId>
-            <version>1.9.12</version>
+            <version>1.9.13</version>
         </dependency>
-
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            </dependency>
-
+        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
+            <version>4.5.3</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.sdnc.core</groupId>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
             <scope>compile</scope>
             <!-- Added exclusion to prevent missing dependency issue on dblib -->
             <exclusions>
                 <exclusion>
-                    <groupId>org.openecomp.sdnc.core</groupId>
+                    <groupId>org.onap.ccsdk.sli.core</groupId>
                     <artifactId>dblib-provider</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>org.openecomp.sdnc.core</groupId>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-provider</artifactId>
             <scope>compile</scope>
             <!-- Added exclusion to prevent missing dependency issue on dblib -->
             <exclusions>
                 <exclusion>
-                    <groupId>org.openecomp.sdnc.core</groupId>
+                    <groupId>org.onap.ccsdk.sli.core</groupId>
                     <artifactId>dblib-provider</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
-
         <dependency>
             <groupId>equinoxSDK381</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            </dependency>
-
+        </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.31</version>
-            <type>jar</type>
-            <scope>compile</scope>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
         </dependency>
-
         <dependency>
             <groupId>com.vmware</groupId>
             <artifactId>vijava</artifactId>
             <version>5.1</version>
             <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xerces</artifactId>
@@ -164,23 +155,36 @@
             <artifactId>commons-logging</artifactId>
             <version>1.2</version>
         </dependency>
-
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            </dependency>
-
+        </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-dmaap-adapter-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
+            <groupId>org.onap.appc</groupId>
             <artifactId>appc-netconf-adapter-bundle</artifactId>
-            <version>${project.version}</version>
+            <version>1.6.3</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+            <version>${assertj.version}</version>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -192,11 +196,30 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>appc-dg-util</Bundle-SymbolicName>
-                        <Bundle-Activator>org.openecomp.appc.dg.util.AppcDgUtilActivator</Bundle-Activator>
-                        <Export-Package>org.openecomp.appc.dg.util.*</Export-Package>
-                        <Import-Package>org.openecomp.appc.adapter.netconf,org.openecomp.appc.adapter.netconf.dao,org.openecomp.appc.adapter.netconf.util,org.openecomp.appc.adapter.netconf.exception,org.openecomp.appc.adapter.dmaap.*,org.openecomp.sdnc.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*,com.fasterxml.*,javax.xml.parsers</Import-Package>n
-                        <Embed-Dependency>appc-common,eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false</Embed-Dependency>
-                        <Embed-Transitive>true</Embed-Transitive>
+                        <Bundle-Activator>org.onap.appc.dg.util.AppcDgUtilActivator</Bundle-Activator>
+                        <Export-Package>org.onap.appc.dg.util.*</Export-Package>
+                        <Import-Package>
+                            org.onap.appc.adapter.netconf,
+                            org.onap.appc.adapter.netconf.dao,
+                            org.onap.appc.adapter.netconf.util,com.att.eelf.*,
+                            org.onap.appc.adapter.netconf.exception,
+                            org.onap.appc.adapter.messaging.*,
+                            org.onap.ccsdk.sli.core.sli.*,
+                            org.onap.appc.exceptions,
+                            org.onap.appc.i18n,
+                            org.osgi.framework.*,
+                            org.slf4j.*,
+                            com.vmware.*,
+                            org.apache.xerces.*,
+                            javax.net.*,
+                            javax.net.ssl.*,
+                            org.xml.sax.*,
+                            javax.xml.bind.*,
+                            javax.naming.*,
+                            com.fasterxml.*,
+                            javax.xml.parsers,
+                            *;resolution:=optional
+                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>