Fix MRI feature references

Clean up references to MRI features, so as to ease their version
bumps.

Change-Id: Ie399c36c131aacb2ccef41986b0979962932a94b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/production/odl-neutron-model/src/main/feature/feature.xml b/features/production/odl-neutron-model/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..27eb5ad
--- /dev/null
+++ b/features/production/odl-neutron-model/src/main/feature/feature.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.1" name="odl-neutron-model-${project.version}">
+   <feature name="odl-neutron-model" version="${project.version}">
+     <feature version="[6,7)">odl-mdsal-model-rfc6991</feature>
+   </feature>
+</features>

diff --git a/features/production/odl-neutron-spi/pom.xml b/features/production/odl-neutron-spi/pom.xml
index adacd943e2f43e5175512301a679109c4078ff54..6147459b3959f7d73a1f9c1de2e893467ef9b801 100644 (file)
--- a/features/production/odl-neutron-spi/pom.xml
+++ b/features/production/odl-neutron-spi/pom.xml
@@ -27,6 +27,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-apache-commons-net</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-neutron-model</artifactId>
@@ -39,9 +45,5 @@
             <artifactId>neutron-spi</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>commons-net</groupId>
-            <artifactId>commons-net</artifactId>
-        </dependency>
     </dependencies>
 </project>

diff --git a/features/production/odl-neutron-spi/src/main/feature/feature.xml b/features/production/odl-neutron-spi/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..221d14f
--- /dev/null
+++ b/features/production/odl-neutron-spi/src/main/feature/feature.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.1" name="odl-neutron-spi-${project.version}">
+   <feature name="odl-neutron-spi" version="${project.version}">
+     <feature version="[7,8)">odl-apache-commons-net</feature>
+     <feature version="[2,3)">odl-mdsal-broker</feature>
+   </feature>
+</features>