From faa59d34cb70eb3af7dcaa376558fd8df861db3a Mon Sep 17 00:00:00 2001
From: Dana Kutenicsova <dkutenic@cisco.com>
Date: Thu, 19 Feb 2015 16:04:29 +0100
Subject: [PATCH] Cleaned up dependencies.

Change-Id: Iaab661407fcee445199e0be1f1f59abbd22c41e9
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
---
 bgp/concepts/pom.xml             |  4 ++++
 bgp/flowspec/pom.xml             | 13 ++++---------
 bgp/linkstate/pom.xml            | 10 ++++++++++
 bgp/parser-api/pom.xml           |  8 ++++++++
 bgp/parser-impl/pom.xml          |  9 +++++++++
 bgp/parser-mock/pom.xml          |  9 ++++++++-
 bgp/parser-spi/pom.xml           | 17 +++++++++++++----
 bgp/rib-api/pom.xml              |  4 ++++
 bgp/rib-mock/pom.xml             | 16 ++++++++++++++++
 bgp/rib-spi/pom.xml              |  5 +++++
 bgp/testtool/pom.xml             |  8 ++++++++
 bgp/topology-provider/pom.xml    |  7 +++++++
 data-change-counter/pom.xml      |  1 +
 pcep/api/pom.xml                 |  4 ++++
 pcep/ietf-stateful02/pom.xml     |  5 +++++
 pcep/ietf-stateful07/pom.xml     |  5 +++++
 pcep/impl/pom.xml                |  5 +++++
 pcep/pcc-mock/pom.xml            | 22 ++++++++++++++++++++++
 pcep/segment-routing/pom.xml     |  5 +++--
 pcep/spi/pom.xml                 |  5 +++++
 pcep/topology-api/pom.xml        |  4 ++++
 pcep/topology-provider/pom.xml   |  4 ++++
 pcep/tunnel-api/pom.xml          |  4 ++++
 pcep/tunnel-provider/pom.xml     |  9 +--------
 programming/api/pom.xml          |  4 ++++
 programming/impl/pom.xml         | 10 ++++++++++
 programming/tunnel-api/pom.xml   |  4 ++++
 rsvp/api/pom.xml                 |  4 ++++
 topology/api/pom.xml             |  4 ++++
 topology/segment-routing/pom.xml |  4 ++++
 topology/tunnel-api/pom.xml      |  4 ++++
 31 files changed, 193 insertions(+), 24 deletions(-)

diff --git a/bgp/concepts/pom.xml b/bgp/concepts/pom.xml
index 1936e8f4bf..ef2f6a94f1 100644
--- a/bgp/concepts/pom.xml
+++ b/bgp/concepts/pom.xml
@@ -57,6 +57,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
 
         <!--
              FIXME: these are IETF models which are pre-generated in SAL infra.
diff --git a/bgp/flowspec/pom.xml b/bgp/flowspec/pom.xml
index c4fe7d0a64..6f7519c9f6 100644
--- a/bgp/flowspec/pom.xml
+++ b/bgp/flowspec/pom.xml
@@ -56,10 +56,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-rib-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-rib-spi</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>util</artifactId>
@@ -82,6 +78,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
@@ -111,11 +111,6 @@
              <artifactId>mockito-core</artifactId>
              <scope>test</scope>
          </dependency>
-         <dependency>
-             <groupId>${project.groupId}</groupId>
-             <artifactId>bgp-rib-spi</artifactId>
-             <type>test-jar</type>
-         </dependency>
          <dependency>
              <groupId>${project.groupId}</groupId>
              <artifactId>bgp-parser-spi</artifactId>
diff --git a/bgp/linkstate/pom.xml b/bgp/linkstate/pom.xml
index d5341992d6..8ee7ce7ebc 100644
--- a/bgp/linkstate/pom.xml
+++ b/bgp/linkstate/pom.xml
@@ -82,6 +82,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
@@ -114,6 +118,7 @@
          <dependency>
              <groupId>org.opendaylight.controller</groupId>
              <artifactId>config-manager</artifactId>
+             <scope>test</scope>
          </dependency>
          <dependency>
              <groupId>org.opendaylight.controller</groupId>
@@ -164,6 +169,11 @@
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/bgp/parser-api/pom.xml b/bgp/parser-api/pom.xml
index 80d29c6796..cbe3312411 100644
--- a/bgp/parser-api/pom.xml
+++ b/bgp/parser-api/pom.xml
@@ -32,6 +32,10 @@
     </prerequisites>
 
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>util</artifactId>
@@ -57,6 +61,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
diff --git a/bgp/parser-impl/pom.xml b/bgp/parser-impl/pom.xml
index 1347debe79..a6d30005eb 100644
--- a/bgp/parser-impl/pom.xml
+++ b/bgp/parser-impl/pom.xml
@@ -32,6 +32,10 @@
     </prerequisites>
 
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-concepts</artifactId>
@@ -77,6 +81,11 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/bgp/parser-mock/pom.xml b/bgp/parser-mock/pom.xml
index bbdaef0e11..d3b1eb7a25 100644
--- a/bgp/parser-mock/pom.xml
+++ b/bgp/parser-mock/pom.xml
@@ -32,11 +32,14 @@
     </prerequisites>
 
     <dependencies>
+       <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-concepts</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-parser-api</artifactId>
         </dependency>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-parser-spi</artifactId>
@@ -58,6 +61,10 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/bgp/parser-spi/pom.xml b/bgp/parser-spi/pom.xml
index bf613b856a..e9f83c9788 100644
--- a/bgp/parser-spi/pom.xml
+++ b/bgp/parser-spi/pom.xml
@@ -70,6 +70,14 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>ietf-inet-types</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.osgi</groupId>
@@ -96,6 +104,11 @@
             <artifactId>mockito-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-manager</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-manager</artifactId>
@@ -105,10 +118,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-util</artifactId>
diff --git a/bgp/rib-api/pom.xml b/bgp/rib-api/pom.xml
index 9219ac60bb..45715467fd 100644
--- a/bgp/rib-api/pom.xml
+++ b/bgp/rib-api/pom.xml
@@ -52,6 +52,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-api</artifactId>
diff --git a/bgp/rib-mock/pom.xml b/bgp/rib-mock/pom.xml
index d965bc133e..a4f3521d64 100644
--- a/bgp/rib-mock/pom.xml
+++ b/bgp/rib-mock/pom.xml
@@ -32,6 +32,14 @@
     </prerequisites>
 
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-parser-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-parser-spi</artifactId>
@@ -49,6 +57,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>ietf-inet-types</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>protocol-framework</artifactId>
@@ -66,6 +78,10 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-buffer</artifactId>
+        </dependency>
 
         <!-- Testing dependencies -->
         <dependency>
diff --git a/bgp/rib-spi/pom.xml b/bgp/rib-spi/pom.xml
index cdc12a497f..1f99ae3c46 100644
--- a/bgp/rib-spi/pom.xml
+++ b/bgp/rib-spi/pom.xml
@@ -60,6 +60,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-api</artifactId>
@@ -108,6 +112,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-manager</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
diff --git a/bgp/testtool/pom.xml b/bgp/testtool/pom.xml
index d40377e83c..3c920e08e8 100644
--- a/bgp/testtool/pom.xml
+++ b/bgp/testtool/pom.xml
@@ -40,6 +40,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-linkstate</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-parser-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-parser-spi</artifactId>
@@ -79,6 +83,10 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
diff --git a/bgp/topology-provider/pom.xml b/bgp/topology-provider/pom.xml
index a2cedb4bd2..2560cbe865 100644
--- a/bgp/topology-provider/pom.xml
+++ b/bgp/topology-provider/pom.xml
@@ -36,6 +36,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>rsvp-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-concepts</artifactId>
@@ -177,6 +181,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-manager</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
@@ -214,6 +219,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>netty-event-executor-config</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
@@ -229,6 +235,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>netty-threadgroup-config</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
diff --git a/data-change-counter/pom.xml b/data-change-counter/pom.xml
index f720a5ed3b..3f97149203 100644
--- a/data-change-counter/pom.xml
+++ b/data-change-counter/pom.xml
@@ -91,6 +91,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-manager</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
diff --git a/pcep/api/pom.xml b/pcep/api/pom.xml
index 7ab715cdf9..0366c780ae 100644
--- a/pcep/api/pom.xml
+++ b/pcep/api/pom.xml
@@ -70,6 +70,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
diff --git a/pcep/ietf-stateful02/pom.xml b/pcep/ietf-stateful02/pom.xml
index 207aba40c3..5584004242 100644
--- a/pcep/ietf-stateful02/pom.xml
+++ b/pcep/ietf-stateful02/pom.xml
@@ -85,6 +85,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
 
         <!--
              FIXME: these are IETF models which are pre-generated in SAL infra.
@@ -130,6 +134,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-manager</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
diff --git a/pcep/ietf-stateful07/pom.xml b/pcep/ietf-stateful07/pom.xml
index f8af4cac6b..173d719ac4 100644
--- a/pcep/ietf-stateful07/pom.xml
+++ b/pcep/ietf-stateful07/pom.xml
@@ -89,6 +89,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
 
         <!--
              FIXME: these are IETF models which are pre-generated in SAL infra.
@@ -134,6 +138,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-manager</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
diff --git a/pcep/impl/pom.xml b/pcep/impl/pom.xml
index 9423cf2cf6..1913483057 100644
--- a/pcep/impl/pom.xml
+++ b/pcep/impl/pom.xml
@@ -107,6 +107,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
@@ -146,6 +150,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-manager</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
diff --git a/pcep/pcc-mock/pom.xml b/pcep/pcc-mock/pom.xml
index 2449bcaad9..d67d673e50 100644
--- a/pcep/pcc-mock/pom.xml
+++ b/pcep/pcc-mock/pom.xml
@@ -19,6 +19,10 @@
   <artifactId>pcep-pcc-mock</artifactId>
 
   <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>util</artifactId>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>pcep-api</artifactId>
@@ -49,6 +53,10 @@
       <groupId>io.netty</groupId>
       <artifactId>netty-common</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-transport</artifactId>
@@ -81,6 +89,10 @@
         <groupId>org.opendaylight.tcpmd5</groupId>
         <artifactId>tcpmd5-api</artifactId>
     </dependency>
+    <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+    </dependency>
 
     <!-- Testing dependencies -->
     <dependency>
@@ -91,6 +103,16 @@
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>config-manager</artifactId>
+      <type>test-jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>config-manager</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/pcep/segment-routing/pom.xml b/pcep/segment-routing/pom.xml
index 62d025dcba..aa16c5fbd0 100644
--- a/pcep/segment-routing/pom.xml
+++ b/pcep/segment-routing/pom.xml
@@ -68,8 +68,8 @@
          <artifactId>yang-common</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.opendaylight.yangtools.model</groupId>
-         <artifactId>yang-ext</artifactId>
+         <groupId>org.opendaylight.yangtools</groupId>
+         <artifactId>concepts</artifactId>
       </dependency>
       <dependency>
          <groupId>org.opendaylight.yangtools.model</groupId>
@@ -114,6 +114,7 @@
       <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>config-manager</artifactId>
+         <scope>test</scope>
       </dependency>
       <dependency>
          <groupId>org.opendaylight.controller</groupId>
diff --git a/pcep/spi/pom.xml b/pcep/spi/pom.xml
index 50b83efd63..8dcf8b4892 100644
--- a/pcep/spi/pom.xml
+++ b/pcep/spi/pom.xml
@@ -61,6 +61,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>io.netty</groupId>
@@ -105,6 +109,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-manager</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
diff --git a/pcep/topology-api/pom.xml b/pcep/topology-api/pom.xml
index 7bfdf042df..df1d7dadd4 100644
--- a/pcep/topology-api/pom.xml
+++ b/pcep/topology-api/pom.xml
@@ -68,6 +68,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>com.google.guava</groupId>
diff --git a/pcep/topology-provider/pom.xml b/pcep/topology-provider/pom.xml
index 7a6283a65e..95d1513e36 100644
--- a/pcep/topology-provider/pom.xml
+++ b/pcep/topology-provider/pom.xml
@@ -126,6 +126,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-common</artifactId>
diff --git a/pcep/tunnel-api/pom.xml b/pcep/tunnel-api/pom.xml
index a6682bb198..b6cc33fcba 100644
--- a/pcep/tunnel-api/pom.xml
+++ b/pcep/tunnel-api/pom.xml
@@ -68,6 +68,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-topology</artifactId>
diff --git a/pcep/tunnel-provider/pom.xml b/pcep/tunnel-provider/pom.xml
index 5e7e140adc..35efb2895a 100644
--- a/pcep/tunnel-provider/pom.xml
+++ b/pcep/tunnel-provider/pom.xml
@@ -32,10 +32,6 @@
     </prerequisites>
 
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>concepts</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-topology-api</artifactId>
@@ -72,10 +68,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>rsvp-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>programming-topology-api</artifactId>
@@ -169,6 +161,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-manager</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
diff --git a/programming/api/pom.xml b/programming/api/pom.xml
index 2ed4b13a60..fc742c2350 100644
--- a/programming/api/pom.xml
+++ b/programming/api/pom.xml
@@ -40,6 +40,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
diff --git a/programming/impl/pom.xml b/programming/impl/pom.xml
index 5b11ef8644..a34e754e44 100644
--- a/programming/impl/pom.xml
+++ b/programming/impl/pom.xml
@@ -70,6 +70,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
@@ -113,6 +117,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-manager</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
@@ -167,6 +172,11 @@
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/programming/tunnel-api/pom.xml b/programming/tunnel-api/pom.xml
index e528343b48..196cdc87dd 100644
--- a/programming/tunnel-api/pom.xml
+++ b/programming/tunnel-api/pom.xml
@@ -48,6 +48,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-topology</artifactId>
diff --git a/rsvp/api/pom.xml b/rsvp/api/pom.xml
index 090214ab80..7d730e1f96 100644
--- a/rsvp/api/pom.xml
+++ b/rsvp/api/pom.xml
@@ -45,6 +45,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
diff --git a/topology/api/pom.xml b/topology/api/pom.xml
index 5c987575a8..2baa1cfa1a 100644
--- a/topology/api/pom.xml
+++ b/topology/api/pom.xml
@@ -44,6 +44,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>yang-ext</artifactId>
diff --git a/topology/segment-routing/pom.xml b/topology/segment-routing/pom.xml
index aac1286df2..09b07ddea4 100644
--- a/topology/segment-routing/pom.xml
+++ b/topology/segment-routing/pom.xml
@@ -44,6 +44,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-topology</artifactId>
diff --git a/topology/tunnel-api/pom.xml b/topology/tunnel-api/pom.xml
index 2b3a30e191..a6e8699cc4 100644
--- a/topology/tunnel-api/pom.xml
+++ b/topology/tunnel-api/pom.xml
@@ -40,6 +40,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
-- 
2.36.6