From 8d372647d7fe962743cf92ff6d01913fcb4e4eae Mon Sep 17 00:00:00 2001
From: Lorand Jakab <lojakab@cisco.com>
Date: Tue, 17 Jan 2017 13:13:53 +0200
Subject: [PATCH] Remove the last remnants of the CSS

We don't use the config sub-system (CSS) anywhere in our project, so
remove the dependecy completely.

Change-Id: Ic2d0de34907ef4273339d50796aca594c77d8b05
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
---
 features/pom.xml                                  | 15 ---------------
 features/src/main/features/features.xml           |  9 +++------
 mappingservice/api/pom.xml                        |  5 -----
 mappingservice/api/src/main/yang/odl-lisp-sb.yang |  1 -
 .../api/src/main/yang/odl-mappingservice.yang     |  1 -
 mappingservice/config/pom.xml                     |  6 +++++-
 mappingservice/shell/pom.xml                      |  4 ++++
 7 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/features/pom.xml b/features/pom.xml
index f34f510e1..5afc3ec8f 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -21,16 +21,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <version>1.5.0-SNAPSHOT</version>
   <name>LISP Flow Mapping Project - Karaf Features</name>
 
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-
   <properties>
-    <commons.opendaylight.version>1.8.0-SNAPSHOT</commons.opendaylight.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-    <config.version>0.6.0-SNAPSHOT</config.version>
     <dlux.core.version>0.5.0-SNAPSHOT</dlux.core.version>
-    <features.file>features.xml</features.file>
     <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
     <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
     <neutron.version>0.8.0-SNAPSHOT</neutron.version>
@@ -59,13 +51,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-config</artifactId>
-      <version>${config.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-mdsal</artifactId>
diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 16ef86004..8f8e30897 100644
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -11,15 +11,13 @@
           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">
 
-    <!-- Needed for odl-mdsal-broker -->
     <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>
+    <!-- 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 for odl-config-api -->
-    <repository>mvn:org.opendaylight.controller/features-config/{{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>
 
     <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>
@@ -72,7 +70,6 @@
     </feature>
 
     <feature name="odl-lispflowmapping-models" description="OpenDaylight :: LISP Flow Mapping :: Models" version='${project.version}'>
-        <feature version='${config.version}'>odl-config-api</feature>
         <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>
diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml
index df86b3e63..d7c29cd4e 100644
--- a/mappingservice/api/pom.xml
+++ b/mappingservice/api/pom.xml
@@ -25,11 +25,6 @@
       <artifactId>mappingservice.lisp-proto</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-api</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>yang-ext</artifactId>
diff --git a/mappingservice/api/src/main/yang/odl-lisp-sb.yang b/mappingservice/api/src/main/yang/odl-lisp-sb.yang
index 96b7c582c..202ff6919 100644
--- a/mappingservice/api/src/main/yang/odl-lisp-sb.yang
+++ b/mappingservice/api/src/main/yang/odl-lisp-sb.yang
@@ -4,7 +4,6 @@ module odl-lisp-sb {
     namespace "urn:opendaylight:lfm:lisp-sb";
     prefix "lisp-sb";
 
-    import config { prefix config; revision-date 2013-04-05; }
     import odl-lisp-proto { prefix lisp-proto; revision-date 2015-11-05; }
 
     contact "Lorand Jakab <lojakab@cisco.com";
diff --git a/mappingservice/api/src/main/yang/odl-mappingservice.yang b/mappingservice/api/src/main/yang/odl-mappingservice.yang
index d3715a291..25c8b0d20 100644
--- a/mappingservice/api/src/main/yang/odl-mappingservice.yang
+++ b/mappingservice/api/src/main/yang/odl-mappingservice.yang
@@ -4,7 +4,6 @@ module odl-mappingservice {
     namespace "urn:opendaylight:lfm:mappingservice";
     prefix "mappingservice";
 
-    import config { prefix config; revision-date 2013-04-05; }
     import ietf-inet-types { prefix inet; revision-date 2013-07-15; }
     import yang-ext { prefix ext; revision-date 2013-07-09; }
     import odl-lisp-proto { prefix lisp-proto; revision-date 2015-11-05; }
diff --git a/mappingservice/config/pom.xml b/mappingservice/config/pom.xml
index 70749e335..c3efd5efb 100644
--- a/mappingservice/config/pom.xml
+++ b/mappingservice/config/pom.xml
@@ -13,6 +13,10 @@
   <name>Mapping Service Config</name>
 
   <dependencies>
+    <dependency>
+      <groupId>org.eclipse.tycho</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
       <artifactId>mappingservice.api</artifactId>
@@ -36,4 +40,4 @@
     </site>
   </distributionManagement>
   
-</project>
\ No newline at end of file
+</project>
diff --git a/mappingservice/shell/pom.xml b/mappingservice/shell/pom.xml
index cfcaa3d0c..f58adce5a 100644
--- a/mappingservice/shell/pom.xml
+++ b/mappingservice/shell/pom.xml
@@ -13,6 +13,10 @@
   <name>Mapping Service Karaf Shell Commands</name>
 
   <dependencies>
+    <dependency>
+      <groupId>org.eclipse.tycho</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>
       <artifactId>org.apache.karaf.shell.console</artifactId>
-- 
2.36.6