From 6c3b8d90f351e6e09442585d57d87cbec5f621c4 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sun, 23 Dec 2018 08:57:13 +0100
Subject: [PATCH] Reuse odlparent common features

Rather than packaging commons-lang3 ourselves, use odlparent-provided
feature. Same goes for servlet-api and commons-text.

Change-Id: Icdd20a83cb98242e22f77dd7d8108699f1f30887
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 features/mdsal/odl-mdsal-clustering-commons/pom.xml | 12 ++++++++++++
 .../src/main/feature/feature.xml                    |  2 ++
 .../mdsal/odl-mdsal-distributed-datastore/pom.xml   |  6 ++++++
 .../src/main/feature/feature.xml                    | 13 +++++++++++++
 opendaylight/md-sal/sal-clustering-commons/pom.xml  |  1 +
 5 files changed, 34 insertions(+)
 create mode 100644 features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml

diff --git a/features/mdsal/odl-mdsal-clustering-commons/pom.xml b/features/mdsal/odl-mdsal-clustering-commons/pom.xml
index 211d232a96..a046a3924b 100644
--- a/features/mdsal/odl-mdsal-clustering-commons/pom.xml
+++ b/features/mdsal/odl-mdsal-clustering-commons/pom.xml
@@ -47,6 +47,18 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-apache-commons-lang3</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-servlet-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sal-clustering-commons</artifactId>
diff --git a/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
index bb5c552cf6..faa27f8585 100644
--- a/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
+++ b/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
@@ -11,5 +11,7 @@
         <feature version="[4,5)">odl-akka-system-2.5</feature>
         <feature version="[4,5)">odl-akka-persistence-2.5</feature>
         <feature version="[4,5)">odl-akka-clustering-2.5</feature>
+        <feature version="[4,5)">odl-apache-commons-lang3</feature>
+        <feature version="[4,5)">odl-servlet-api</feature>
     </feature>
 </features>
diff --git a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml
index 3912616ba7..5f3e1012fa 100644
--- a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml
+++ b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml
@@ -40,6 +40,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-apache-commons-text</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-mdsal-clustering-commons</artifactId>
diff --git a/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
new file mode 100644
index 0000000000..7716205f1f
--- /dev/null
+++ b/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright © 2017 Red Hat, Inc. and others.
+  ~
+  ~ 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 xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-controller-${project.version}">
+    <feature name="odl-mdsal-distributed-datastore" version="${project.version}">
+        <feature version="[4,5)">odl-apache-commons-text</feature>
+    </feature>
+</features>
diff --git a/opendaylight/md-sal/sal-clustering-commons/pom.xml b/opendaylight/md-sal/sal-clustering-commons/pom.xml
index 2b79a38790..c503434dc0 100644
--- a/opendaylight/md-sal/sal-clustering-commons/pom.xml
+++ b/opendaylight/md-sal/sal-clustering-commons/pom.xml
@@ -73,6 +73,7 @@
     </dependency>
     <dependency>
       <!-- Enforce Netty’s optional dependency on servlet API -->
+      <!-- FIXME: is this really needed ? -->
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
     </dependency>
-- 
2.36.6