From 5618229203fd89a060455d2984f3aa44e05aa01a Mon Sep 17 00:00:00 2001 From: Feri73 Date: Thu, 6 Dec 2018 00:01:14 -0800 Subject: [PATCH] Correcting Maven Dependencies (#8622) Motivation: Most of the maven modules do not explicitly declare their dependencies and rely on transitivity, which is not always correct. Modifications: For all maven modules, add all of their dependencies to pom.xml Result: All of the (essentially non-transitive) depepdencies of the modules are explicitly declared in pom.xml --- codec-dns/pom.xml | 15 +++++++++++++ codec-haproxy/pom.xml | 10 +++++++++ codec-http/pom.xml | 15 +++++++++++++ codec-http2/pom.xml | 25 ++++++++++++++++++++++ codec-memcache/pom.xml | 15 +++++++++++++ codec-mqtt/pom.xml | 15 +++++++++++++ codec-redis/pom.xml | 15 +++++++++++++ codec-smtp/pom.xml | 15 +++++++++++++ codec-socks/pom.xml | 15 +++++++++++++ codec-stomp/pom.xml | 15 +++++++++++++ codec-xml/pom.xml | 9 ++++++-- codec/pom.xml | 10 +++++++++ example/pom.xml | 18 +++++++++++++++- handler-proxy/pom.xml | 16 ++++++++++++++ handler/pom.xml | 5 +++++ resolver-dns/pom.xml | 19 ++++++++++++++-- testsuite-autobahn/pom.xml | 15 +++++++++++++ testsuite-http2/pom.xml | 20 +++++++++++++++++ testsuite/pom.xml | 15 +++++++++++++ transport-native-epoll/pom.xml | 4 ++-- transport-native-kqueue/pom.xml | 4 ++-- transport-native-unix-common-tests/pom.xml | 5 +++++ transport-native-unix-common/pom.xml | 5 +++++ transport-sctp/pom.xml | 5 +++++ transport/pom.xml | 5 +++++ 25 files changed, 301 insertions(+), 9 deletions(-) diff --git a/codec-dns/pom.xml b/codec-dns/pom.xml index 114e55efee..9ec081fab3 100644 --- a/codec-dns/pom.xml +++ b/codec-dns/pom.xml @@ -33,6 +33,21 @@ + + ${project.groupId} + netty-common + ${project.version} + + + ${project.groupId} + netty-buffer + ${project.version} + + + ${project.groupId} + netty-transport + ${project.version} + ${project.groupId} netty-codec diff --git a/codec-haproxy/pom.xml b/codec-haproxy/pom.xml index 35b954c882..749a7ec1b6 100644 --- a/codec-haproxy/pom.xml +++ b/codec-haproxy/pom.xml @@ -33,6 +33,16 @@ + + ${project.groupId} + netty-buffer + ${project.version} + + + ${project.groupId} + netty-transport + ${project.version} + ${project.groupId} netty-codec diff --git a/codec-http/pom.xml b/codec-http/pom.xml index 137b585338..36606e269f 100644 --- a/codec-http/pom.xml +++ b/codec-http/pom.xml @@ -33,6 +33,21 @@ + + ${project.groupId} + netty-common + ${project.version} + + + ${project.groupId} + netty-buffer + ${project.version} + + + ${project.groupId} + netty-transport + ${project.version} + ${project.groupId} netty-codec diff --git a/codec-http2/pom.xml b/codec-http2/pom.xml index 229a1fab5f..78bc0c0d99 100644 --- a/codec-http2/pom.xml +++ b/codec-http2/pom.xml @@ -33,6 +33,31 @@ + + ${project.groupId} + netty-common + ${project.version} + + + ${project.groupId} + netty-buffer + ${project.version} + + + ${project.groupId} + netty-transport + ${project.version} + + + ${project.groupId} + netty-codec + ${project.version} + + + ${project.groupId} + netty-handler + ${project.version} + ${project.groupId} netty-codec-http diff --git a/codec-memcache/pom.xml b/codec-memcache/pom.xml index ceddcdaa41..9818f2fbb2 100644 --- a/codec-memcache/pom.xml +++ b/codec-memcache/pom.xml @@ -33,6 +33,21 @@ + + ${project.groupId} + netty-common + ${project.version} + + + ${project.groupId} + netty-buffer + ${project.version} + + + ${project.groupId} + netty-transport + ${project.version} + ${project.groupId} netty-codec diff --git a/codec-mqtt/pom.xml b/codec-mqtt/pom.xml index 7eafc64856..a21cf0fbe2 100644 --- a/codec-mqtt/pom.xml +++ b/codec-mqtt/pom.xml @@ -33,6 +33,21 @@ + + ${project.groupId} + netty-common + ${project.version} + + + ${project.groupId} + netty-buffer + ${project.version} + + + ${project.groupId} + netty-transport + ${project.version} + ${project.groupId} netty-codec diff --git a/codec-redis/pom.xml b/codec-redis/pom.xml index cbf7aa235b..15902a8473 100644 --- a/codec-redis/pom.xml +++ b/codec-redis/pom.xml @@ -33,6 +33,21 @@ + + ${project.groupId} + netty-common + ${project.version} + + + ${project.groupId} + netty-buffer + ${project.version} + + + ${project.groupId} + netty-transport + ${project.version} + ${project.groupId} netty-codec diff --git a/codec-smtp/pom.xml b/codec-smtp/pom.xml index ae62018962..329b10a099 100644 --- a/codec-smtp/pom.xml +++ b/codec-smtp/pom.xml @@ -33,6 +33,21 @@ + + ${project.groupId} + netty-common + ${project.version} + + + ${project.groupId} + netty-buffer + ${project.version} + + + ${project.groupId} + netty-transport + ${project.version} + ${project.groupId} netty-codec diff --git a/codec-socks/pom.xml b/codec-socks/pom.xml index 66c6612393..69d780e0d2 100644 --- a/codec-socks/pom.xml +++ b/codec-socks/pom.xml @@ -33,6 +33,21 @@ + + ${project.groupId} + netty-common + ${project.version} + + + ${project.groupId} + netty-buffer + ${project.version} + + + ${project.groupId} + netty-transport + ${project.version} + ${project.groupId} netty-codec diff --git a/codec-stomp/pom.xml b/codec-stomp/pom.xml index d70080f256..93f03be651 100644 --- a/codec-stomp/pom.xml +++ b/codec-stomp/pom.xml @@ -33,6 +33,21 @@ + + ${project.groupId} + netty-common + ${project.version} + + + ${project.groupId} + netty-buffer + ${project.version} + + + ${project.groupId} + netty-transport + ${project.version} + ${project.groupId} netty-codec diff --git a/codec-xml/pom.xml b/codec-xml/pom.xml index 0684794d68..00ccf84cc1 100644 --- a/codec-xml/pom.xml +++ b/codec-xml/pom.xml @@ -35,12 +35,17 @@ ${project.groupId} - netty-codec + netty-buffer ${project.version} ${project.groupId} - netty-handler + netty-transport + ${project.version} + + + ${project.groupId} + netty-codec ${project.version} diff --git a/codec/pom.xml b/codec/pom.xml index a23f1100f9..0aa78400eb 100644 --- a/codec/pom.xml +++ b/codec/pom.xml @@ -33,6 +33,16 @@ + + ${project.groupId} + netty-common + ${project.version} + + + ${project.groupId} + netty-buffer + ${project.version} + ${project.groupId} netty-transport diff --git a/example/pom.xml b/example/pom.xml index bf0f156031..d3c4757625 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -30,6 +30,16 @@ Netty/Example + + ${project.groupId} + netty-common + ${project.version} + + + ${project.groupId} + netty-buffer + ${project.version} + ${project.groupId} netty-transport @@ -37,7 +47,7 @@ ${project.groupId} - netty-transport-sctp + netty-codec ${project.version} @@ -45,6 +55,11 @@ netty-handler ${project.version} + + ${project.groupId} + netty-transport-sctp + ${project.version} + ${project.groupId} netty-handler-proxy @@ -80,6 +95,7 @@ netty-codec-stomp ${project.version} + com.google.protobuf protobuf-java diff --git a/handler-proxy/pom.xml b/handler-proxy/pom.xml index a3ce301707..951eb40c95 100644 --- a/handler-proxy/pom.xml +++ b/handler-proxy/pom.xml @@ -35,11 +35,26 @@ Netty/Handler/Proxy + + ${project.groupId} + netty-common + ${project.version} + + + ${project.groupId} + netty-buffer + ${project.version} + ${project.groupId} netty-transport ${project.version} + + ${project.groupId} + netty-codec + ${project.version} + ${project.groupId} netty-codec-socks @@ -50,6 +65,7 @@ netty-codec-http ${project.version} + ${project.groupId} netty-handler diff --git a/handler/pom.xml b/handler/pom.xml index 48d7eb8bca..7a17fdff1e 100644 --- a/handler/pom.xml +++ b/handler/pom.xml @@ -35,6 +35,11 @@ Netty/Handler + + ${project.groupId} + netty-common + ${project.version} + ${project.groupId} netty-buffer diff --git a/resolver-dns/pom.xml b/resolver-dns/pom.xml index 0067568dfc..8a918c4b97 100644 --- a/resolver-dns/pom.xml +++ b/resolver-dns/pom.xml @@ -33,6 +33,16 @@ + + ${project.groupId} + netty-common + ${project.version} + + + ${project.groupId} + netty-buffer + ${project.version} + ${project.groupId} netty-resolver @@ -40,12 +50,17 @@ ${project.groupId} - netty-codec-dns + netty-transport ${project.version} ${project.groupId} - netty-transport + netty-codec + ${project.version} + + + ${project.groupId} + netty-codec-dns ${project.version} diff --git a/testsuite-autobahn/pom.xml b/testsuite-autobahn/pom.xml index 72bcd2c7c1..7813686a9c 100644 --- a/testsuite-autobahn/pom.xml +++ b/testsuite-autobahn/pom.xml @@ -29,6 +29,21 @@ Netty/Testsuite/Autobahn + + ${project.groupId} + netty-common + ${project.version} + + + ${project.groupId} + netty-buffer + ${project.version} + + + ${project.groupId} + netty-transport + ${project.version} + ${project.groupId} netty-codec-http diff --git a/testsuite-http2/pom.xml b/testsuite-http2/pom.xml index 3cf41ca710..3e0880937c 100644 --- a/testsuite-http2/pom.xml +++ b/testsuite-http2/pom.xml @@ -29,6 +29,26 @@ Netty/Testsuite/Http2 + + ${project.groupId} + netty-common + ${project.version} + + + ${project.groupId} + netty-buffer + ${project.version} + + + ${project.groupId} + netty-transport + ${project.version} + + + ${project.groupId} + netty-handler + ${project.version} + ${project.groupId} netty-codec-http diff --git a/testsuite/pom.xml b/testsuite/pom.xml index 6262d0b663..1e38ee1d7d 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -29,6 +29,21 @@ Netty/Testsuite + + ${project.groupId} + netty-common + ${project.version} + + + ${project.groupId} + netty-buffer + ${project.version} + + + ${project.groupId} + netty-transport + ${project.version} + ${project.groupId} netty-transport-sctp diff --git a/transport-native-epoll/pom.xml b/transport-native-epoll/pom.xml index ab7574566e..ec7d927100 100644 --- a/transport-native-epoll/pom.xml +++ b/transport-native-epoll/pom.xml @@ -319,12 +319,12 @@ io.netty - netty-transport-native-unix-common + netty-transport ${project.version} io.netty - netty-transport + netty-transport-native-unix-common ${project.version} diff --git a/transport-native-kqueue/pom.xml b/transport-native-kqueue/pom.xml index 0ad61c20be..e2d6b95227 100644 --- a/transport-native-kqueue/pom.xml +++ b/transport-native-kqueue/pom.xml @@ -379,12 +379,12 @@ io.netty - netty-transport-native-unix-common + netty-transport ${project.version} io.netty - netty-transport + netty-transport-native-unix-common ${project.version} diff --git a/transport-native-unix-common-tests/pom.xml b/transport-native-unix-common-tests/pom.xml index b3156d842d..a65a4a24b3 100644 --- a/transport-native-unix-common-tests/pom.xml +++ b/transport-native-unix-common-tests/pom.xml @@ -30,6 +30,11 @@ + + io.netty + netty-transport + ${project.version} + io.netty netty-transport-native-unix-common diff --git a/transport-native-unix-common/pom.xml b/transport-native-unix-common/pom.xml index 2b63849799..caeeac6c78 100644 --- a/transport-native-unix-common/pom.xml +++ b/transport-native-unix-common/pom.xml @@ -332,6 +332,11 @@ netty-common ${project.version} + + io.netty + netty-buffer + ${project.version} + io.netty netty-transport diff --git a/transport-sctp/pom.xml b/transport-sctp/pom.xml index b9a15c3082..4657f2d8d6 100644 --- a/transport-sctp/pom.xml +++ b/transport-sctp/pom.xml @@ -33,6 +33,11 @@ + + ${project.groupId} + netty-common + ${project.version} + ${project.groupId} netty-buffer diff --git a/transport/pom.xml b/transport/pom.xml index ffd76e1aa2..0fb4e6a423 100644 --- a/transport/pom.xml +++ b/transport/pom.xml @@ -33,6 +33,11 @@ + + ${project.groupId} + netty-common + ${project.version} + ${project.groupId} netty-buffer