Cleaned up dependencies.

Change-Id: Iaab661407fcee445199e0be1f1f59abbd22c41e9
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>

diff --git a/bgp/concepts/pom.xml b/bgp/concepts/pom.xml
index 1936e8f4bf1c218d3a4a2b1f040ff04c8a5862a9..ef2f6a94f1fca3dd9268957145a649ea58a7ad39 100644 (file)
--- 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 c4fe7d0a641a2b314859ee36a56cb457045a009d..6f7519c9f6477434ec11c1494f0bdb72035048ff 100644 (file)
--- 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 d5341992d696a2c809aebfca74566a2de3620f6f..8ee7ce7ebc5d99e3531be8d065a2ed9f0029ab11 100644 (file)
--- 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 80d29c679692ba963d294a0c1d67c4344e352ea5..cbe33124119841f8fb10446828386e7b43be5728 100644 (file)
--- 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 1347debe794f4ab1c1d3f41ace2beab3e4522d2f..a6d30005eb0a1abfd2f8b79e8b0ac409113001a3 100644 (file)
--- 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 bbdaef0e11eaf9a09f50cce838647c0fbe39741e..d3b1eb7a259384dd710ab80c816e94cc86196c0d 100644 (file)
--- 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 bf613b856afb68008b01474d1ee9b6d41e629c2a..e9f83c97885de80462afe4c9f1ec8d88e72cbc12 100644 (file)
--- 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 9219ac60bb1e6b65862d8d15104b0374cfef81db..45715467fd262cc3d6cd84dfeb0e4cd0c08b91fd 100644 (file)
--- 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 d965bc133ee60a62c11c2a4e104c37f74764e12b..a4f3521d6442e0eb054b2c6b7f94b24760a58af7 100644 (file)
--- 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 cdc12a497fc3749e941c76b87b37d5246c199aa8..1f99ae3c46a086f6960dc1d9d256050956bb6dd0 100644 (file)
--- 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 d40377e83ccbb60c69e7706b3ea21be53d2d766b..3c920e08e8b842f7a97fe490f13c92e11cc2a223 100644 (file)
--- 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 a2cedb4bd21c02937ed92bc51ff0fb28bb4681da..2560cbe865f24e94fbf371734ee5ca2c3cb885c1 100644 (file)
--- 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 f720a5ed3b14f48e83c59287bff584ec0e473b95..3f971492039a85ef627735f88ec241a1ac101b59 100644 (file)
--- 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 7ab715cdf98e510eb42f36d02739e14b25a4aab8..0366c780ae1b7b3872808cd52f7cd241981fd9b1 100644 (file)
--- 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 207aba40c3a0d51ec9f3dbe9be8be50658c60597..5584004242517ab2fcff577a1095bc03b15481f1 100644 (file)
--- 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 f8af4cac6b5a717940cd025809b0d05af8a9dea5..173d719ac44910ff5310344f5d743b1c13580fab 100644 (file)
--- 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 9423cf2cf631fdb1c6937092c9448582a69a2267..19134830571b7fc1a9713582f2cc03e57fdb3238 100644 (file)
--- 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 2449bcaad9aa81a1b3a2739e9f16c8888ac51083..d67d673e50b22da7fa5bb72704e042589d9cc709 100644 (file)
--- 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 62d025dcba5c272e7f90cb0558fb363fbb392e6b..aa16c5fbd044efbaf7fc7a1299cf8200eea5aa22 100644 (file)
--- 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 50b83efd63eb7ed3033203eda8cee013f91598c7..8dcf8b4892a6f357b7527e4882f3d3972ed1395a 100644 (file)
--- 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 7bfdf042df31dddd81749f0ad3b595f5c134ace4..df1d7dadd495d7948ec2af1119d857ea05391db3 100644 (file)
--- 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 7a6283a65e5659407b09844c15b176269f1d1ea3..95d1513e369317d2b007ac0f7308fc90fa900046 100644 (file)
--- 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 a6682bb198eb163c7692cb3e7c8865e0622f3b0c..b6cc33fcba9289d13652dc83de9075f34c7d644e 100644 (file)
--- 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 5e7e140adc4feec672468565192ecf23affdb419..35efb2895aac92569b0f099816d3893214eaaf8d 100644 (file)
--- 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 2ed4b13a6038efc5541a7365271988f7fd507315..fc742c23507fb587b37094cf69a2c3ade2870449 100644 (file)
--- 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 5b11ef864464ecbd9821c45bf426b4e8b73ab752..a34e754e448a2b37f862f386ce0e9888584e8a7a 100644 (file)
--- 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 e528343b48d554734253564df14bc2582ccf517a..196cdc87dd7be3aaffa4413b6ae8ff45760647d9 100644 (file)
--- 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 090214ab80188ecd76183e3b14c4aa57eaa987b0..7d730e1f966981d7ba381740f7c19846212be8cc 100644 (file)
--- 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 5c987575a8de577ece528d79e57f0747808f89cf..2baa1cfa1a865045b56d18c4f0b81388c2421b66 100644 (file)
--- 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 aac1286df2b882b0c9ebb7a7085979ef91839864..09b07ddea454ddaf0709c20013ebbf5bffa520a0 100644 (file)
--- 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 2b3a30e1910d78ec01a25b7bfd83b33cdb85ae3a..a6e8699cc4334ae15f0aaf36e253bc58d6b1996a 100644 (file)
--- 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>