From f0c68db5f86f977cfd4e032e082c2a412c925765 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sat, 30 Jan 2021 10:10:11 +0100
Subject: [PATCH] Require odlparent-8.1 features

We really want to make sure we are using 8.1.x series features,
express that in feature.xmls.

Change-Id: Id5b2b34437835c1c2ddef76bc3e094aeff71e212
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 features/netconf/odl-netconf-api/src/main/feature/feature.xml   | 2 +-
 .../netconf/odl-netconf-netty-util/src/main/feature/feature.xml | 2 +-
 .../restconf/odl-restconf-common/src/main/feature/feature.xml   | 2 +-
 features/yanglib/odl-yanglib/src/main/feature/feature.xml       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/features/netconf/odl-netconf-api/src/main/feature/feature.xml b/features/netconf/odl-netconf-api/src/main/feature/feature.xml
index 5490a25fb7..c8f87ad921 100644
--- a/features/netconf/odl-netconf-api/src/main/feature/feature.xml
+++ b/features/netconf/odl-netconf-api/src/main/feature/feature.xml
@@ -8,7 +8,7 @@
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-netconf-${project.version}">
     <feature name="odl-netconf-api" version="${project.version}">
-        <feature version="[8,9)">odl-netty-4</feature>
+        <feature version="[8.1,9)">odl-netty-4</feature>
         <feature version="[6,7)">odl-yangtools-parser-api</feature>
         <feature version="[7,8)">odl-mdsal-model-rfc8525</feature>
         <feature version="[7,8)">odl-mdsal-model-rfc8342</feature>
diff --git a/features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml b/features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml
index cec41a1326..d8ca090e5f 100644
--- a/features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml
+++ b/features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-netconf-netty-util-${project.version}">
     <feature name="odl-netconf-netty-util" version="${project.version}">
-        <feature version="[8,9)">odl-netty-4</feature>
+        <feature version="[8.1,9)">odl-netty-4</feature>
     </feature>
 </features>
diff --git a/features/restconf/odl-restconf-common/src/main/feature/feature.xml b/features/restconf/odl-restconf-common/src/main/feature/feature.xml
index 28b210a43e..9ed48b23fa 100644
--- a/features/restconf/odl-restconf-common/src/main/feature/feature.xml
+++ b/features/restconf/odl-restconf-common/src/main/feature/feature.xml
@@ -8,7 +8,7 @@
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-netconf-${project.version}">
     <feature name="odl-restconf-common" version="${project.version}">
-        <feature version="[8,9)">odl-karaf-feat-jetty</feature>
+        <feature version="[8.1,9)">odl-karaf-feat-jetty</feature>
         <feature version="[6,7)">odl-yangtools-export</feature>
         <feature version="[7,8)">odl-mdsal-model-rfc7895</feature>
         <feature version="[3,4)">odl-mdsal-broker</feature>
diff --git a/features/yanglib/odl-yanglib/src/main/feature/feature.xml b/features/yanglib/odl-yanglib/src/main/feature/feature.xml
index 990a7c3ffb..4de8cebfb4 100644
--- a/features/yanglib/odl-yanglib/src/main/feature/feature.xml
+++ b/features/yanglib/odl-yanglib/src/main/feature/feature.xml
@@ -8,6 +8,6 @@
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-netconf-${project.version}">
     <feature name="odl-yanglib" version="${project.version}">
-        <feature version="[8,9)">odl-karaf-feat-jetty</feature>
+        <feature version="[8.1,9)">odl-karaf-feat-jetty</feature>
     </feature>
 </features>
-- 
2.36.6