BUG-63: remove dependency on netty-all

We pull only the artifacts needed. This also cleans up some dependency
issues.

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

diff --git a/bgp/concepts/pom.xml b/bgp/concepts/pom.xml
index fe2ad6d72f4bfd2b5cff4fd8dd45b145e18020c3..32d4a0439e6c4b90057674cb93571a038975083c 100644 (file)
--- a/bgp/concepts/pom.xml
+++ b/bgp/concepts/pom.xml
@@ -24,11 +24,6 @@
                        <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>

diff --git a/bgp/linkstate/pom.xml b/bgp/linkstate/pom.xml
index b42314f8f73f2a01645bb87184f25bcd546da964..52e90199e7de587147109f23b138809334649599 100644 (file)
--- a/bgp/linkstate/pom.xml
+++ b/bgp/linkstate/pom.xml
@@ -39,6 +39,11 @@
                        <artifactId>guava</artifactId>
                        <version>${guava.version}</version>
                </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>ietf-inet-types</artifactId>
+            <version>2010.09.24-SNAPSHOT</version>
+        </dependency>
        </dependencies>
 
        <build>

diff --git a/bgp/parser-api/pom.xml b/bgp/parser-api/pom.xml
index 806282d48915606c8334b7a7c31fe82087fb0d91..853f9a5d8c8837bc6172815ebab74a8455876898 100644 (file)
--- a/bgp/parser-api/pom.xml
+++ b/bgp/parser-api/pom.xml
@@ -54,6 +54,11 @@
                        <artifactId>slf4j-api</artifactId>
                        <version>${slf4j.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>ietf-inet-types</artifactId>
+            <version>2010.09.24-SNAPSHOT</version>
+        </dependency>
        </dependencies>
 
        <build>

diff --git a/bgp/parser-impl/pom.xml b/bgp/parser-impl/pom.xml
index d6b891d39f09373ddd77bc16931a7d6fc64eafd9..12fe6df4cc25b36dd03773602b3e704e8f881a4c 100644 (file)
--- a/bgp/parser-impl/pom.xml
+++ b/bgp/parser-impl/pom.xml
@@ -69,6 +69,11 @@
                        <artifactId>jsr305</artifactId>
                        <version>2.0.1</version>
                </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>ietf-inet-types</artifactId>
+            <version>2010.09.24-SNAPSHOT</version>
+        </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>mockito-configuration</artifactId>

diff --git a/bgp/parser-mock/pom.xml b/bgp/parser-mock/pom.xml
index 046f234d6bca68541f4de833595ddfa48f480973..0cf4b32e83f163922dde04cea4f2fb14260982c0 100644 (file)
--- a/bgp/parser-mock/pom.xml
+++ b/bgp/parser-mock/pom.xml
@@ -60,6 +60,12 @@
             <version>${project.version}</version>
                        <scope>test</scope>
                </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>ietf-inet-types</artifactId>
+            <version>2010.09.24-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
        </dependencies>
 
        <build>

diff --git a/bgp/rib-impl/pom.xml b/bgp/rib-impl/pom.xml
index 5a90c8c4977c7ca3512961c0bfeaef6790f05ab1..d69a52f901962fc52b3a6735f659b373a6c673cd 100644 (file)
--- a/bgp/rib-impl/pom.xml
+++ b/bgp/rib-impl/pom.xml
@@ -69,6 +69,21 @@
                        <artifactId>guava</artifactId>
                        <version>${guava.version}</version>
                </dependency>
+        <dependency>
+                       <groupId>io.netty</groupId>
+                       <artifactId>netty-codec</artifactId>
+            <version>${netty.version}</version>
+               </dependency>
+        <dependency>
+                       <groupId>io.netty</groupId>
+                       <artifactId>netty-common</artifactId>
+            <version>${netty.version}</version>
+               </dependency>
+        <dependency>
+                       <groupId>io.netty</groupId>
+                       <artifactId>netty-transport</artifactId>
+            <version>${netty.version}</version>
+               </dependency>
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>

diff --git a/bgp/util/pom.xml b/bgp/util/pom.xml
index 6a7e131f5fc0eb8c5808f7f04fa78e4a92aab84b..c9c81778e2370536abdf5984f337b2af1aa3fad8 100644 (file)
--- a/bgp/util/pom.xml
+++ b/bgp/util/pom.xml
@@ -64,6 +64,12 @@
                        <artifactId>slf4j-api</artifactId>
                        <version>${slf4j.version}</version>
                </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>ietf-inet-types</artifactId>
+            <version>2010.09.24-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
        </dependencies>
 
        <build>

diff --git a/framework/pom.xml b/framework/pom.xml
index 608ca3057d78d3e36d09fd82b05e4bdc92569166..89404be8740bc8caa939fae504610040ba8fc571 100644 (file)
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -19,14 +19,24 @@
        </prerequisites>
 
        <dependencies>
-               <dependency>
-                       <groupId>org.opendaylight.bgpcep</groupId>
-                       <artifactId>util</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
                        <groupId>io.netty</groupId>
-                       <artifactId>netty-all</artifactId>
+                       <artifactId>netty-buffer</artifactId>
+            <version>${netty.version}</version>
+               </dependency>
+        <dependency>
+                       <groupId>io.netty</groupId>
+                       <artifactId>netty-codec</artifactId>
+            <version>${netty.version}</version>
+               </dependency>
+        <dependency>
+                       <groupId>io.netty</groupId>
+                       <artifactId>netty-common</artifactId>
+            <version>${netty.version}</version>
+               </dependency>
+        <dependency>
+                       <groupId>io.netty</groupId>
+                       <artifactId>netty-transport</artifactId>
             <version>${netty.version}</version>
                </dependency>
                <dependency>

diff --git a/pcep/api/pom.xml b/pcep/api/pom.xml
index 7d597c94a358637843f06b9c7086e46473e7f499..37192d45b0eb6c408d13ed75201eb301fbf185e9 100644 (file)
--- a/pcep/api/pom.xml
+++ b/pcep/api/pom.xml
@@ -34,6 +34,16 @@
                        <artifactId>util</artifactId>
             <version>${project.version}</version>
                </dependency>
+        <dependency>
+                       <groupId>io.netty</groupId>
+                       <artifactId>netty-transport</artifactId>
+            <version>${netty.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/pcep/impl/pom.xml b/pcep/impl/pom.xml
index 23a4e67cd3a626c127822ba42c0528aad7668f7b..e902bf3bedf5e4171dba2f1c7ee3192f09398f34 100644 (file)
--- a/pcep/impl/pom.xml
+++ b/pcep/impl/pom.xml
@@ -39,11 +39,41 @@
                        <artifactId>concepts</artifactId>
                        <version>${project.version}</version>
                </dependency>
+        <dependency>
+                       <groupId>io.netty</groupId>
+                       <artifactId>netty-codec</artifactId>
+            <version>${netty.version}</version>
+               </dependency>
+        <dependency>
+                       <groupId>io.netty</groupId>
+                       <artifactId>netty-common</artifactId>
+            <version>${netty.version}</version>
+               </dependency>
+        <dependency>
+                       <groupId>io.netty</groupId>
+                       <artifactId>netty-transport</artifactId>
+            <version>${netty.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.google.guava</groupId>
+                       <artifactId>guava</artifactId>
+                       <version>${guava.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.google.code.findbugs</groupId>
+                       <artifactId>jsr305</artifactId>
+                       <version>2.0.1</version>
+               </dependency>
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>
                        <version>${slf4j.version}</version>
                </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>ietf-inet-types</artifactId>
+            <version>2010.09.24-SNAPSHOT</version>
+        </dependency>
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-core</artifactId>

diff --git a/pcep/testtool/pom.xml b/pcep/testtool/pom.xml
index 49beae2bf17a8fdc3069bc34550458ea6aff7744..5fc7aa02873b5dc0509f901875f9b2a81d6895e1 100644 (file)
--- a/pcep/testtool/pom.xml
+++ b/pcep/testtool/pom.xml
@@ -39,6 +39,21 @@
                        <artifactId>pcep-impl</artifactId>
             <version>${project.version}</version>
                </dependency>
+        <dependency>
+                       <groupId>io.netty</groupId>
+                       <artifactId>netty-common</artifactId>
+            <version>${netty.version}</version>
+               </dependency>
+        <dependency>
+                       <groupId>io.netty</groupId>
+                       <artifactId>netty-transport</artifactId>
+            <version>${netty.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>