X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=appc-dg-util%2Fappc-dg-util-bundle%2Fpom.xml;h=b102f4afb737224ddd34fa687cfa468788628498;hb=52cf1a81d591efb2b1ee4b8c5a70b137dfb6c212;hp=24cb70d042e9776a6ae5376cc711704b4ecca8e0;hpb=ed9fd62c6060a3a5ae34a6fd61939f13be07973c;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 24cb70d04..b102f4afb 100644
--- a/appc-dg-util/appc-dg-util-bundle/pom.xml
+++ b/appc-dg-util/appc-dg-util-bundle/pom.xml
@@ -1,14 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  ONAP : APPC
+  ================================================================================
+  Copyright (C) 2017-2018 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.2.0-SNAPSHOT</version>
-    </parent>
-
+	<parent>
+		<groupId>org.onap.appc.parent</groupId>
+		<artifactId>binding-parent</artifactId>
+		<version>1.5.0-SNAPSHOT</version>
+                <relativePath />
+	</parent>
+	<groupId>org.onap.appc</groupId>
     <artifactId>appc-dg-util-bundle</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>appc-dg-util - bundle</name>
     <properties>
@@ -19,9 +43,20 @@
 
     <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>
+            <exclusions>
+              <exclusion>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+              </exclusion>
+           </exclusions>
+        </dependency>
+        <dependency>
+           <groupId>com.fasterxml.jackson.core</groupId>
+           <artifactId>jackson-databind</artifactId>
+           <version>2.8.11.3</version>
         </dependency>
         <dependency>
             <groupId>javax</groupId>
@@ -44,11 +79,22 @@
         <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-json</artifactId>
+            <exclusions>
+                 <exclusion>
+                      <groupId>org.codehaus.jackson</groupId>
+                      <artifactId>jackson-mapper-asl</artifactId>
+                 </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>1.9.3</version>
         </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>
@@ -64,7 +110,7 @@
         <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>
@@ -73,12 +119,7 @@
         <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.onap.ccsdk.sli.core</groupId>
@@ -150,14 +191,14 @@
             <artifactId>json</artifactId>
         </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>1.2.0-SNAPSHOT</version>
+            <version>1.5.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -170,14 +211,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
+            <version>${assertj.version}</version>
         </dependency>
     </dependencies>
 
@@ -190,17 +227,17 @@
                 <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>
+                        <Bundle-Activator>org.onap.appc.dg.util.AppcDgUtilActivator</Bundle-Activator>
+                        <Export-Package>org.onap.appc.dg.util.*</Export-Package>
                         <Import-Package>
-                            org.openecomp.appc.adapter.netconf,
-                            org.openecomp.appc.adapter.netconf.dao,
-                            org.openecomp.appc.adapter.netconf.util,com.att.eelf.*,
-                            org.openecomp.appc.adapter.netconf.exception,
-                            org.openecomp.appc.adapter.messaging.*,
+                            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.openecomp.appc.exceptions,
-                            org.openecomp.appc.i18n,
+                            org.onap.appc.exceptions,
+                            org.onap.appc.i18n,
                             org.osgi.framework.*,
                             org.slf4j.*,
                             com.vmware.*,