From 328b514e4325371870c73cf230d71aa368a423d8 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 12 May 2020 17:28:44 +0200
Subject: [PATCH] Cleanup MRI feature dependencies

Make sure we use ranged references to most MRI features. Also clean up
packaging of our artifacts, removing most bundle duplicates and unneeded
references.

Change-Id: I1524fce0b5ef18ad0ec8468af304dd6bf1cc98da
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 features/algo/odl-bgpcep-algo-api/pom.xml     |  8 ++++----
 features/bgp/odl-bgpcep-bgp-benchmark/pom.xml |  4 ++--
 .../src/main/feature/feature.xml              | 16 ++++++++++++++++
 features/bgp/odl-bgpcep-bgp-cli/pom.xml       |  6 ------
 .../src/main/feature/feature.xml              | 16 ++++++++++++++++
 .../src/main/feature/feature.xml              | 16 ++++++++++++++++
 features/bgp/odl-bgpcep-bgp-linkstate/pom.xml |  6 ++++++
 .../src/main/feature/feature.xml              | 17 +++++++++++++++++
 .../odl-bgpcep-bgp-openconfig-rp-impl/pom.xml |  8 +++++++-
 .../src/main/feature/feature.xml              | 16 ++++++++++++++++
 .../src/main/feature/feature.xml              | 16 ++++++++++++++++
 .../bgp/odl-bgpcep-bgp-openconfig/pom.xml     |  2 +-
 .../bgp/odl-bgpcep-bgp-parser-api/pom.xml     | 10 +++++-----
 .../src/main/feature/feature.xml              | 18 ++++++++++++++++++
 .../pom.xml                                   |  6 +-----
 features/bgp/odl-bgpcep-bgp-rib-api/pom.xml   | 16 ++++++++++++++--
 .../src/main/feature/feature.xml              | 19 +++++++++++++++++++
 features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml  |  6 ------
 features/bgp/odl-bgpcep-bgp-topology/pom.xml  | 12 ++++++------
 .../src/main/feature/feature.xml              | 16 ++++++++++++++++
 .../src/main/feature/feature.xml              | 17 +++++++++++++++++
 .../odl-bgpcep-config-loader-impl/pom.xml     |  6 ++++++
 .../src/main/feature/feature.xml              | 16 ++++++++++++++++
 .../odl-bgpcep-config-loader-spi/pom.xml      |  6 ------
 .../src/main/feature/feature.xml              | 16 ++++++++++++++++
 .../pom.xml                                   |  8 +-------
 .../odl-bgpcep-topology-config-loader/pom.xml |  6 ++++++
 .../src/main/feature/feature.xml              | 16 ++++++++++++++++
 .../src/main/feature/feature.xml              | 17 +++++++++++++++++
 .../src/main/feature/feature.xml              | 16 ++++++++++++++++
 features/pcep/odl-bgpcep-pcep-impl/pom.xml    |  6 ++++++
 .../pcep/odl-bgpcep-pcep-p2mp-te-lsp/pom.xml  |  8 +++++++-
 .../odl-bgpcep-pcep-server-provider/pom.xml   |  6 ++++++
 features/pcep/odl-bgpcep-pcep-server/pom.xml  | 10 ++++++++--
 .../src/main/feature/feature.xml              |  1 +
 .../src/main/feature/feature.xml              |  1 +
 features/rsvp/odl-bgpcep-rsvp-api/pom.xml     |  2 +-
 .../src/main/feature/feature.xml              | 17 +++++++++++++++++
 .../src/main/feature/feature.xml              | 16 ++++++++++++++++
 graph/graph-impl/pom.xml                      |  4 ----
 40 files changed, 370 insertions(+), 59 deletions(-)
 create mode 100644 features/bgp/odl-bgpcep-bgp-benchmark/src/main/feature/feature.xml
 create mode 100644 features/bgp/odl-bgpcep-bgp-evpn/src/main/feature/feature.xml
 create mode 100644 features/bgp/odl-bgpcep-bgp-labeled-unicast/src/main/feature/feature.xml
 create mode 100644 features/bgp/odl-bgpcep-bgp-linkstate/src/main/feature/feature.xml
 create mode 100644 features/bgp/odl-bgpcep-bgp-openconfig-rp-impl/src/main/feature/feature.xml
 create mode 100644 features/bgp/odl-bgpcep-bgp-openconfig-rp-statement/src/main/feature/feature.xml
 create mode 100644 features/bgp/odl-bgpcep-bgp-parser-api/src/main/feature/feature.xml
 create mode 100644 features/bgp/odl-bgpcep-bgp-rib-api/src/main/feature/feature.xml
 create mode 100644 features/bgp/odl-bgpcep-bgp-topology/src/main/feature/feature.xml
 create mode 100644 features/concepts/odl-bgpcep-concepts/src/main/feature/feature.xml
 create mode 100644 features/config-loader/odl-bgpcep-config-loader-impl/src/main/feature/feature.xml
 create mode 100644 features/config-loader/odl-bgpcep-config-loader-spi/src/main/feature/feature.xml
 create mode 100644 features/config-loader/odl-bgpcep-topology-config-loader/src/main/feature/feature.xml
 create mode 100644 features/graph/odl-bgpcep-graph-api/src/main/feature/feature.xml
 create mode 100644 features/graph/odl-bgpcep-graph/src/main/feature/feature.xml
 create mode 100644 features/rsvp/odl-bgpcep-rsvp-api/src/main/feature/feature.xml
 create mode 100644 features/topology/odl-bgpcep-topology-api/src/main/feature/feature.xml

diff --git a/features/algo/odl-bgpcep-algo-api/pom.xml b/features/algo/odl-bgpcep-algo-api/pom.xml
index 5b5fed070e..a107e52dd5 100644
--- a/features/algo/odl-bgpcep-algo-api/pom.xml
+++ b/features/algo/odl-bgpcep-algo-api/pom.xml
@@ -27,14 +27,14 @@
             <artifactId>algo-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-model-rfc6991</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-bgpcep-graph-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-model-odl-uint24</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-bgpcep-concepts</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml b/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml
index 6911b3a7e5..939c2db4d2 100644
--- a/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml
@@ -34,8 +34,8 @@
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>odl-mdsal-dom-broker</artifactId>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/bgp/odl-bgpcep-bgp-benchmark/src/main/feature/feature.xml b/features/bgp/odl-bgpcep-bgp-benchmark/src/main/feature/feature.xml
new file mode 100644
index 0000000000..62d8f99a24
--- /dev/null
+++ b/features/bgp/odl-bgpcep-bgp-benchmark/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-bgp-benchmark-${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-bgp-benchmark" version="${project.version}">
+        <feature version="[2,3)">odl-mdsal-broker</feature>
+    </feature>
+</features>
diff --git a/features/bgp/odl-bgpcep-bgp-cli/pom.xml b/features/bgp/odl-bgpcep-bgp-cli/pom.xml
index 9c20cbbf75..c32416b97a 100644
--- a/features/bgp/odl-bgpcep-bgp-cli/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-cli/pom.xml
@@ -39,11 +39,5 @@
             <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>
     </dependencies>
 </project>
diff --git a/features/bgp/odl-bgpcep-bgp-evpn/src/main/feature/feature.xml b/features/bgp/odl-bgpcep-bgp-evpn/src/main/feature/feature.xml
new file mode 100644
index 0000000000..c7a8300f1b
--- /dev/null
+++ b/features/bgp/odl-bgpcep-bgp-evpn/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-bgp-evpn-${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-bgp-evpn" version="${project.version}">
+        <feature version="[6,7)">odl-mdsal-uint24-netty</feature>
+    </feature>
+</features>
diff --git a/features/bgp/odl-bgpcep-bgp-labeled-unicast/src/main/feature/feature.xml b/features/bgp/odl-bgpcep-bgp-labeled-unicast/src/main/feature/feature.xml
new file mode 100644
index 0000000000..9340643883
--- /dev/null
+++ b/features/bgp/odl-bgpcep-bgp-labeled-unicast/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-bgp-labeled-unicast-${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-bgp-labeled-unicast" version="${project.version}">
+        <feature version="[6,7)">odl-mdsal-uint24-netty</feature>
+    </feature>
+</features>
diff --git a/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml b/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml
index 285dc9e850..bc2461091c 100644
--- a/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml
@@ -45,5 +45,11 @@
             <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>
     </dependencies>
 </project>
diff --git a/features/bgp/odl-bgpcep-bgp-linkstate/src/main/feature/feature.xml b/features/bgp/odl-bgpcep-bgp-linkstate/src/main/feature/feature.xml
new file mode 100644
index 0000000000..d12702a01b
--- /dev/null
+++ b/features/bgp/odl-bgpcep-bgp-linkstate/src/main/feature/feature.xml
@@ -0,0 +1,17 @@
+<?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-bgp-linkstate-${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-bgp-linkstate" version="${project.version}">
+        <feature version="[2,3)">odl-mdsal-broker</feature>
+        <feature version="[6,7)">odl-mdsal-uint24-netty</feature>
+    </feature>
+</features>
diff --git a/features/bgp/odl-bgpcep-bgp-openconfig-rp-impl/pom.xml b/features/bgp/odl-bgpcep-bgp-openconfig-rp-impl/pom.xml
index d0153f0e88..1ae63273dc 100644
--- a/features/bgp/odl-bgpcep-bgp-openconfig-rp-impl/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-openconfig-rp-impl/pom.xml
@@ -44,5 +44,11 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/features/bgp/odl-bgpcep-bgp-openconfig-rp-impl/src/main/feature/feature.xml b/features/bgp/odl-bgpcep-bgp-openconfig-rp-impl/src/main/feature/feature.xml
new file mode 100644
index 0000000000..02d03a3aaa
--- /dev/null
+++ b/features/bgp/odl-bgpcep-bgp-openconfig-rp-impl/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-bgp-openconfig-rp-impl-${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-bgp-openconfig-rp-impl" version="${project.version}">
+        <feature version="[2,3)">odl-mdsal-broker</feature>
+    </feature>
+</features>
diff --git a/features/bgp/odl-bgpcep-bgp-openconfig-rp-statement/src/main/feature/feature.xml b/features/bgp/odl-bgpcep-bgp-openconfig-rp-statement/src/main/feature/feature.xml
new file mode 100644
index 0000000000..a5f919dda3
--- /dev/null
+++ b/features/bgp/odl-bgpcep-bgp-openconfig-rp-statement/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-bgp-openconfig-rp-statement-${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-bgp-openconfig-rp-statement" version="${project.version}">
+        <feature version="[2,3)">odl-mdsal-broker</feature>
+    </feature>
+</features>
diff --git a/features/bgp/odl-bgpcep-bgp-openconfig/pom.xml b/features/bgp/odl-bgpcep-bgp-openconfig/pom.xml
index bddf648aa1..be135c5b3e 100644
--- a/features/bgp/odl-bgpcep-bgp-openconfig/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-openconfig/pom.xml
@@ -33,7 +33,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-bgpcep-bgp-parser</artifactId>
+            <artifactId>odl-bgpcep-bgp-parser-api</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
diff --git a/features/bgp/odl-bgpcep-bgp-parser-api/pom.xml b/features/bgp/odl-bgpcep-bgp-parser-api/pom.xml
index 36e9f2da16..a67869a9b4 100644
--- a/features/bgp/odl-bgpcep-bgp-parser-api/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-parser-api/pom.xml
@@ -32,20 +32,20 @@
             <artifactId>bgp-parser-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>odl-yangtools-data</artifactId>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-controller-blueprint</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>odl-yangtools-netty</artifactId>
+            <artifactId>odl-yangtools-data</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>odl-yangtools-netty</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/bgp/odl-bgpcep-bgp-parser-api/src/main/feature/feature.xml b/features/bgp/odl-bgpcep-bgp-parser-api/src/main/feature/feature.xml
new file mode 100644
index 0000000000..63ce6b551e
--- /dev/null
+++ b/features/bgp/odl-bgpcep-bgp-parser-api/src/main/feature/feature.xml
@@ -0,0 +1,18 @@
+<?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-bgp-parser-api-${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-bgp-parser-api" version="${project.version}">
+        <feature version="[2,3)">odl-controller-blueprint</feature>
+        <feature version="[5,6)">odl-yangtools-data</feature>
+        <feature version="[5,6)">odl-yangtools-netty</feature>
+    </feature>
+</features>
diff --git a/features/bgp/odl-bgpcep-bgp-path-selection-mode/pom.xml b/features/bgp/odl-bgpcep-bgp-path-selection-mode/pom.xml
index 385a8a4964..ee9a0b95c2 100644
--- a/features/bgp/odl-bgpcep-bgp-path-selection-mode/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-path-selection-mode/pom.xml
@@ -23,17 +23,13 @@
     <name>OpenDaylight :: BGP :: Path Selection</name>
 
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-parser-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-path-selection-mode</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-bgpcep-bgp-dependencies</artifactId>
+            <artifactId>odl-bgpcep-bgp-parser</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml b/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml
index 7b432c497c..3cf373ea3b 100644
--- a/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml
@@ -44,8 +44,20 @@
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>odl-mdsal-singleton-common</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>odl-mdsal-dom-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>odl-mdsal-binding-runtime-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/bgp/odl-bgpcep-bgp-rib-api/src/main/feature/feature.xml b/features/bgp/odl-bgpcep-bgp-rib-api/src/main/feature/feature.xml
new file mode 100644
index 0000000000..9fe104b099
--- /dev/null
+++ b/features/bgp/odl-bgpcep-bgp-rib-api/src/main/feature/feature.xml
@@ -0,0 +1,19 @@
+<?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-bgp-rib-api-${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-bgp-rib-api" version="${project.version}">
+        <feature version="[6,7)">odl-mdsal-model-rfc7223</feature>
+        <feature version="[6,7)">odl-mdsal-singleton-common</feature>
+        <feature version="[6,7)">odl-mdsal-dom-api</feature>
+        <feature version="[6,7)">odl-mdsal-binding-runtime-api</feature>
+    </feature>
+</features>
diff --git a/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml b/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml
index a37980e8dd..412d396f07 100644
--- a/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml
@@ -85,12 +85,6 @@
             <type>xml</type>
             <classifier>routing-policy-default-config</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-controller-exp-netty-config</artifactId>
diff --git a/features/bgp/odl-bgpcep-bgp-topology/pom.xml b/features/bgp/odl-bgpcep-bgp-topology/pom.xml
index f847a6de8d..4da32c2613 100644
--- a/features/bgp/odl-bgpcep-bgp-topology/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-topology/pom.xml
@@ -40,25 +40,25 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-bgpcep-topology-api</artifactId>
+            <artifactId>odl-bgpcep-graph</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-bgpcep-graph</artifactId>
+            <artifactId>odl-bgpcep-topology-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-bgpcep-topology-tunnel-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/bgp/odl-bgpcep-bgp-topology/src/main/feature/feature.xml b/features/bgp/odl-bgpcep-bgp-topology/src/main/feature/feature.xml
new file mode 100644
index 0000000000..25eb3b960b
--- /dev/null
+++ b/features/bgp/odl-bgpcep-bgp-topology/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-bgp-topology-${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-bgp-topology" version="${project.version}">
+        <feature version="[6,7)">odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01</feature>
+    </feature>
+</features>
diff --git a/features/concepts/odl-bgpcep-concepts/src/main/feature/feature.xml b/features/concepts/odl-bgpcep-concepts/src/main/feature/feature.xml
new file mode 100644
index 0000000000..01f457d5e7
--- /dev/null
+++ b/features/concepts/odl-bgpcep-concepts/src/main/feature/feature.xml
@@ -0,0 +1,17 @@
+<?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-concepts-${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-concepts" version="${project.version}">
+        <feature version="[6,7)">odl-mdsal-model-odl-uint24</feature>
+        <feature version="[6,7)">odl-mdsal-model-rfc6991</feature>
+    </feature>
+</features>
diff --git a/features/config-loader/odl-bgpcep-config-loader-impl/pom.xml b/features/config-loader/odl-bgpcep-config-loader-impl/pom.xml
index d27297c620..20b9a7818b 100644
--- a/features/config-loader/odl-bgpcep-config-loader-impl/pom.xml
+++ b/features/config-loader/odl-bgpcep-config-loader-impl/pom.xml
@@ -33,5 +33,11 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-controller-blueprint</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
     </dependencies>
 </project>
diff --git a/features/config-loader/odl-bgpcep-config-loader-impl/src/main/feature/feature.xml b/features/config-loader/odl-bgpcep-config-loader-impl/src/main/feature/feature.xml
new file mode 100644
index 0000000000..824e917e6e
--- /dev/null
+++ b/features/config-loader/odl-bgpcep-config-loader-impl/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-config-loader-impl-${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-config-loader-impl" version="${project.version}">
+        <feature version="[2,3)">odl-controller-blueprint</feature>
+    </feature>
+</features>
diff --git a/features/config-loader/odl-bgpcep-config-loader-spi/pom.xml b/features/config-loader/odl-bgpcep-config-loader-spi/pom.xml
index 5caa2b4bda..829230ac31 100644
--- a/features/config-loader/odl-bgpcep-config-loader-spi/pom.xml
+++ b/features/config-loader/odl-bgpcep-config-loader-spi/pom.xml
@@ -33,11 +33,5 @@
             <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>
     </dependencies>
 </project>
diff --git a/features/config-loader/odl-bgpcep-config-loader-spi/src/main/feature/feature.xml b/features/config-loader/odl-bgpcep-config-loader-spi/src/main/feature/feature.xml
new file mode 100644
index 0000000000..ac0e17a7a2
--- /dev/null
+++ b/features/config-loader/odl-bgpcep-config-loader-spi/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-config-loader-spi-${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-config-loader-spi" version="${project.version}">
+        <feature version="[6,7)">odl-mdsal-binding-runtime</feature>
+    </feature>
+</features>
diff --git a/features/config-loader/odl-bgpcep-routing-policy-config-loader/pom.xml b/features/config-loader/odl-bgpcep-routing-policy-config-loader/pom.xml
index 4b6ad9a3f2..ecfd66f9a8 100644
--- a/features/config-loader/odl-bgpcep-routing-policy-config-loader/pom.xml
+++ b/features/config-loader/odl-bgpcep-routing-policy-config-loader/pom.xml
@@ -45,11 +45,5 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/features/config-loader/odl-bgpcep-topology-config-loader/pom.xml b/features/config-loader/odl-bgpcep-topology-config-loader/pom.xml
index c653ddb816..92475f97a8 100644
--- a/features/config-loader/odl-bgpcep-topology-config-loader/pom.xml
+++ b/features/config-loader/odl-bgpcep-topology-config-loader/pom.xml
@@ -38,5 +38,11 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
     </dependencies>
 </project>
diff --git a/features/config-loader/odl-bgpcep-topology-config-loader/src/main/feature/feature.xml b/features/config-loader/odl-bgpcep-topology-config-loader/src/main/feature/feature.xml
new file mode 100644
index 0000000000..56ac69f483
--- /dev/null
+++ b/features/config-loader/odl-bgpcep-topology-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="odl-bgpcep-topology-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-topology-config-loader" version="${project.version}">
+        <feature version="[2,3)">odl-mdsal-broker</feature>
+    </feature>
+</features>
diff --git a/features/graph/odl-bgpcep-graph-api/src/main/feature/feature.xml b/features/graph/odl-bgpcep-graph-api/src/main/feature/feature.xml
new file mode 100644
index 0000000000..d8c34a8ea6
--- /dev/null
+++ b/features/graph/odl-bgpcep-graph-api/src/main/feature/feature.xml
@@ -0,0 +1,17 @@
+<?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-graph-api-${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-graph-api" version="${project.version}">
+        <feature version="[6,7)">odl-mdsal-model-rfc6991</feature>
+        <feature version="[6,7)">odl-mdsal-model-odl-uint24</feature>
+    </feature>
+</features>
diff --git a/features/graph/odl-bgpcep-graph/src/main/feature/feature.xml b/features/graph/odl-bgpcep-graph/src/main/feature/feature.xml
new file mode 100644
index 0000000000..93697f9c13
--- /dev/null
+++ b/features/graph/odl-bgpcep-graph/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-graph-${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-graph" version="${project.version}">
+        <feature version="[2,3)">odl-mdsal-broker</feature>
+    </feature>
+</features>
diff --git a/features/pcep/odl-bgpcep-pcep-impl/pom.xml b/features/pcep/odl-bgpcep-pcep-impl/pom.xml
index 4fcdb14833..0cda269710 100644
--- a/features/pcep/odl-bgpcep-pcep-impl/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-impl/pom.xml
@@ -28,6 +28,12 @@
             <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-base-parser</artifactId>
diff --git a/features/pcep/odl-bgpcep-pcep-p2mp-te-lsp/pom.xml b/features/pcep/odl-bgpcep-pcep-p2mp-te-lsp/pom.xml
index 05d9b43025..e93713ccd0 100644
--- a/features/pcep/odl-bgpcep-pcep-p2mp-te-lsp/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-p2mp-te-lsp/pom.xml
@@ -22,6 +22,12 @@
     <name>OpenDaylight :: PCEP :: P2MP TE LSP</name>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-ietf-p2mp-te-lsp</artifactId>
@@ -33,4 +39,4 @@
             <classifier>features</classifier>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/features/pcep/odl-bgpcep-pcep-server-provider/pom.xml b/features/pcep/odl-bgpcep-pcep-server-provider/pom.xml
index d774ecc2e4..62f2248c8a 100644
--- a/features/pcep/odl-bgpcep-pcep-server-provider/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-server-provider/pom.xml
@@ -27,6 +27,12 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-server-provider</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-bgpcep-topology-tunnel-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-server</artifactId>
diff --git a/features/pcep/odl-bgpcep-pcep-server/pom.xml b/features/pcep/odl-bgpcep-pcep-server/pom.xml
index e69d9eafbb..26103d6a92 100644
--- a/features/pcep/odl-bgpcep-pcep-server/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-server/pom.xml
@@ -25,13 +25,19 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-server-api</artifactId>
+            <artifactId>odl-bgpcep-algo-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-bgpcep-algo-api</artifactId>
+            <artifactId>odl-bgpcep-pcep-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>pcep-server-api</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/features/pcep/odl-bgpcep-pcep-tunnel-provider/src/main/feature/feature.xml b/features/pcep/odl-bgpcep-pcep-tunnel-provider/src/main/feature/feature.xml
index be78caaebc..006c017a9e 100644
--- a/features/pcep/odl-bgpcep-pcep-tunnel-provider/src/main/feature/feature.xml
+++ b/features/pcep/odl-bgpcep-pcep-tunnel-provider/src/main/feature/feature.xml
@@ -9,5 +9,6 @@
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-bgpcep-${project.version}">
     <feature name="odl-bgpcep-pcep-tunnel-provider" version="${project.version}">
         <feature version="[7,8)">odl-apache-commons-lang3</feature>
+        <feature version="[6,7)">odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01</feature>
     </feature>
 </features>
diff --git a/features/pcep/odl-bgpcep-programming-impl/src/main/feature/feature.xml b/features/pcep/odl-bgpcep-programming-impl/src/main/feature/feature.xml
index ea2aa833a3..9ad05e9552 100644
--- a/features/pcep/odl-bgpcep-programming-impl/src/main/feature/feature.xml
+++ b/features/pcep/odl-bgpcep-programming-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-programming-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/rsvp/odl-bgpcep-rsvp-api/pom.xml b/features/rsvp/odl-bgpcep-rsvp-api/pom.xml
index fa45e4bd81..d1df19207c 100644
--- a/features/rsvp/odl-bgpcep-rsvp-api/pom.xml
+++ b/features/rsvp/odl-bgpcep-rsvp-api/pom.xml
@@ -38,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
+            <artifactId>odl-controller-blueprint</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/rsvp/odl-bgpcep-rsvp-api/src/main/feature/feature.xml b/features/rsvp/odl-bgpcep-rsvp-api/src/main/feature/feature.xml
new file mode 100644
index 0000000000..0949b64539
--- /dev/null
+++ b/features/rsvp/odl-bgpcep-rsvp-api/src/main/feature/feature.xml
@@ -0,0 +1,17 @@
+<?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-rsvp-api${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-rsvp-api" version="${project.version}">
+        <feature version="[5,6)">odl-yangtools-netty</feature>
+        <feature version="[2,3)">odl-controller-blueprint</feature>
+    </feature>
+</features>
diff --git a/features/topology/odl-bgpcep-topology-api/src/main/feature/feature.xml b/features/topology/odl-bgpcep-topology-api/src/main/feature/feature.xml
new file mode 100644
index 0000000000..7d8ab1efea
--- /dev/null
+++ b/features/topology/odl-bgpcep-topology-api/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-topology-api-${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-topology-api" version="${project.version}">
+        <feature version="[6,7)">odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</feature>
+    </feature>
+</features>
diff --git a/graph/graph-impl/pom.xml b/graph/graph-impl/pom.xml
index 2df190d15a..fb8d548898 100644
--- a/graph/graph-impl/pom.xml
+++ b/graph/graph-impl/pom.xml
@@ -49,10 +49,6 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-- 
2.36.6