From: Stephen Kitt <skitt@redhat.com>
Date: Thu, 28 Jun 2018 17:40:46 +0000 (+0200)
Subject: Use features with ranges in odl-config-netty
X-Git-Tag: release/fluorine~63
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=c1a3150b964c0153e6f5a43dbc4d4df727dbd359;ds=sidebyside

Use features with ranges in odl-config-netty

This adds a range dependency for odl-netty-4 and odl-guava-23.

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

diff --git a/features/config-netty/odl-config-netty/pom.xml b/features/config-netty/odl-config-netty/pom.xml
index 2a1d289ea3..151d1b1d1b 100644
--- a/features/config-netty/odl-config-netty/pom.xml
+++ b/features/config-netty/odl-config-netty/pom.xml
@@ -42,6 +42,12 @@
             <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>netty-event-executor-config</artifactId>
diff --git a/features/config-netty/odl-config-netty/src/main/feature/feature.xml b/features/config-netty/odl-config-netty/src/main/feature/feature.xml
new file mode 100644
index 0000000000..856733f869
--- /dev/null
+++ b/features/config-netty/odl-config-netty/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
+ -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-config-netty">
+    <feature name="odl-config-netty">
+        <feature version="[3.1.0,4)">odl-guava-23</feature>
+        <feature version="[3.1.0,4)">odl-netty-4</feature>
+    </feature>
+</features>