Fix dependency deficiencies

Removes unused declared dependecies and adds used dependencies.

Change-Id: Ia7d7de00e463944de167d3b863a0da9ef54b4069
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/bgp/concepts/pom.xml b/bgp/concepts/pom.xml
index 66ac7d5fb7c360d58a7eb6b85471abc29906a672..e8e8f402fe1cf772e70a26334f8d1b4e16e47dfa 100644 (file)
--- a/bgp/concepts/pom.xml
+++ b/bgp/concepts/pom.xml
@@ -25,9 +25,14 @@
                        <version>${project.version}</version>
                </dependency>
                <dependency>
-                       <groupId>com.google.code.findbugs</groupId>
-                       <artifactId>jsr305</artifactId>
-                       <version>2.0.1</version>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>util</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.google.guava</groupId>
+                       <artifactId>guava</artifactId>
+                       <version>${guava.version}</version>
                </dependency>
        </dependencies>
 

diff --git a/bgp/linkstate/pom.xml b/bgp/linkstate/pom.xml
index 0438492d90494391b686f75b31f7de6a18467cc8..d1c9c66f3cd78b882e663c0e7351b4e9b9f9b7ed 100644 (file)
--- a/bgp/linkstate/pom.xml
+++ b/bgp/linkstate/pom.xml
@@ -22,6 +22,11 @@
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>concepts</artifactId>
+            <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>util</artifactId>
             <version>${project.version}</version>
                </dependency>
                <dependency>
@@ -30,9 +35,9 @@
             <version>${project.version}</version>
                </dependency>
                <dependency>
-                       <groupId>com.google.code.findbugs</groupId>
-                       <artifactId>jsr305</artifactId>
-                       <version>2.0.1</version>
+                       <groupId>com.google.guava</groupId>
+                       <artifactId>guava</artifactId>
+                       <version>${guava.version}</version>
                </dependency>
        </dependencies>
 

diff --git a/bgp/parser-api/pom.xml b/bgp/parser-api/pom.xml
index 0adf26cf00dbff28eb8704d121d669ed41247cbf..e27e7e28a7f5efda03d6ad0f569a16cfe02a9b03 100644 (file)
--- a/bgp/parser-api/pom.xml
+++ b/bgp/parser-api/pom.xml
@@ -22,6 +22,11 @@
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>concepts</artifactId>
+            <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>util</artifactId>
             <version>${project.version}</version>
                </dependency>
                <dependency>
@@ -34,6 +39,16 @@
                        <artifactId>bgp-linkstate</artifactId>
             <version>${project.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>bgp-concepts</artifactId>
+            <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.google.guava</groupId>
+                       <artifactId>guava</artifactId>
+                       <version>${guava.version}</version>
+               </dependency>
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>

diff --git a/bgp/parser-impl/pom.xml b/bgp/parser-impl/pom.xml
index d5ac26d104181e1d8495174a03ba553539c659ff..fd73c5df9cb8fe5fbb73e49793e57584cdcd8d28 100644 (file)
--- a/bgp/parser-impl/pom.xml
+++ b/bgp/parser-impl/pom.xml
@@ -51,15 +51,13 @@
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>mockito-configuration</artifactId>
+                       <artifactId>framework</artifactId>
             <version>${project.version}</version>
-                       <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>${junit.version}</version>
-                       <scope>test</scope>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>slf4j-api</artifactId>
+                       <version>${slf4j.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.google.guava</groupId>
@@ -71,6 +69,18 @@
                        <artifactId>jsr305</artifactId>
                        <version>2.0.1</version>
                </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>mockito-configuration</artifactId>
+            <version>${project.version}</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
+                       <version>${junit.version}</version>
+                       <scope>test</scope>
+               </dependency>
        </dependencies>
 
        <build>

diff --git a/bgp/parser-mock/pom.xml b/bgp/parser-mock/pom.xml
index 6e7c9cc261db9772b1f6330030e79c9b8ad93206..1cd91f9c97c6525d4551719291e130faef1bab3e 100644 (file)
--- a/bgp/parser-mock/pom.xml
+++ b/bgp/parser-mock/pom.xml
@@ -21,14 +21,39 @@
        <dependencies>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>bgp-parser-api</artifactId>
+                       <artifactId>concepts</artifactId>
             <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>concepts</artifactId>
+                       <artifactId>framework</artifactId>
+            <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>bgp-concepts</artifactId>
+            <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>bgp-util</artifactId>
             <version>${project.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>bgp-linkstate</artifactId>
+            <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>bgp-parser-api</artifactId>
+            <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.google.guava</groupId>
+                       <artifactId>guava</artifactId>
+                       <version>${guava.version}</version>
+               </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>bgp-parser-impl</artifactId>

diff --git a/bgp/rib-api/pom.xml b/bgp/rib-api/pom.xml
index c7bcdd397ddd42df66120b9ada1ba08d6663decd..0d365f320c213845c01dd875c447f800126007c2 100644 (file)
--- a/bgp/rib-api/pom.xml
+++ b/bgp/rib-api/pom.xml
@@ -39,6 +39,16 @@
                        <artifactId>bgp-linkstate</artifactId>
             <version>${project.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>com.google.code.findbugs</groupId>
+                       <artifactId>jsr305</artifactId>
+                       <version>2.0.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.google.guava</groupId>
+                       <artifactId>guava</artifactId>
+                       <version>${guava.version}</version>
+               </dependency>
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>

diff --git a/bgp/rib-impl/pom.xml b/bgp/rib-impl/pom.xml
index 463f9c569b46537af59dbb2082a7802996db7e58..b3bf9da97c391b5551c88c17dd88d687b332cf69 100644 (file)
--- a/bgp/rib-impl/pom.xml
+++ b/bgp/rib-impl/pom.xml
@@ -22,11 +22,31 @@
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>concepts</artifactId>
+            <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>util</artifactId>
+            <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>framework</artifactId>
+            <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>bgp-concepts</artifactId>
             <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>bgp-linkstate</artifactId>
+            <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>bgp-parser-api</artifactId>
             <version>${project.version}</version>
                </dependency>
                <dependency>
@@ -39,6 +59,27 @@
                        <artifactId>bgp-util</artifactId>
             <version>${project.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>com.google.code.findbugs</groupId>
+                       <artifactId>jsr305</artifactId>
+                       <version>2.0.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.google.guava</groupId>
+                       <artifactId>guava</artifactId>
+                       <version>${guava.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>slf4j-api</artifactId>
+                       <version>${slf4j.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.mockito</groupId>
+                       <artifactId>mockito-core</artifactId>
+            <version>${mockito.version}</version>
+                       <scope>test</scope>
+               </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>mockito-configuration</artifactId>

diff --git a/bgp/rib-mock/pom.xml b/bgp/rib-mock/pom.xml
index 8c24dbf4fc32e694408a66ef8b7648164b1b4889..cdbbadffb4fa5d1dbf5a75d5e8e852c4f56a5646 100644 (file)
--- a/bgp/rib-mock/pom.xml
+++ b/bgp/rib-mock/pom.xml
@@ -21,12 +21,27 @@
        <dependencies>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>bgp-rib-impl</artifactId>
+                       <artifactId>concepts</artifactId>
             <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>util</artifactId>
+            <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>framework</artifactId>
+            <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>bgp-concepts</artifactId>
+            <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>bgp-parser-api</artifactId>
             <version>${project.version}</version>
                </dependency>
                <dependency>
@@ -36,14 +51,24 @@
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>mockito-configuration</artifactId>
+                       <artifactId>bgp-rib-impl</artifactId>
             <version>${project.version}</version>
-                       <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-api</artifactId>
-                       <version>${slf4j.version}</version>
+                       <groupId>com.google.code.findbugs</groupId>
+                       <artifactId>jsr305</artifactId>
+                       <version>2.0.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.google.guava</groupId>
+                       <artifactId>guava</artifactId>
+                       <version>${guava.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>mockito-configuration</artifactId>
+            <version>${project.version}</version>
+                       <scope>test</scope>
                </dependency>
        </dependencies>
 

diff --git a/bgp/testtool/pom.xml b/bgp/testtool/pom.xml
index f55958166574e199c3320a4fe5a5d6ee6c9beb50..d808bd7e5c264302beceaecc6526e18b053e7e9b 100644 (file)
--- a/bgp/testtool/pom.xml
+++ b/bgp/testtool/pom.xml
@@ -27,6 +27,16 @@
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>concepts</artifactId>
+            <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>bgp-concepts</artifactId>
+            <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>bgp-parser-api</artifactId>
             <version>${project.version}</version>
                </dependency>
                <dependency>
@@ -39,6 +49,11 @@
                        <artifactId>bgp-rib-impl</artifactId>
             <version>${project.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>slf4j-api</artifactId>
+                       <version>${slf4j.version}</version>
+               </dependency>
        </dependencies>
 
        <build>

diff --git a/bgp/util/pom.xml b/bgp/util/pom.xml
index cf429f46ac76a4d1c96f862d82be7938dc995049..e8019bff2e49e2f78456cce7a7961c2dc6eb2ce0 100644 (file)
--- a/bgp/util/pom.xml
+++ b/bgp/util/pom.xml
@@ -19,6 +19,16 @@
        </prerequisites>
 
        <dependencies>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>concepts</artifactId>
+            <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>util</artifactId>
+            <version>${project.version}</version>
+               </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>bgp-parser-api</artifactId>
@@ -34,6 +44,11 @@
                        <artifactId>bgp-concepts</artifactId>
             <version>${project.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>commons-codec</groupId>
+                       <artifactId>commons-codec</artifactId>
+                       <version>${commonscodec.version}</version>
+               </dependency>
                <dependency>
                        <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/concepts/pom.xml b/concepts/pom.xml
index 00a31606d883968316665fdc697a5b00d0790d00..e32e3309ad2e32cb4ef863a9b8a515fea3420bc7 100644 (file)
--- a/concepts/pom.xml
+++ b/concepts/pom.xml
@@ -29,6 +29,11 @@
                        <artifactId>jsr305</artifactId>
                        <version>2.0.1</version>
                </dependency>
+               <dependency>
+                       <groupId>com.google.guava</groupId>
+                       <artifactId>guava</artifactId>
+                       <version>${guava.version}</version>
+               </dependency>
        </dependencies>
 
        <build>

diff --git a/mockito-configuration/pom.xml b/mockito-configuration/pom.xml
index 049d93d6d41d24c8ad6c94dde200c0d3ed864c51..ab0900eb228d89797bd895d2a50944bddbc9de5b 100644 (file)
--- a/mockito-configuration/pom.xml
+++ b/mockito-configuration/pom.xml
@@ -23,7 +23,7 @@
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-core</artifactId>
-                       <version>1.9.5</version>
+            <version>${mockito.version}</version>
                </dependency>
                <dependency>
                        <groupId>junit</groupId>

diff --git a/pcep/api/pom.xml b/pcep/api/pom.xml
index b71884b7d6875ef99fdc0493254d423c51621fa0..672b148d7e1f1f73cd2762681fa469786da5252f 100644 (file)
--- a/pcep/api/pom.xml
+++ b/pcep/api/pom.xml
@@ -29,6 +29,16 @@
                        <artifactId>concepts</artifactId>
             <version>${project.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>util</artifactId>
+            <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.google.guava</groupId>
+                       <artifactId>guava</artifactId>
+                       <version>${guava.version}</version>
+               </dependency>
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>
@@ -44,7 +54,6 @@
         <!--
             FIXME: this is in support of the generated code. This should not
                    be here, but the plugin should bring it in.
-        -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>yang-binding</artifactId>
@@ -55,17 +64,18 @@
             <artifactId>yang-common</artifactId>
             <version>0.5.4-SNAPSHOT</version>
         </dependency>
+        -->
 
         <!--
              FIXME: these are IETF models which are pre-generated in SAL infra.
                     This should not be here, but rather should somehow be
                     discovered by the plugin.
-        -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>ietf-inet-types</artifactId>
             <version>2010.09.24-SNAPSHOT</version>
         </dependency>
+        -->
         <!--dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>ietf-yang-types</artifactId>

diff --git a/pcep/impl/pom.xml b/pcep/impl/pom.xml
index 271b5acbcc0c4cdd08b41a7665c4714cd0707578..63733931afecd3dd68231639ee3b031935e5441d 100644 (file)
--- a/pcep/impl/pom.xml
+++ b/pcep/impl/pom.xml
@@ -44,6 +44,17 @@
                        <artifactId>guava</artifactId>
                        <version>${guava.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>slf4j-api</artifactId>
+                       <version>${slf4j.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.mockito</groupId>
+                       <artifactId>mockito-core</artifactId>
+            <version>${mockito.version}</version>
+                       <scope>test</scope>
+               </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>mockito-configuration</artifactId>
@@ -57,11 +68,6 @@
                        <scope>test</scope>
                        <type>test-jar</type>
                </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-api</artifactId>
-                       <version>${slf4j.version}</version>
-               </dependency>
        </dependencies>
 
        <build>

diff --git a/pcep/testtool/pom.xml b/pcep/testtool/pom.xml
index fd137eb6d6fe0b707ffd0f27fcc47a8a4fdcaa1b..0a6e28271dedcf6c6e574745c9cd100b0ca94e6a 100644 (file)
--- a/pcep/testtool/pom.xml
+++ b/pcep/testtool/pom.xml
@@ -21,29 +21,33 @@
        <dependencies>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>pcep-api</artifactId>
+                       <artifactId>concepts</artifactId>
             <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>concepts</artifactId>
+                       <artifactId>framework</artifactId>
             <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>pcep-impl</artifactId>
+                       <artifactId>pcep-api</artifactId>
             <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>pcep-impl</artifactId>
             <version>${project.version}</version>
-                       <type>test-jar</type>
                </dependency>
                <dependency>
-                       <groupId>ch.qos.logback</groupId>
-                       <artifactId>logback-classic</artifactId>
-                       <version>${logback.version}</version>
+                       <groupId>com.google.guava</groupId>
+                       <artifactId>guava</artifactId>
+                       <version>${guava.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>slf4j-api</artifactId>
+                       <version>${slf4j.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.codehaus.groovy</groupId>

diff --git a/pom.xml b/pom.xml
index 4662df1ed16b04ae39299c48a3f377b55c8b4cac..b1237530a998395d8b26c520d879d9c759d93827 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@
                <maven.bundle.version>2.4.0</maven.bundle.version>
                <maven.compiler.version>3.1</maven.compiler.version>
                <maven.shade.version>2.1</maven.shade.version>
+               <mockito.version>1.9.5</mockito.version>
                <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
                <slf4j.version>1.7.2</slf4j.version>
                <surefire.version>2.15</surefire.version>
@@ -114,7 +115,7 @@
                                <artifactId>maven-dependency-plugin</artifactId>
                                <version>${dependency.version}</version>
                                <configuration>
-                                       <!--failOnWarning>true</failOnWarning -->
+                                       <failOnWarning>true</failOnWarning>
                                        <ignoreNonCompile>true</ignoreNonCompile>
                                </configuration>
                        </plugin>