From 277788570047fa3515c120fef6f8ef9bc6e8a63d Mon Sep 17 00:00:00 2001
From: Lorand Jakab <lojakab@cisco.com>
Date: Wed, 7 Jun 2017 12:36:55 +0300
Subject: [PATCH] Upgrade to odlparent 2.0.0

Change-Id: I10061eda3522ded1d55adc1ac365ab9d4b22763b
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
---
 artifacts/pom.xml                             |   4 +-
 commons/parent/pom.xml                        |  25 +--
 distribution-karaf/pom.xml                    |  92 -----------
 features/features-lispflowmapping/pom.xml     | 153 +++---------------
 .../src/main/features/features.xml            |  87 ----------
 features/features4-lispflowmapping/pom.xml    |  85 ----------
 .../odl-lispflowmapping-inmemorydb/pom.xml    |   2 +-
 .../pom.xml                                   |   2 +-
 .../pom.xml                                   |   2 +-
 features/odl-lispflowmapping-models/pom.xml   |   2 +-
 features/odl-lispflowmapping-msmr/pom.xml     |   2 +-
 features/odl-lispflowmapping-neutron/pom.xml  |   2 +-
 .../odl-lispflowmapping-southbound/pom.xml    |   6 +-
 features/odl-lispflowmapping-ui/pom.xml       |   2 +-
 features/pom.xml                              |   7 +-
 .../MappingServiceIntegrationTest.java        |   2 +-
 lispflowmapping-karaf/pom.xml                 |   4 +-
 mappingservice/pom.xml                        |   2 +-
 pom.xml                                       |   3 -
 19 files changed, 46 insertions(+), 438 deletions(-)
 delete mode 100644 distribution-karaf/pom.xml
 delete mode 100644 features/features-lispflowmapping/src/main/features/features.xml
 delete mode 100644 features/features4-lispflowmapping/pom.xml

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index cc03eec8a..12d25cbdd 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.9.0</version>
+    <version>2.0.0</version>
     <relativePath/>
   </parent>
 
@@ -92,7 +92,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>features4-lispflowmapping</artifactId>
+        <artifactId>features-lispflowmapping</artifactId>
         <version>${project.version}</version>
         <classifier>features</classifier>
         <type>xml</type>
diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 713b3187b..61e842652 100644
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -15,7 +15,7 @@
          for plugin configuration etc. -->
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.9.0</version>
+    <version>2.0.0</version>
     <relativePath/>
   </parent>
 
@@ -28,15 +28,13 @@
   <name>ODL :: lispflowmapping :: ${project.artifactId}</name>
 
   <properties>
-    <branding.version>1.9.0</branding.version>
+    <branding.version>2.0.0</branding.version>
     <build.suffix>1.0.0</build.suffix>
     <config.version>0.7.0-SNAPSHOT</config.version>
     <dlux.loader.version>0.6.0-SNAPSHOT</dlux.loader.version>
     <dlux.core.version>0.6.0-SNAPSHOT</dlux.core.version>
     <forwardingrulesmanager.version>0.5.0</forwardingrulesmanager.version>
     <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
-    <karaf.empty.version>1.9.0</karaf.empty.version>
-    <karaf.resources.version>1.9.0</karaf.resources.version>
     <lispflowmapping.version>1.6.0-SNAPSHOT</lispflowmapping.version>
     <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
     <neutron.version>0.9.0-SNAPSHOT</neutron.version>
@@ -104,30 +102,11 @@
         <artifactId>config-util</artifactId>
         <version>0.7.0-SNAPSHOT</version>
       </dependency>
-
-      <dependency>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>karaf.branding</artifactId>
-        <version>${branding.version}</version>
-        <scope>compile</scope>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>netty-event-executor-config</artifactId>
         <version>${config.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>opendaylight-karaf-empty</artifactId>
-        <version>${karaf.empty.version}</version>
-        <type>zip</type>
-      </dependency>
-
-      <dependency>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>opendaylight-karaf-resources</artifactId>
-        <version>${karaf.resources.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-binding-api</artifactId>
diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
deleted file mode 100644
index 49e8e2b8b..000000000
--- a/distribution-karaf/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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.opendaylight.odlparent</groupId>
-    <artifactId>karaf-parent</artifactId>
-    <version>1.9.0</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.lispflowmapping</groupId>
-  <artifactId>distribution-karaf</artifactId>
-  <version>1.6.0-SNAPSHOT</version>
-  <!-- <name> formatting is used by autorelease to parse and notify projects on
-       build failure. Please do not modify this unless you have a good reason. -->
-  <name>ODL :: lispflowmapping :: ${project.artifactId}</name>
-
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-
-  <properties>
-    <karaf.localFeature>odl-lispflowmapping-msmr</karaf.localFeature>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>lispflowmapping-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <!-- scope is compile so all features (there is only one) are installed
-      into startup.properties and the feature repo itself is not installed -->
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <type>kar</type>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>features-lispflowmapping</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-
-  <!-- DO NOT install or deploy the karaf artifact -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <!--
-      Maven Site Configuration
-
-      The following configuration is necessary for maven-site-plugin to
-      correctly identify the correct deployment path for OpenDaylight Maven
-      sites.
-  -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
-
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/${project.artifactId}/</url>
-    </site>
-  </distributionManagement>
-
-</project>
diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml
index 5701af5b6..be9069a10 100644
--- a/features/features-lispflowmapping/pom.xml
+++ b/features/features-lispflowmapping/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+Copyright (c) 2017 Cisco Systems, Inc.  All rights reserved.
 
 This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -11,176 +11,75 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>features-parent</artifactId>
-    <version>1.9.0</version>
+    <artifactId>feature-repo-parent</artifactId>
+    <version>2.0.0</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>features-lispflowmapping</artifactId>
   <version>1.6.0-SNAPSHOT</version>
+  <packaging>feature</packaging>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
   <name>ODL :: lispflowmapping :: ${project.artifactId}</name>
 
-  <properties>
-    <dlux.core.version>0.6.0-SNAPSHOT</dlux.core.version>
-    <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
-    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-    <netconf.version>1.3.0-SNAPSHOT</netconf.version>
-    <neutron.version>0.9.0-SNAPSHOT</neutron.version>
-    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-    <vbd.version>1.2.0-SNAPSHOT</vbd.version>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <!-- project specific dependencies -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.honeycomb.vbd</groupId>
-        <artifactId>vbd-artifacts</artifactId>
-        <version>${vbd.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>features-mdsal-model</artifactId>
-      <version>${mdsal.model.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-restconf</artifactId>
-      <version>${restconf.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-netconf-connector</artifactId>
-      <version>${netconf.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.dlux</groupId>
-      <artifactId>features-dlux</artifactId>
-      <version>${dlux.core.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.dluxapps</groupId>
-      <artifactId>features-dluxapps</artifactId>
-      <version>${dluxapps.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>mappingservice.dsbackend</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>mappingservice.implementation</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>mappingservice.southbound</artifactId>
+      <artifactId>odl-lispflowmapping-models</artifactId>
       <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>mappingservice.api</artifactId>
+      <artifactId>odl-lispflowmapping-inmemorydb</artifactId>
       <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>mappingservice.inmemorydb</artifactId>
+      <artifactId>odl-lispflowmapping-southbound</artifactId>
       <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>mappingservice.neutron</artifactId>
+      <artifactId>odl-lispflowmapping-mappingservice</artifactId>
       <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>mappingservice.shell</artifactId>
+      <artifactId>odl-lispflowmapping-msmr</artifactId>
       <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>mappingservice.lisp-proto</artifactId>
+      <artifactId>odl-lispflowmapping-mappingservice-shell</artifactId>
       <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>mappingservice.config</artifactId>
+      <artifactId>odl-lispflowmapping-neutron</artifactId>
       <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lispflowmapping-ui-bundle</artifactId>
+      <artifactId>odl-lispflowmapping-ui</artifactId>
       <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.neutron</groupId>
-      <artifactId>features-neutron</artifactId>
-      <version>${neutron.version}</version>
-      <classifier>features</classifier>
       <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.honeycomb.vbd</groupId>
-      <artifactId>vbd-features</artifactId>
       <classifier>features</classifier>
-      <type>xml</type>
     </dependency>
   </dependencies>
-
-  <!--
-      Maven Site Configuration
-
-      The following configuration is necessary for maven-site-plugin to
-      correctly identify the correct deployment path for OpenDaylight Maven
-      sites.
-  -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
-
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/${project.artifactId}/</url>
-    </site>
-  </distributionManagement>
-
 </project>
diff --git a/features/features-lispflowmapping/src/main/features/features.xml b/features/features-lispflowmapping/src/main/features/features.xml
deleted file mode 100644
index 73defac4a..000000000
--- a/features/features-lispflowmapping/src/main/features/features.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<features name="odl-lispflowmapping-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
-    <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.neutron/features-neutron/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.dlux/features-dlux/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/{{VERSION}}/xml/features</repository>
-    <!-- Needed for odl-mdsal-broker -->
-    <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
-    <!-- Needed for odl-restconf -->
-    <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
-    <!-- Needed by neutron intent handler -->
-    <repository>mvn:org.opendaylight.honeycomb.vbd/vbd-features/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netconf/features-netconf-connector/{{VERSION}}/xml/features</repository>
-
-    <feature name="odl-lispflowmapping-msmr" description="OpenDaylight :: LISP Flow Mapping :: Map-Server/Map-Resolver" version='${project.version}'>
-        <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
-        <feature version="${project.version}">odl-lispflowmapping-southbound</feature>
-    </feature>
-
-    <feature name="odl-lispflowmapping-mappingservice" description="OpenDaylight :: LISP Flow Mapping :: Mapping Service" version='${project.version}'>
-        <feature version="${restconf.version}">odl-restconf</feature>
-        <feature version="${mdsal.version}">odl-mdsal-broker</feature>
-        <feature version='${project.version}'>odl-lispflowmapping-models</feature>
-        <feature version="${project.version}">odl-lispflowmapping-inmemorydb</feature>
-        <feature version="${project.version}">odl-lispflowmapping-southbound</feature>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.config/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.dsbackend/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.mapcache/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.implementation/{{VERSION}}</bundle>
-    </feature>
-
-    <feature name="odl-lispflowmapping-mappingservice-shell" description="OpenDaylight :: LISP Flow Mapping :: Mappingservice Shell" version='${project.version}'>
-        <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.shell/{{VERSION}}</bundle>
-    </feature>
-
-    <feature name="odl-lispflowmapping-inmemorydb" description="OpenDaylight :: LISP Flow Mapping :: In Memory DB" version='${project.version}'>
-        <feature version="${mdsal.version}">odl-mdsal-broker</feature>
-        <feature version='${project.version}'>odl-lispflowmapping-models</feature>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.inmemorydb/{{VERSION}}</bundle>
-    </feature>
-
-    <feature name="odl-lispflowmapping-southbound" description="OpenDaylight :: LISP Flow Mapping :: Southbound Plugin" version='${project.version}'>
-        <feature version="${restconf.version}">odl-restconf</feature>
-        <feature version="${mdsal.version}">odl-mdsal-broker</feature>
-        <feature version='${project.version}'>odl-lispflowmapping-models</feature>
-        <feature version="${project.version}">odl-lispflowmapping-inmemorydb</feature>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.config/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.dsbackend/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.mapcache/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.southbound/{{VERSION}}</bundle>
-    </feature>
-
-    <feature name="odl-lispflowmapping-neutron" description="OpenDaylight :: LISP Flow Mapping :: Neutron Integration" version='${project.version}'>
-        <feature version="${neutron.version}">odl-neutron-service</feature>
-        <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
-        <feature version="${vbd.version}">odl-vbd</feature>
-        <feature version='${netconf.version}'>odl-netconf-clustered-topology</feature>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.neutron/{{VERSION}}</bundle>
-    </feature>
-
-    <feature name="odl-lispflowmapping-ui" description="OpenDaylight :: LISP Flow Mapping :: User Interface" version='${project.version}'>
-        <feature version="${dlux.core.version}">odl-dlux-core</feature>
-        <feature version="${dluxapps.version}">odl-dluxapps-yangutils</feature>
-        <feature version="${dluxapps.version}">odl-dluxapps-yangui</feature>
-        <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
-        <bundle>mvn:org.opendaylight.lispflowmapping/lispflowmapping-ui-bundle/{{VERSION}}</bundle>
-    </feature>
-
-    <feature name="odl-lispflowmapping-models" description="OpenDaylight :: LISP Flow Mapping :: Models" version='${project.version}'>
-        <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-        <bundle>mvn:org.apache.commons/commons-lang3/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.lisp-proto/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.api/{{VERSION}}</bundle>
-    </feature>
-</features>
diff --git a/features/features4-lispflowmapping/pom.xml b/features/features4-lispflowmapping/pom.xml
deleted file mode 100644
index 2cb354581..000000000
--- a/features/features4-lispflowmapping/pom.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2017 Cisco Systems, Inc.  All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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.opendaylight.odlparent</groupId>
-    <artifactId>feature-repo-parent</artifactId>
-    <version>1.9.0</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.lispflowmapping</groupId>
-  <artifactId>features4-lispflowmapping</artifactId>
-  <version>1.6.0-SNAPSHOT</version>
-  <packaging>feature</packaging>
-  <!-- <name> formatting is used by autorelease to parse and notify projects on
-       build failure. Please do not modify this unless you have a good reason. -->
-  <name>ODL :: lispflowmapping :: ${project.artifactId}</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-lispflowmapping-models</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-lispflowmapping-inmemorydb</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-lispflowmapping-southbound</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-lispflowmapping-mappingservice</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-lispflowmapping-msmr</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-lispflowmapping-mappingservice-shell</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-lispflowmapping-neutron</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-lispflowmapping-ui</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml
index ae8778a61..23256d0cb 100644
--- a/features/odl-lispflowmapping-inmemorydb/pom.xml
+++ b/features/odl-lispflowmapping-inmemorydb/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>1.9.0</version>
+    <version>2.0.0</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml
index 96b6c7763..b6564ca9f 100644
--- a/features/odl-lispflowmapping-mappingservice-shell/pom.xml
+++ b/features/odl-lispflowmapping-mappingservice-shell/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>1.9.0</version>
+    <version>2.0.0</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml
index 85474a171..500866cd0 100644
--- a/features/odl-lispflowmapping-mappingservice/pom.xml
+++ b/features/odl-lispflowmapping-mappingservice/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>1.9.0</version>
+    <version>2.0.0</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml
index bf1faf72c..4738d9160 100644
--- a/features/odl-lispflowmapping-models/pom.xml
+++ b/features/odl-lispflowmapping-models/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>1.9.0</version>
+    <version>2.0.0</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml
index 26bc272d1..2fce56088 100644
--- a/features/odl-lispflowmapping-msmr/pom.xml
+++ b/features/odl-lispflowmapping-msmr/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>1.9.0</version>
+    <version>2.0.0</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-neutron/pom.xml b/features/odl-lispflowmapping-neutron/pom.xml
index 4006f6da5..ad61c6395 100644
--- a/features/odl-lispflowmapping-neutron/pom.xml
+++ b/features/odl-lispflowmapping-neutron/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>1.9.0</version>
+    <version>2.0.0</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml
index beeee7bec..56087397f 100644
--- a/features/odl-lispflowmapping-southbound/pom.xml
+++ b/features/odl-lispflowmapping-southbound/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>1.9.0</version>
+    <version>2.0.0</version>
     <relativePath/>
   </parent>
 
@@ -41,8 +41,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
     <dependency>
       <groupId>org.opendaylight.odlparent</groupId>
-      <artifactId>odl4-netty-4</artifactId>
-      <version>1.9.0</version>
+      <artifactId>odl-netty-4</artifactId>
+      <version>2.0.0</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
diff --git a/features/odl-lispflowmapping-ui/pom.xml b/features/odl-lispflowmapping-ui/pom.xml
index 091a03071..5a76a5044 100644
--- a/features/odl-lispflowmapping-ui/pom.xml
+++ b/features/odl-lispflowmapping-ui/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>1.9.0</version>
+    <version>2.0.0</version>
     <relativePath/>
   </parent>
 
diff --git a/features/pom.xml b/features/pom.xml
index a68f59bec..7bcbed60d 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.9.0</version>
+    <version>2.0.0</version>
     <relativePath/>
   </parent>
 
@@ -25,10 +25,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <name>ODL :: lispflowmapping :: ${project.artifactId}</name>
 
   <modules>
-    <!--
-    <module>features-lispflowmapping</module>
-    -->
-    <module>features4-lispflowmapping</module>
     <module>odl-lispflowmapping-models</module>
     <module>odl-lispflowmapping-inmemorydb</module>
     <module>odl-lispflowmapping-southbound</module>
@@ -37,5 +33,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <module>odl-lispflowmapping-mappingservice-shell</module>
     <module>odl-lispflowmapping-neutron</module>
     <module>odl-lispflowmapping-ui</module>
+    <module>features-lispflowmapping</module>
   </modules>
 </project>
diff --git a/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java b/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
index 564cd92c2..34e403c50 100644
--- a/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
+++ b/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
@@ -191,7 +191,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase {
     public MavenUrlReference getFeatureRepo() {
         return maven()
                 .groupId("org.opendaylight.lispflowmapping")
-                .artifactId("features4-lispflowmapping")
+                .artifactId("features-lispflowmapping")
                 .classifier("features")
                 .type("xml")
                 .versionAsInProject();
diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml
index e53920c83..8da6abacc 100644
--- a/lispflowmapping-karaf/pom.xml
+++ b/lispflowmapping-karaf/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>1.9.0</version>
+    <version>2.0.0</version>
     <relativePath/>
   </parent>
 
@@ -43,7 +43,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>features4-lispflowmapping</artifactId>
+      <artifactId>features-lispflowmapping</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index 5deca09ea..be058979e 100644
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.9.0</version>
+    <version>2.0.0</version>
     <relativePath/>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index 3d8ce77a7..9129c6df1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,9 +26,6 @@
     <module>mappingservice</module>
     <module>ui</module>
     <module>features</module>
-    <!--
-    <module>distribution-karaf</module>
-    -->
     <module>lispflowmapping-karaf</module>
     <module>integrationtest</module>
   </modules>
-- 
2.36.6