From 38ff905f0d3ae0a8cef7d148451ad43c0330ea7f Mon Sep 17 00:00:00 2001
From: Lorand Jakab <lojakab@cisco.com>
Date: Fri, 22 Jul 2016 11:08:48 -0500
Subject: [PATCH] Switch from config-parent to {odl,binding-}parent

Since we moved to bluprints from config subsystem, we don't need
config-parent anymore.

Change-Id: Ia1f62217cabca35ce8dc77de7f3227b06c500e02
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
---
 mappingservice/api/pom.xml                    | 14 +++++++---
 mappingservice/clustering/pom.xml             |  3 ++-
 mappingservice/dsbackend/pom.xml              |  6 ++++-
 mappingservice/inmemorydb/pom.xml             |  9 ++++---
 mappingservice/neutron/pom.xml                | 10 +++----
 mappingservice/pom.xml                        | 23 ++++++++--------
 .../src/main/yang/odl-lisp-sb-config.yang     | 26 -------------------
 7 files changed, 41 insertions(+), 50 deletions(-)
 delete mode 100644 mappingservice/southbound/src/main/yang/odl-lisp-sb-config.yang

diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml
index 0efb65069..6563ac0dc 100644
--- a/mappingservice/api/pom.xml
+++ b/mappingservice/api/pom.xml
@@ -3,12 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.lispflowmapping</groupId>
-    <artifactId>mappingservice-parent</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.9.0-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>mappingservice.api</artifactId>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <name>Mapping Service Public APIs</name>
 
@@ -16,6 +18,12 @@
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
       <artifactId>mappingservice.lisp-proto</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>config-api</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
diff --git a/mappingservice/clustering/pom.xml b/mappingservice/clustering/pom.xml
index 4ebfe9c7a..5f0ecff25 100644
--- a/mappingservice/clustering/pom.xml
+++ b/mappingservice/clustering/pom.xml
@@ -18,7 +18,7 @@
 
   <artifactId>mappingservice.clustering</artifactId>
   <packaging>bundle</packaging>
-  <name>Mapping Service Clustering (mappingservice.clustering)</name>
+  <name>Mapping Service Clustering</name>
 
   <dependencies>
     <dependency>
@@ -28,6 +28,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-common-api</artifactId>
+      <version>1.4.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/mappingservice/dsbackend/pom.xml b/mappingservice/dsbackend/pom.xml
index af94f6b6e..658f3b0f8 100644
--- a/mappingservice/dsbackend/pom.xml
+++ b/mappingservice/dsbackend/pom.xml
@@ -33,6 +33,11 @@
       <groupId>junit-addons</groupId>
       <artifactId>junit-addons</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-api</artifactId>
+      <version>1.4.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito</artifactId>
@@ -43,7 +48,6 @@
       <artifactId>powermock-module-junit4</artifactId>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 
   <build>
diff --git a/mappingservice/inmemorydb/pom.xml b/mappingservice/inmemorydb/pom.xml
index d7bd393e1..6d8c8034c 100644
--- a/mappingservice/inmemorydb/pom.xml
+++ b/mappingservice/inmemorydb/pom.xml
@@ -3,12 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.lispflowmapping</groupId>
-    <artifactId>mappingservice-parent</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.9.0-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>mappingservice.inmemorydb</artifactId>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <name>Mapping Service Inmemory Mappings Database</name>
 
@@ -16,6 +18,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.api</artifactId>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 
diff --git a/mappingservice/neutron/pom.xml b/mappingservice/neutron/pom.xml
index 74f624035..6875b5a58 100644
--- a/mappingservice/neutron/pom.xml
+++ b/mappingservice/neutron/pom.xml
@@ -21,16 +21,16 @@
       <groupId>org.opendaylight.lispflowmapping</groupId>
       <artifactId>mappingservice.lisp-proto</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-api</artifactId>
+      <version>1.4.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.neutron</groupId>
       <artifactId>model</artifactId>
       <version>0.7.0-SNAPSHOT</version>
     </dependency>
-    <!-- needed for activator -->
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.dependencymanager</artifactId>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index f24a1e3ee..5f70abcd7 100644
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -3,9 +3,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent</artifactId>
+    <version>1.7.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -62,14 +62,6 @@
         <version>1.4</version>
         <scope>test</scope>
       </dependency>
-      <!--
-      <dependency>
-        <groupId>org.jmock</groupId>
-        <artifactId>jmock</artifactId>
-        <version>2.6.0</version>
-        <scope>test</scope>
-      </dependency>
-      -->
     </dependencies>
   </dependencyManagement>
 
@@ -81,6 +73,15 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
   <!--
       Maven Site Configuration
 
diff --git a/mappingservice/southbound/src/main/yang/odl-lisp-sb-config.yang b/mappingservice/southbound/src/main/yang/odl-lisp-sb-config.yang
deleted file mode 100644
index 582b2c54a..000000000
--- a/mappingservice/southbound/src/main/yang/odl-lisp-sb-config.yang
+++ /dev/null
@@ -1,26 +0,0 @@
-module odl-lisp-sb-config {
-
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:config:lisp-sb:config";
-    prefix "lisp-sb-config";
-
-    description
-        "This module contains the base YANG definitions for mappingservice
-        southbound plugin implementation.";
-
-    revision "2015-05-17" {
-        description "Initial revision.";
-    }
-
-    container lisp-sb-config {
-        leaf bind-address {
-            type string;
-            default "0.0.0.0";
-        }
-
-        leaf map-register-cache {
-            type boolean;
-            default true;
-        }
-    }
-}
-- 
2.36.6