From 3d9019116e8a406a0e879cc3678adfeb18b13f67 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 23 Jun 2020 11:54:29 +0200
Subject: [PATCH] Clean up MRI project references, take 2

With most of the dependencies cleaned up, sweep the remaining
features to use version ranges to refer to MRI features.

Change-Id: I4af8d4b209a731d29219cdc0ed82edeca711047c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../src/main/feature/feature.xml                 | 14 ++++++++++++++
 features/bmp/odl-bgpcep-bmp/pom.xml              |  6 ------
 .../src/main/feature/feature.xml                 | 16 ++++++++++++++++
 features/pcep/odl-bgpcep-pcep-cli/pom.xml        |  6 ------
 .../src/main/feature/feature.xml                 |  1 +
 .../src/main/feature/feature.xml                 | 16 ++++++++++++++++
 .../pcep/odl-bgpcep-pcep-segment-routing/pom.xml |  6 ------
 .../odl-bgpcep-pcep-topology-provider/pom.xml    |  6 ------
 .../pcep/odl-bgpcep-pcep-topology-stats/pom.xml  |  6 ------
 .../src/main/feature/feature.xml                 | 13 +++++++++++++
 .../src/main/feature/feature.xml                 | 13 +++++++++++++
 11 files changed, 73 insertions(+), 30 deletions(-)
 create mode 100644 features/bgpcep-extras/odl-bgpcep-data-change-counter/src/main/feature/feature.xml
 create mode 100644 features/config-loader/odl-bgpcep-bmp-config-loader/src/main/feature/feature.xml
 create mode 100644 features/pcep/odl-bgpcep-pcep-p2mp-te-lsp/src/main/feature/feature.xml
 create mode 100644 features/pcep/odl-bgpcep-programming-api/src/main/feature/feature.xml
 create mode 100644 features/topology/odl-bgpcep-topology-tunnel-api/src/main/feature/feature.xml

diff --git a/features/bgpcep-extras/odl-bgpcep-data-change-counter/src/main/feature/feature.xml b/features/bgpcep-extras/odl-bgpcep-data-change-counter/src/main/feature/feature.xml
new file mode 100644
index 0000000000..85ea515245
--- /dev/null
+++ b/features/bgpcep-extras/odl-bgpcep-data-change-counter/src/main/feature/feature.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2020 PANTHEON.tech, s.r.o. and others.  All rights reserved.
+  ~
+  ~ 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-bgpcep-data-change-counter-${project.version}">
+    <feature name="odl-bgpcep-data-change-counter" version="${project.version}">
+        <feature version="[6,7)">odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01</feature>
+        <feature version="[2,3)">odl-mdsal-broker</feature>
+    </feature>
+</features>
diff --git a/features/bmp/odl-bgpcep-bmp/pom.xml b/features/bmp/odl-bgpcep-bmp/pom.xml
index a75b86717d..5ede3c1e78 100644
--- a/features/bmp/odl-bgpcep-bmp/pom.xml
+++ b/features/bmp/odl-bgpcep-bmp/pom.xml
@@ -94,12 +94,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bmp-config-loader</artifactId>
diff --git a/features/config-loader/odl-bgpcep-bmp-config-loader/src/main/feature/feature.xml b/features/config-loader/odl-bgpcep-bmp-config-loader/src/main/feature/feature.xml
new file mode 100644
index 0000000000..7a57201202
--- /dev/null
+++ b/features/config-loader/odl-bgpcep-bmp-config-loader/src/main/feature/feature.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+  Copyright (c) 2020 PANTHEON.tech, s.r.o. and others. All rights reserved.
+
+  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 name="bgpcep-bmp-config-loader-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+    <feature name="odl-bgpcep-bmp-config-loader" version="${project.version}">
+        <feature version="[2,3)">odl-mdsal-broker</feature>
+    </feature>
+</features>
diff --git a/features/pcep/odl-bgpcep-pcep-cli/pom.xml b/features/pcep/odl-bgpcep-pcep-cli/pom.xml
index 889351032b..d1d7bd6315 100644
--- a/features/pcep/odl-bgpcep-pcep-cli/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-cli/pom.xml
@@ -32,12 +32,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-topology</artifactId>
diff --git a/features/pcep/odl-bgpcep-pcep-impl/src/main/feature/feature.xml b/features/pcep/odl-bgpcep-pcep-impl/src/main/feature/feature.xml
index 215e2ebbb7..0a9154e0c1 100644
--- a/features/pcep/odl-bgpcep-pcep-impl/src/main/feature/feature.xml
+++ b/features/pcep/odl-bgpcep-pcep-impl/src/main/feature/feature.xml
@@ -12,5 +12,6 @@
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-bgpcep-pcep-impl" version="${project.version}">
         <feature version="[2,3)">odl-controller-exp-netty-config</feature>
+        <feature version="[2,3)">odl-mdsal-broker</feature>
     </feature>
 </features>
diff --git a/features/pcep/odl-bgpcep-pcep-p2mp-te-lsp/src/main/feature/feature.xml b/features/pcep/odl-bgpcep-pcep-p2mp-te-lsp/src/main/feature/feature.xml
new file mode 100644
index 0000000000..a59462c9a4
--- /dev/null
+++ b/features/pcep/odl-bgpcep-pcep-p2mp-te-lsp/src/main/feature/feature.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+  Copyright (c) 2020 PANTHEON.tech, s.r.o. and others. All rights reserved.
+
+  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 name="odl-bgpcep-pcep-p2mp-te-lsp-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+    <feature name="odl-bgpcep-pcep-p2mp-te-lsp" version="${project.version}">
+        <feature version="[2,3)">odl-mdsal-broker</feature>
+    </feature>
+</features>
diff --git a/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml b/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml
index daabce01ad..6d587258a4 100644
--- a/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml
@@ -26,12 +26,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-segment-routing</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>odl-mdsal-dom-broker</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-stateful07</artifactId>
diff --git a/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml b/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml
index 65a603c669..050b4bc6a4 100644
--- a/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml
@@ -50,11 +50,5 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>odl-mdsal-dom-broker</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
     </dependencies>
 </project>
diff --git a/features/pcep/odl-bgpcep-pcep-topology-stats/pom.xml b/features/pcep/odl-bgpcep-pcep-topology-stats/pom.xml
index 289cc88bf3..ecaa256860 100644
--- a/features/pcep/odl-bgpcep-pcep-topology-stats/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-topology-stats/pom.xml
@@ -26,12 +26,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-topology-stats</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-stateful07</artifactId>
diff --git a/features/pcep/odl-bgpcep-programming-api/src/main/feature/feature.xml b/features/pcep/odl-bgpcep-programming-api/src/main/feature/feature.xml
new file mode 100644
index 0000000000..1ffca72ffa
--- /dev/null
+++ b/features/pcep/odl-bgpcep-programming-api/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2020 PANTHEON.tech, s.r.o. and others.  All rights reserved.
+  ~
+  ~ 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-bgpcep-programming-api-${project.version}">
+    <feature name="odl-bgpcep-programming-api" version="${project.version}">
+        <feature version="[6,7)">odl-mdsal-singleton-common</feature>
+    </feature>
+</features>
diff --git a/features/topology/odl-bgpcep-topology-tunnel-api/src/main/feature/feature.xml b/features/topology/odl-bgpcep-topology-tunnel-api/src/main/feature/feature.xml
new file mode 100644
index 0000000000..70b747b335
--- /dev/null
+++ b/features/topology/odl-bgpcep-topology-tunnel-api/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2020 PANTHEON.tech, s.r.o. and others.  All rights reserved.
+  ~
+  ~ 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-bgpcep-topology-tunnel-api-${project.version}">
+    <feature name="odl-bgpcep-topology-tunnel-api" version="${project.version}">
+        <feature version="[6,7)">odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</feature>
+    </feature>
+</features>
-- 
2.36.6