From: Stephen Kitt <skitt@redhat.com>
Date: Wed, 27 Jun 2018 16:29:01 +0000 (+0200)
Subject: Use version ranges for odlparent feature deps
X-Git-Tag: release/fluorine~7
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=bfa72a941058c1a825cc0d1b745eea144c0622c2;p=lispflowmapping.git

Use version ranges for odlparent feature deps

This helps with upgrades and bump merges.

This patch also adds a dependency on the Guava feature.

Change-Id: Ifc6c40534e143a9589998f138c0a4378a980aff8
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---

diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml
index f37fc1579..a7e14068c 100644
--- a/features/odl-lispflowmapping-southbound/pom.xml
+++ b/features/odl-lispflowmapping-southbound/pom.xml
@@ -45,6 +45,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.odlparent</groupId>
+      <artifactId>odl-guava-23</artifactId>
+      <type>xml</type>
+      <classifier>features</classifier>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-lispflowmapping-models</artifactId>
diff --git a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml
new file mode 100644
index 000000000..9eed6228c
--- /dev/null
+++ b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+Copyright © 2018 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 INTERNAL
+-->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-lispflowmapping-southbound">
+    <feature name="odl-lispflowmapping-southbound">
+        <feature version="[3.1.0,4)">odl-netty-4</feature>
+        <feature version="[3.1.0,4)">odl-guava-23</feature>
+    </feature>
+</features>