From 9e708abf359140860ce23816b725dcede996b951 Mon Sep 17 00:00:00 2001 From: "Claudio D. Gasparini" Date: Fri, 15 Jun 2018 11:37:30 +0200 Subject: [PATCH] Enforce fail on maven-dependency-plugin warning - fix complains Change-Id: I2917adc88b3251f39afceff371996d26a6501dbc Signed-off-by: Claudio D. Gasparini --- bgp/benchmark-app/pom.xml | 12 +- bgp/cli/pom.xml | 32 ++++- bgp/concepts/pom.xml | 4 - bgp/evpn/pom.xml | 73 ++++++++--- bgp/flowspec/pom.xml | 22 ++-- bgp/inet/pom.xml | 28 ++++- bgp/l3vpn/pom.xml | 63 +++++++--- bgp/labeled-unicast/pom.xml | 17 +-- bgp/linkstate/pom.xml | 59 ++++----- bgp/mvpn/pom.xml | 62 +++++++--- bgp/openconfig-api/pom.xml | 9 +- bgp/openconfig-rp-impl/pom.xml | 24 +++- bgp/openconfig-rp-spi/pom.xml | 28 ++++- bgp/openconfig-rp-statement/pom.xml | 25 ++++ bgp/openconfig-spi/pom.xml | 18 ++- bgp/openconfig-state/pom.xml | 63 +++++++++- bgp/parser-api/pom.xml | 9 +- bgp/parser-impl/pom.xml | 12 +- bgp/parser-mock/pom.xml | 4 - bgp/parser-spi/pom.xml | 8 +- bgp/path-selection-mode/pom.xml | 24 ++-- bgp/peer-acceptor/pom.xml | 38 +++++- bgp/rib-api/pom.xml | 4 + bgp/rib-impl/pom.xml | 113 ++++++++++++++++-- bgp/rib-mock/pom.xml | 5 +- bgp/rib-spi/pom.xml | 21 +++- bgp/testtool/pom.xml | 20 ++++ bgp/topology-provider/pom.xml | 21 ++-- bgp/util/pom.xml | 9 +- binding-parent/pom.xml | 16 +++ bmp/bmp-api/pom.xml | 4 - bmp/bmp-impl/pom.xml | 38 +++--- bmp/bmp-mock/pom.xml | 32 +++-- bmp/bmp-parser-impl/pom.xml | 35 +++++- bmp/bmp-spi/pom.xml | 17 ++- concepts/pom.xml | 8 +- .../bmp-monitors-config-loader/pom.xml | 37 +++++- config-loader/config-loader-impl/pom.xml | 38 +++++- config-loader/protocols-config-loader/pom.xml | 39 +++++- .../routing-policy-config-loader/pom.xml | 38 +++++- config-loader/topology-config-loader/pom.xml | 39 +++++- data-change-counter/pom.xml | 8 +- features/rsvp/odl-bgpcep-rsvp-api/pom.xml | 2 +- parent/pom.xml | 16 ++- pcep/api/pom.xml | 4 - pcep/auto-bandwidth-extension/pom.xml | 20 ++-- pcep/base-parser/pom.xml | 20 ++++ pcep/ietf-stateful07/pom.xml | 9 -- pcep/impl/pom.xml | 4 - pcep/pcc-mock/pom.xml | 20 ++-- pcep/segment-routing/pom.xml | 19 ++- pcep/spi/pom.xml | 10 +- pcep/testtool/pom.xml | 14 ++- pcep/topology/cli/pom.xml | 26 ++-- pcep/topology/topology-api/pom.xml | 4 + pcep/topology/topology-provider/pom.xml | 26 ++-- pcep/topology/topology-spi/pom.xml | 12 ++ pcep/topology/topology-stats/pom.xml | 22 +++- pcep/tunnel/tunnel-api/pom.xml | 4 + pcep/tunnel/tunnel-provider/pom.xml | 28 +++-- programming/api/pom.xml | 6 - programming/impl/pom.xml | 16 ++- programming/spi/pom.xml | 5 +- rsvp/api/pom.xml | 2 - rsvp/impl/pom.xml | 18 +-- rsvp/spi/pom.xml | 13 +- testtool-parent/pom.xml | 23 ++++ testtool-util/pom.xml | 16 ++- util/pom.xml | 4 +- 69 files changed, 1094 insertions(+), 445 deletions(-) diff --git a/bgp/benchmark-app/pom.xml b/bgp/benchmark-app/pom.xml index 979de1f01b..33d5978833 100644 --- a/bgp/benchmark-app/pom.xml +++ b/bgp/benchmark-app/pom.xml @@ -59,6 +59,10 @@ ${project.groupId} bgp-parser-api + + ${project.groupId} + bgp-parser-spi + ${project.groupId} bgp-concepts @@ -75,16 +79,16 @@ org.opendaylight.controller sal-common-api + + org.opendaylight.mdsal + mdsal-common-api + ${project.groupId} testtool-util test - - junit - junit - org.mockito mockito-core diff --git a/bgp/cli/pom.xml b/bgp/cli/pom.xml index 5b105194e9..fccdc49c1e 100644 --- a/bgp/cli/pom.xml +++ b/bgp/cli/pom.xml @@ -29,24 +29,48 @@ ${project.groupId} bgp-openconfig-api + + ${project.groupId} + util + org.opendaylight.controller sal-binding-api + + org.opendaylight.controller + sal-common-api + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + org.opendaylight.mdsal.model + ietf-yang-types-20130715 + org.apache.karaf.shell org.apache.karaf.shell.console provided - - junit - junit + org.apache.karaf.shell + org.apache.karaf.shell.core + provided + + com.google.guava + guava + + org.mockito mockito-core - test commons-io diff --git a/bgp/concepts/pom.xml b/bgp/concepts/pom.xml index 4aeada749d..473dfe7256 100644 --- a/bgp/concepts/pom.xml +++ b/bgp/concepts/pom.xml @@ -71,10 +71,6 @@ org.opendaylight.mdsal.model ietf-inet-types-2013-07-15 - - junit - junit - diff --git a/bgp/evpn/pom.xml b/bgp/evpn/pom.xml index 6a72a69f31..cc1af0d1ae 100644 --- a/bgp/evpn/pom.xml +++ b/bgp/evpn/pom.xml @@ -24,18 +24,6 @@ ${project.artifactId} - - org.opendaylight.yangtools - yang-data-api - - - org.opendaylight.yangtools - yang-data-impl - - - org.opendaylight.mdsal.model - yang-ext - ${project.groupId} bgp-concepts @@ -65,9 +53,8 @@ bgp-mvpn - org.osgi - org.osgi.core - provided + ${project.groupId} + util ${project.groupId} @@ -77,11 +64,60 @@ ${project.groupId} bgp-openconfig-spi - - junit - junit + ${project.groupId} + concepts + + + org.opendaylight.yangtools + yang-data-api + + org.opendaylight.yangtools + yang-data-impl + + + org.opendaylight.yangtools + yang-common + + + org.opendaylight.yangtools + concepts + + + org.opendaylight.mdsal + mdsal-binding-dom-codec + + + org.opendaylight.mdsal.model + yang-ext + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + org.opendaylight.mdsal.model + ietf-yang-types-20130715 + + + org.opendaylight.controller + sal-core-api + + + org.osgi + org.osgi.core + provided + + + com.google.guava + guava + + + io.netty + netty-buffer + + ${project.groupId} bgp-rib-spi @@ -99,7 +135,6 @@ org.mockito mockito-core - test org.opendaylight.mdsal diff --git a/bgp/flowspec/pom.xml b/bgp/flowspec/pom.xml index 2ef3ba0580..6973e2856c 100644 --- a/bgp/flowspec/pom.xml +++ b/bgp/flowspec/pom.xml @@ -57,7 +57,6 @@ ${project.groupId} util - org.slf4j slf4j-api @@ -66,11 +65,22 @@ com.google.guava guava - org.opendaylight.mdsal yang-binding + + org.opendaylight.mdsal + mdsal-binding-dom-codec + + + org.opendaylight.yangtools + yang-data-api + + + org.opendaylight.yangtools + yang-data-impl + org.opendaylight.yangtools yang-common @@ -85,9 +95,8 @@ org.opendaylight.controller - sal-common-api + sal-core-api - io.netty netty-buffer @@ -116,10 +125,6 @@ bgp-rib-spi test-jar - - junit - junit - org.opendaylight.yangtools mockito-configuration @@ -127,7 +132,6 @@ org.mockito mockito-core - test ${project.groupId} diff --git a/bgp/inet/pom.xml b/bgp/inet/pom.xml index e27bb43689..bda80cd0d5 100644 --- a/bgp/inet/pom.xml +++ b/bgp/inet/pom.xml @@ -41,7 +41,18 @@ ${project.groupId} bgp-rib-spi - + + ${project.groupId} + bgp-concepts + + + ${project.groupId} + util + + + org.opendaylight.yangtools + yang-data-api + org.opendaylight.mdsal yang-binding @@ -75,12 +86,19 @@ ${project.groupId} bgp-openconfig-spi - - - junit - junit + org.opendaylight.controller + sal-core-api + + + io.netty + netty-buffer + + org.opendaylight.mdsal + mdsal-binding-dom-codec + + ${project.groupId} bgp-rib-spi diff --git a/bgp/l3vpn/pom.xml b/bgp/l3vpn/pom.xml index 240533af46..a26bbb7160 100644 --- a/bgp/l3vpn/pom.xml +++ b/bgp/l3vpn/pom.xml @@ -38,8 +38,12 @@ bgp-parser-api - org.opendaylight.yangtools - concepts + ${project.groupId} + bgp-parser-spi + + + ${project.groupId} + util ${project.groupId} @@ -47,15 +51,15 @@ ${project.groupId} - bgp-concepts + bgp-rib-spi - org.opendaylight.yangtools - yang-common + ${project.groupId} + bgp-concepts - org.opendaylight.mdsal - yang-binding + ${project.groupId} + bgp-inet ${project.groupId} @@ -65,11 +69,6 @@ ${project.groupId} bgp-labeled-unicast - - org.osgi - org.osgi.core - provided - ${project.groupId} bgp-openconfig-api @@ -78,12 +77,44 @@ ${project.groupId} bgp-openconfig-spi - - - junit - junit + ${project.groupId} + concepts + + org.opendaylight.yangtools + concepts + + + org.opendaylight.yangtools + yang-common + + + org.opendaylight.yangtools + yang-data-api + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.mdsal + mdsal-binding-dom-codec + + + org.osgi + org.osgi.core + provided + + + org.opendaylight.controller + sal-core-api + + + io.netty + netty-buffer + + ${project.groupId} bgp-rib-spi diff --git a/bgp/labeled-unicast/pom.xml b/bgp/labeled-unicast/pom.xml index 3ee85418e0..a2c274e1f7 100644 --- a/bgp/labeled-unicast/pom.xml +++ b/bgp/labeled-unicast/pom.xml @@ -57,6 +57,10 @@ ${project.groupId} util + + ${project.groupId} + concepts + org.slf4j @@ -72,8 +76,8 @@ yang-binding - org.opendaylight.yangtools - yang-data-impl + org.opendaylight.mdsal + mdsal-binding-dom-codec org.opendaylight.yangtools @@ -91,10 +95,6 @@ org.opendaylight.mdsal.model ietf-inet-types-2013-07-15 - - org.opendaylight.controller - sal-common-api - org.opendaylight.controller sal-core-api @@ -119,10 +119,6 @@ bgp-openconfig-spi - - junit - junit - org.opendaylight.yangtools mockito-configuration @@ -130,7 +126,6 @@ org.mockito mockito-core - test ${project.groupId} diff --git a/bgp/linkstate/pom.xml b/bgp/linkstate/pom.xml index 75eb22fe1e..13229f2ae0 100644 --- a/bgp/linkstate/pom.xml +++ b/bgp/linkstate/pom.xml @@ -60,28 +60,54 @@ ${project.groupId} util - - org.slf4j - slf4j-api + ${project.groupId} + bgp-bmp-api + + + ${project.groupId} + bgp-openconfig-api + + + ${project.groupId} + bgp-openconfig-spi com.google.guava guava - + + org.opendaylight.controller + sal-core-api + org.opendaylight.mdsal yang-binding org.opendaylight.yangtools - yang-common + yang-data-api org.opendaylight.yangtools concepts + + org.opendaylight.yangtools + yang-data-impl + + + org.opendaylight.yangtools + yang-common + + + org.opendaylight.mdsal.model + yang-ext + + + org.opendaylight.mdsal + mdsal-binding-dom-codec + org.opendaylight.mdsal.model ietf-inet-types-2013-07-15 @@ -90,34 +116,17 @@ io.netty netty-buffer - org.osgi org.osgi.core provided - - ${project.groupId} - bgp-bmp-api - - - ${project.groupId} - bgp-openconfig-api - - - ${project.groupId} - bgp-openconfig-spi - ${project.groupId} rsvp-impl test - - junit - junit - org.opendaylight.yangtools mockito-configuration @@ -125,7 +134,6 @@ org.mockito mockito-core - test ${project.groupId} @@ -147,10 +155,6 @@ bgp-parser-impl test - - org.opendaylight.controller - sal-common-api - org.opendaylight.controller sal-binding-api @@ -175,7 +179,6 @@ org.hamcrest hamcrest-core - test diff --git a/bgp/mvpn/pom.xml b/bgp/mvpn/pom.xml index 73483ff288..73b25e7d4a 100644 --- a/bgp/mvpn/pom.xml +++ b/bgp/mvpn/pom.xml @@ -39,18 +39,6 @@ ${project.groupId} bgp-bmp-api - - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - yang-ext - - - org.opendaylight.mdsal - yang-binding - ${project.groupId} util @@ -59,6 +47,10 @@ ${project.groupId} bgp-concepts + + ${project.groupId} + concepts + ${project.groupId} bgp-rib-api @@ -75,11 +67,51 @@ ${project.groupId} bgp-openconfig-spi - - junit - junit + org.opendaylight.controller + sal-core-api + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + org.opendaylight.mdsal.model + ietf-yang-types-20130715 + + org.opendaylight.mdsal.model + yang-ext + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.mdsal + mdsal-binding-dom-codec + + + org.opendaylight.yangtools + yang-common + + + org.opendaylight.yangtools + concepts + + + org.opendaylight.yangtools + yang-data-api + + + io.netty + netty-buffer + + + com.google.guava + guava + + ${project.groupId} bgp-rib-spi diff --git a/bgp/openconfig-api/pom.xml b/bgp/openconfig-api/pom.xml index a8cfa0bf65..01487f4479 100644 --- a/bgp/openconfig-api/pom.xml +++ b/bgp/openconfig-api/pom.xml @@ -59,14 +59,11 @@ ${project.groupId} - bgp-rib-api + bgp-concepts - - - junit - junit - test + ${project.groupId} + bgp-rib-api diff --git a/bgp/openconfig-rp-impl/pom.xml b/bgp/openconfig-rp-impl/pom.xml index de69e52f85..6be2caedcf 100644 --- a/bgp/openconfig-rp-impl/pom.xml +++ b/bgp/openconfig-rp-impl/pom.xml @@ -27,10 +27,6 @@ ${project.groupId} bgp-concepts - - ${project.groupId} - config-loader-spi - ${project.groupId} bgp-openconfig-api @@ -41,16 +37,32 @@ ${project.groupId} - bgp-rib-api + bgp-rib-spi ${project.groupId} - bgp-rib-spi + bgp-parser-api org.opendaylight.controller sal-binding-api + + org.opendaylight.controller + sal-common-api + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + com.google.guava + guava + org.mockito diff --git a/bgp/openconfig-rp-spi/pom.xml b/bgp/openconfig-rp-spi/pom.xml index a131a5eba7..47b8bcf5ab 100644 --- a/bgp/openconfig-rp-spi/pom.xml +++ b/bgp/openconfig-rp-spi/pom.xml @@ -27,26 +27,42 @@ ${project.groupId} bgp-concepts - - ${project.groupId} - bgp-inet - ${project.groupId} bgp-openconfig-api ${project.groupId} - bgp-rib-api + bgp-rib-spi ${project.groupId} - bgp-rib-spi + bgp-parser-api org.opendaylight.controller sal-binding-api + + org.opendaylight.controller + sal-common-api + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + org.opendaylight.yangtools + concepts + + + com.google.guava + guava + ${project.groupId} diff --git a/bgp/openconfig-rp-statement/pom.xml b/bgp/openconfig-rp-statement/pom.xml index e5c395cd1e..79d15d1b54 100644 --- a/bgp/openconfig-rp-statement/pom.xml +++ b/bgp/openconfig-rp-statement/pom.xml @@ -43,6 +43,10 @@ ${project.groupId} bgp-rib-api + + ${project.groupId} + bgp-rib-spi + ${project.groupId} util @@ -51,6 +55,27 @@ org.opendaylight.controller sal-binding-api + + org.opendaylight.controller + sal-common-api + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + com.google.guava + guava + + + org.apache.commons + commons-lang3 + + ${project.groupId} config-loader-impl diff --git a/bgp/openconfig-spi/pom.xml b/bgp/openconfig-spi/pom.xml index d94f46593c..e912cc24c1 100644 --- a/bgp/openconfig-spi/pom.xml +++ b/bgp/openconfig-spi/pom.xml @@ -33,11 +33,23 @@ ${project.groupId} bgp-openconfig-api - - junit - junit + ${project.groupId} + bgp-concepts + + + ${project.groupId} + bgp-rib-api + + + org.opendaylight.yangtools + concepts + + com.google.guava + guava + + org.mockito mockito-core diff --git a/bgp/openconfig-state/pom.xml b/bgp/openconfig-state/pom.xml index 83cb722a4a..c06864fc3c 100644 --- a/bgp/openconfig-state/pom.xml +++ b/bgp/openconfig-state/pom.xml @@ -23,23 +23,78 @@ ${project.artifactId} + + ${project.groupId} + bgp-rib-api + ${project.groupId} bgp-rib-spi - org.opendaylight.bgpcep + ${project.groupId} bgp-openconfig-api - org.opendaylight.bgpcep + ${project.groupId} bgp-openconfig-spi + + ${project.groupId} + bgp-concepts + + + org.opendaylight.yangtools + yang-common + + + org.opendaylight.yangtools + concepts + org.opendaylight.controller sal-binding-api + + org.opendaylight.controller + sal-common-api + + + org.opendaylight.yangtools + yang-data-api + + + org.opendaylight.mdsal + mdsal-common-api + + + org.opendaylight.mdsal.model + ietf-yang-types-20130715 + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + com.google.guava + guava + + + org.opendaylight.controller + sal-core-api + test + + + org.opendaylight.controller + sal-core-spi + test + + + org.opendaylight.controller + sal-inmemory-datastore + test + ${project.groupId} bgp-rib-spi @@ -76,10 +131,6 @@ org.opendaylight.yangtools mockito-configuration - - junit - junit - diff --git a/bgp/parser-api/pom.xml b/bgp/parser-api/pom.xml index adf59f21d0..0869c46a2f 100644 --- a/bgp/parser-api/pom.xml +++ b/bgp/parser-api/pom.xml @@ -44,7 +44,10 @@ org.slf4j slf4j-api - + + org.opendaylight.yangtools + yang-data-api + org.opendaylight.mdsal yang-binding @@ -66,10 +69,6 @@ org.opendaylight.mdsal.model yang-ext - - junit - junit - diff --git a/bgp/parser-impl/pom.xml b/bgp/parser-impl/pom.xml index 2668a46942..2822959d6d 100644 --- a/bgp/parser-impl/pom.xml +++ b/bgp/parser-impl/pom.xml @@ -8,7 +8,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 @@ -69,20 +70,19 @@ org.opendaylight.yangtools mockito-configuration - - junit - junit - org.hamcrest hamcrest-core - test ${project.groupId} bgp-util test + + org.mockito + mockito-core + diff --git a/bgp/parser-mock/pom.xml b/bgp/parser-mock/pom.xml index 61cfcc5d54..a717346c73 100644 --- a/bgp/parser-mock/pom.xml +++ b/bgp/parser-mock/pom.xml @@ -55,10 +55,6 @@ bgp-inet test - - junit - junit - com.google.guava guava diff --git a/bgp/parser-spi/pom.xml b/bgp/parser-spi/pom.xml index 7687c0ee22..8c2129aa2d 100644 --- a/bgp/parser-spi/pom.xml +++ b/bgp/parser-spi/pom.xml @@ -60,11 +60,11 @@ org.opendaylight.yangtools - yang-data-impl + yang-data-api org.opendaylight.yangtools - concepts + yang-data-impl org.opendaylight.mdsal.model @@ -82,10 +82,6 @@ - - junit - junit - org.mockito mockito-core diff --git a/bgp/path-selection-mode/pom.xml b/bgp/path-selection-mode/pom.xml index 7ca49fe5b1..87a9263b2d 100644 --- a/bgp/path-selection-mode/pom.xml +++ b/bgp/path-selection-mode/pom.xml @@ -38,20 +38,24 @@ bgp-rib-spi - org.opendaylight.yangtools - yang-data-api + ${project.groupId} + bgp-parser-spi - org.opendaylight.yangtools - yang-data-impl + ${project.groupId} + bgp-concepts - com.google.guava - guava + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 - org.opendaylight.controller - sal-broker-impl + org.opendaylight.mdsal + yang-binding + + + com.google.guava + guava @@ -62,10 +66,6 @@ org.opendaylight.yangtools mockito-configuration - - junit - junit - org.opendaylight.bgpcep bgp-inet diff --git a/bgp/peer-acceptor/pom.xml b/bgp/peer-acceptor/pom.xml index 1461f65c4e..5858017a4d 100644 --- a/bgp/peer-acceptor/pom.xml +++ b/bgp/peer-acceptor/pom.xml @@ -24,18 +24,52 @@ ${project.artifactId} + + ${project.groupId} + bgp-rib-spi + ${project.groupId} bgp-rib-impl + + ${project.groupId} + concepts + + + ${project.groupId} + bgp-parser-api + org.opendaylight.mdsal.model ietf-inet-types-2013-07-15 - junit - junit + org.opendaylight.yangtools + yang-common + + + org.opendaylight.yangtools + concepts + + + io.netty + netty-transport-native-epoll + linux-x86_64 + + + io.netty + netty-transport + + + io.netty + netty-common + + + com.google.guava + guava + ${project.groupId} bgp-rib-impl diff --git a/bgp/rib-api/pom.xml b/bgp/rib-api/pom.xml index eb3e673efd..c6256e2145 100644 --- a/bgp/rib-api/pom.xml +++ b/bgp/rib-api/pom.xml @@ -37,6 +37,10 @@ ${project.groupId} concepts + + org.opendaylight.mdsal.model + yang-ext + org.opendaylight.mdsal yang-binding diff --git a/bgp/rib-impl/pom.xml b/bgp/rib-impl/pom.xml index 19070c9e8b..17575c6e63 100644 --- a/bgp/rib-impl/pom.xml +++ b/bgp/rib-impl/pom.xml @@ -31,11 +31,11 @@ ${project.groupId} - bgp-rib-spi + bgp-rib-api ${project.groupId} - config-loader-spi + bgp-rib-spi ${project.groupId} @@ -57,14 +57,98 @@ ${project.groupId} bgp-inet + + ${project.groupId} + bgp-parser-api + + + ${project.groupId} + bgp-parser-spi + ${project.groupId} bgp-parser-impl + + ${project.groupId} + util + + + ${project.groupId} + concepts + + + org.opendaylight.controller + sal-core-api + + + org.opendaylight.controller + sal-binding-api + + + org.opendaylight.controller + sal-common-api + + + org.opendaylight.yangtools + yang-data-api + + + org.opendaylight.yangtools + yang-data-impl + + + org.opendaylight.yangtools + yang-model-api + + + org.opendaylight.yangtools + yang-common + org.opendaylight.mdsal mdsal-binding-generator-impl + + org.opendaylight.mdsal.model + ietf-yang-types-20130715 + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + org.opendaylight.mdsal + mdsal-dom-api + + + org.opendaylight.mdsal + mdsal-common-api + + + org.opendaylight.mdsal + mdsal-singleton-common-api + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.mdsal + mdsal-binding-generator-api + + + org.opendaylight.mdsal + mdsal-binding-dom-codec + + + org.opendaylight.yangtools + concepts + + + org.apache.commons + commons-lang3 + org.osgi org.osgi.core @@ -74,12 +158,31 @@ org.osgi org.osgi.compendium - + + com.google.guava + guava + + + org.javassist + javassist + io.netty netty-codec + + io.netty + netty-common + + + io.netty + netty-transport + + + io.netty + netty-buffer + io.netty netty-transport-native-epoll @@ -158,10 +261,6 @@ slf4j-simple test - - junit - junit - ${project.groupId} bgp-config-example diff --git a/bgp/rib-mock/pom.xml b/bgp/rib-mock/pom.xml index 650ac4b877..c838b01cc3 100644 --- a/bgp/rib-mock/pom.xml +++ b/bgp/rib-mock/pom.xml @@ -41,7 +41,10 @@ ${project.groupId} bgp-rib-spi - + + io.netty + netty-transport + org.opendaylight.yangtools concepts diff --git a/bgp/rib-spi/pom.xml b/bgp/rib-spi/pom.xml index bc3e8fc8a9..b2c1a71f85 100644 --- a/bgp/rib-spi/pom.xml +++ b/bgp/rib-spi/pom.xml @@ -61,6 +61,14 @@ org.opendaylight.yangtools yang-common + + org.opendaylight.yangtools + yang-data-api + + + org.opendaylight.yangtools + yang-data-impl + org.opendaylight.yangtools concepts @@ -69,6 +77,10 @@ org.opendaylight.controller sal-core-api + + org.opendaylight.controller + sal-common-api + org.opendaylight.mdsal mdsal-binding-generator-impl @@ -85,7 +97,10 @@ io.netty netty-transport - + + io.netty + netty-common + org.osgi org.osgi.core @@ -108,10 +123,6 @@ org.opendaylight.yangtools mockito-configuration - - junit - junit - org.opendaylight.mdsal mdsal-binding-dom-adapter diff --git a/bgp/testtool/pom.xml b/bgp/testtool/pom.xml index 4f11bc3157..71b780bb4e 100644 --- a/bgp/testtool/pom.xml +++ b/bgp/testtool/pom.xml @@ -48,6 +48,18 @@ ${project.groupId} bgp-parser-spi + + ${project.groupId} + bgp-parser-impl + + + ${project.groupId} + concepts + + + ${project.groupId} + bgp-rib-api + ${project.groupId} bgp-rib-spi @@ -88,6 +100,10 @@ ${project.groupId} bgp-l3vpn + + ${project.groupId} + util + io.netty netty-common @@ -108,6 +124,10 @@ ch.qos.logback logback-classic + + org.opendaylight.mdsal + mdsal-common-api + net.sourceforge.argparse4j argparse4j diff --git a/bgp/topology-provider/pom.xml b/bgp/topology-provider/pom.xml index b7f81c5832..cae7393c3d 100644 --- a/bgp/topology-provider/pom.xml +++ b/bgp/topology-provider/pom.xml @@ -41,10 +41,6 @@ ${project.groupId} bgp-parser-api - - ${project.groupId} - bgp-parser-spi - ${project.groupId} bgp-rib-api @@ -73,6 +69,10 @@ org.opendaylight.mdsal yang-binding + + org.opendaylight.mdsal + mdsal-common-api + org.opendaylight.yangtools yang-common @@ -81,6 +81,10 @@ org.opendaylight.controller sal-binding-api + + org.opendaylight.mdsal + mdsal-singleton-common-api + org.opendaylight.controller sal-common-api @@ -121,10 +125,6 @@ io.netty netty-buffer - - io.netty - netty-common - org.osgi org.osgi.core @@ -168,11 +168,6 @@ org.mockito mockito-core - test - - - junit - junit org.opendaylight.yangtools diff --git a/bgp/util/pom.xml b/bgp/util/pom.xml index 5f5c272da6..a4ccb679c1 100644 --- a/bgp/util/pom.xml +++ b/bgp/util/pom.xml @@ -37,11 +37,6 @@ org.slf4j slf4j-api - - org.hamcrest - hamcrest-core - - org.opendaylight.mdsal.model @@ -49,8 +44,8 @@ test - junit - junit + org.hamcrest + hamcrest-core diff --git a/binding-parent/pom.xml b/binding-parent/pom.xml index ece19474f8..45b7c1df64 100644 --- a/binding-parent/pom.xml +++ b/binding-parent/pom.xml @@ -59,6 +59,22 @@ true + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + analyze-only + + + true + true + + + + diff --git a/bmp/bmp-api/pom.xml b/bmp/bmp-api/pom.xml index 6e8f8ffd90..9ba4de984a 100644 --- a/bmp/bmp-api/pom.xml +++ b/bmp/bmp-api/pom.xml @@ -32,10 +32,6 @@ org.opendaylight.mdsal.model ietf-yang-types-20130715 - - io.netty - netty-transport - com.google.guava guava diff --git a/bmp/bmp-impl/pom.xml b/bmp/bmp-impl/pom.xml index ac299d3761..7281b1a2a1 100644 --- a/bmp/bmp-impl/pom.xml +++ b/bmp/bmp-impl/pom.xml @@ -30,10 +30,6 @@ ${project.groupId} bgp-bmp-parser-impl - - org.opendaylight.controller - sal-broker-impl - ${project.groupId} bgp-bmp-spi @@ -54,6 +50,10 @@ ${project.groupId} bgp-parser-api + + ${project.groupId} + bgp-parser-spi + ${project.groupId} bgp-rib-api @@ -70,6 +70,10 @@ org.opendaylight.mdsal yang-binding + + org.opendaylight.mdsal + mdsal-common-api + org.opendaylight.yangtools concepts @@ -90,17 +94,21 @@ org.opendaylight.controller sal-common-api + + org.opendaylight.controller + sal-binding-api + org.opendaylight.controller sal-core-api org.opendaylight.mdsal - mdsal-binding-generator-impl + mdsal-binding-dom-codec org.opendaylight.mdsal - mdsal-binding-dom-codec + mdsal-singleton-common-api io.netty @@ -123,10 +131,6 @@ netty-transport-native-epoll linux-x86_64 - - io.netty - netty-handler - com.google.guava guava @@ -137,7 +141,7 @@ ${project.groupId} - bgp-parser-spi + bgp-parser-impl ${project.groupId} @@ -159,19 +163,7 @@ org.opendaylight.yangtools yang-model-api - - org.javassist - javassist - - - ${project.groupId} - config-loader-spi - - - junit - junit - org.mockito mockito-core diff --git a/bmp/bmp-mock/pom.xml b/bmp/bmp-mock/pom.xml index 0f1d6fec4d..a98531ee51 100644 --- a/bmp/bmp-mock/pom.xml +++ b/bmp/bmp-mock/pom.xml @@ -23,37 +23,45 @@ - org.opendaylight.bgpcep + ${project.groupId} + concepts + + + ${project.groupId} bgp-bmp-api - org.opendaylight.bgpcep + ${project.groupId} bgp-bmp-spi - org.opendaylight.bgpcep + ${project.groupId} bgp-bmp-impl - org.opendaylight.bgpcep + ${project.groupId} bgp-bmp-parser-impl - org.opendaylight.bgpcep + ${project.groupId} bgp-parser-api - org.opendaylight.bgpcep + ${project.groupId} bgp-parser-spi - org.opendaylight.bgpcep + ${project.groupId} bgp-parser-impl - org.opendaylight.bgpcep + ${project.groupId} bgp-concepts + + ${project.groupId} + util + org.opendaylight.mdsal.model ietf-inet-types-2013-07-15 @@ -66,6 +74,10 @@ io.netty netty-transport + + io.netty + netty-common + org.slf4j slf4j-api @@ -88,10 +100,6 @@ testtool-util - - junit - junit - org.mockito mockito-core diff --git a/bmp/bmp-parser-impl/pom.xml b/bmp/bmp-parser-impl/pom.xml index c18d303789..4c9864caf3 100644 --- a/bmp/bmp-parser-impl/pom.xml +++ b/bmp/bmp-parser-impl/pom.xml @@ -26,6 +26,10 @@ com.google.guava guava + + ${project.groupId} + util + ${project.groupId} bgp-bmp-api @@ -34,6 +38,22 @@ ${project.groupId} bgp-bmp-spi + + ${project.groupId} + bgp-concepts + + + ${project.groupId} + bgp-parser-api + + + ${project.groupId} + bgp-parser-spi + + + ${project.groupId} + concepts + org.opendaylight.mdsal.model ietf-yang-types-20130715 @@ -42,12 +62,19 @@ org.opendaylight.mdsal.model ietf-inet-types-2013-07-15 - - - junit - junit + org.opendaylight.mdsal + yang-binding + + org.opendaylight.yangtools + concepts + + + io.netty + netty-buffer + + ${project.groupId} bgp-parser-impl diff --git a/bmp/bmp-spi/pom.xml b/bmp/bmp-spi/pom.xml index 559207a0cd..4f3e6c8074 100644 --- a/bmp/bmp-spi/pom.xml +++ b/bmp/bmp-spi/pom.xml @@ -28,10 +28,18 @@ ${project.groupId} bgp-bmp-api + + ${project.groupId} + bgp-parser-api + ${project.groupId} bgp-parser-spi + + ${project.groupId} + bgp-concepts + io.netty netty-transport @@ -76,15 +84,6 @@ org.opendaylight.mdsal yang-binding - - org.opendaylight.yangtools - yang-common - - - - junit - junit - org.mockito mockito-core diff --git a/concepts/pom.xml b/concepts/pom.xml index 080de8d378..86964165a6 100644 --- a/concepts/pom.xml +++ b/concepts/pom.xml @@ -48,6 +48,10 @@ org.opendaylight.mdsal yang-binding + + org.opendaylight.yangtools + yang-common + - - junit - junit - io.netty netty-buffer diff --git a/config-loader/bmp-monitors-config-loader/pom.xml b/config-loader/bmp-monitors-config-loader/pom.xml index 0cfe010f9c..737baec296 100644 --- a/config-loader/bmp-monitors-config-loader/pom.xml +++ b/config-loader/bmp-monitors-config-loader/pom.xml @@ -37,6 +37,38 @@ org.opendaylight.controller sal-binding-api + + org.opendaylight.controller + sal-common-api + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.mdsal + mdsal-binding-dom-codec + + + org.opendaylight.yangtools + yang-model-api + + + org.opendaylight.yangtools + yang-common + + + org.opendaylight.yangtools + yang-data-api + + + org.opendaylight.yangtools + concepts + + + com.google.guava + guava + ${project.groupId} config-loader-impl @@ -73,11 +105,6 @@ org.mockito mockito-core - test - - - junit - junit diff --git a/config-loader/config-loader-impl/pom.xml b/config-loader/config-loader-impl/pom.xml index 0e55a7bf3c..c733b10b82 100644 --- a/config-loader/config-loader-impl/pom.xml +++ b/config-loader/config-loader-impl/pom.xml @@ -28,6 +28,30 @@ ${project.groupId} config-loader-spi + + org.opendaylight.yangtools + yang-model-api + + + org.opendaylight.yangtools + yang-data-api + + + org.opendaylight.yangtools + yang-data-impl + + + org.opendaylight.yangtools + yang-common + + + org.opendaylight.yangtools + yang-model-util + + + org.opendaylight.yangtools + concepts + org.opendaylight.yangtools yang-data-codec-xml @@ -36,6 +60,14 @@ org.opendaylight.mdsal mdsal-dom-api + + org.opendaylight.mdsal + mdsal-binding-dom-codec + + + com.google.guava + guava + ${project.groupId} @@ -57,15 +89,9 @@ ietf-interfaces test - - junit - junit - test - org.mockito mockito-core - test org.opendaylight.yangtools diff --git a/config-loader/protocols-config-loader/pom.xml b/config-loader/protocols-config-loader/pom.xml index ac7bd56a29..b217f305f2 100644 --- a/config-loader/protocols-config-loader/pom.xml +++ b/config-loader/protocols-config-loader/pom.xml @@ -33,10 +33,43 @@ ${project.groupId} bgp-openconfig-api + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.yangtools + yang-data-api + + + org.opendaylight.yangtools + concepts + + + org.opendaylight.yangtools + yang-model-api + + + org.opendaylight.mdsal + mdsal-binding-dom-codec + + + org.opendaylight.yangtools + yang-common + org.opendaylight.controller sal-binding-api + + org.opendaylight.controller + sal-common-api + + + com.google.guava + guava + + ${project.groupId} config-loader-impl @@ -73,12 +106,6 @@ org.mockito mockito-core - test - - - junit - junit - test diff --git a/config-loader/routing-policy-config-loader/pom.xml b/config-loader/routing-policy-config-loader/pom.xml index 36d9bc9565..925181d801 100644 --- a/config-loader/routing-policy-config-loader/pom.xml +++ b/config-loader/routing-policy-config-loader/pom.xml @@ -34,6 +34,39 @@ org.opendaylight.controller sal-binding-api + + org.opendaylight.controller + sal-common-api + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.mdsal + mdsal-binding-dom-codec + + + org.opendaylight.yangtools + yang-model-api + + + org.opendaylight.yangtools + yang-data-api + + + org.opendaylight.yangtools + yang-common + + + org.opendaylight.yangtools + concepts + + + com.google.guava + guava + + ${project.groupId} config-loader-impl @@ -70,11 +103,6 @@ org.mockito mockito-core - test - - - junit - junit diff --git a/config-loader/topology-config-loader/pom.xml b/config-loader/topology-config-loader/pom.xml index dd17096002..99316753f7 100644 --- a/config-loader/topology-config-loader/pom.xml +++ b/config-loader/topology-config-loader/pom.xml @@ -33,10 +33,43 @@ org.opendaylight.mdsal.model ietf-topology + + org.opendaylight.mdsal + mdsal-binding-dom-codec + org.opendaylight.controller sal-binding-api + + org.opendaylight.controller + sal-common-api + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.yangtools + yang-model-api + + + org.opendaylight.yangtools + yang-common + + + org.opendaylight.yangtools + concepts + + + org.opendaylight.yangtools + yang-data-api + + + com.google.guava + guava + + ${project.groupId} config-loader-impl @@ -73,12 +106,6 @@ org.mockito mockito-core - test - - - junit - junit - test diff --git a/data-change-counter/pom.xml b/data-change-counter/pom.xml index bed5f0b7e0..9adf2305a4 100644 --- a/data-change-counter/pom.xml +++ b/data-change-counter/pom.xml @@ -52,6 +52,10 @@ org.opendaylight.mdsal.model ietf-topology + + org.opendaylight.mdsal + mdsal-common-api + org.osgi org.osgi.core @@ -59,10 +63,6 @@ - - junit - junit - org.opendaylight.controller sal-binding-broker-impl diff --git a/features/rsvp/odl-bgpcep-rsvp-api/pom.xml b/features/rsvp/odl-bgpcep-rsvp-api/pom.xml index 5a3e62a8ab..0e528bd307 100644 --- a/features/rsvp/odl-bgpcep-rsvp-api/pom.xml +++ b/features/rsvp/odl-bgpcep-rsvp-api/pom.xml @@ -31,7 +31,7 @@ rsvp-spi - org.opendaylight.bgpcep + ${project.groupId} odl-bgpcep-extras-dependencies xml features diff --git a/parent/pom.xml b/parent/pom.xml index 6257bc1090..f7f145eb05 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -154,10 +154,18 @@ org.apache.maven.plugins maven-dependency-plugin - - true - true - + + + analyze + + analyze-only + + + true + true + + + org.apache.maven.plugins diff --git a/pcep/api/pom.xml b/pcep/api/pom.xml index cbcc372d02..ea041737ee 100644 --- a/pcep/api/pom.xml +++ b/pcep/api/pom.xml @@ -74,10 +74,6 @@ - - junit - junit - org.opendaylight.yangtools mockito-configuration diff --git a/pcep/auto-bandwidth-extension/pom.xml b/pcep/auto-bandwidth-extension/pom.xml index 2819814d2f..54e4158a94 100644 --- a/pcep/auto-bandwidth-extension/pom.xml +++ b/pcep/auto-bandwidth-extension/pom.xml @@ -43,11 +43,15 @@ ${project.groupId} - pcep-topology-api + pcep-base-parser + + + ${project.groupId} + rsvp-api ${project.groupId} - pcep-impl + pcep-topology-api ${project.groupId} @@ -70,12 +74,12 @@ ietf-topology - io.netty - netty-buffer + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 - org.slf4j - slf4j-api + io.netty + netty-buffer com.google.guava @@ -88,10 +92,6 @@ - - junit - junit - org.mockito mockito-core diff --git a/pcep/base-parser/pom.xml b/pcep/base-parser/pom.xml index 35f4a2df11..d90886ca73 100644 --- a/pcep/base-parser/pom.xml +++ b/pcep/base-parser/pom.xml @@ -33,10 +33,30 @@ ${project.groupId} pcep-spi + + ${project.groupId} + rsvp-api + + + ${project.groupId} + util + + + ${project.groupId} + concepts + org.opendaylight.mdsal.model ietf-inet-types-2013-07-15 + + io.netty + netty-buffer + + + com.google.guava + guava + diff --git a/pcep/ietf-stateful07/pom.xml b/pcep/ietf-stateful07/pom.xml index 620923da51..147b56183a 100644 --- a/pcep/ietf-stateful07/pom.xml +++ b/pcep/ietf-stateful07/pom.xml @@ -60,7 +60,6 @@ ${project.groupId} pcep-base-parser - - - junit - junit - org.opendaylight.yangtools mockito-configuration diff --git a/pcep/impl/pom.xml b/pcep/impl/pom.xml index 9347679a00..db349313fc 100644 --- a/pcep/impl/pom.xml +++ b/pcep/impl/pom.xml @@ -115,10 +115,6 @@ org.mockito mockito-core - - junit - junit - org.opendaylight.yangtools mockito-configuration diff --git a/pcep/pcc-mock/pom.xml b/pcep/pcc-mock/pom.xml index f47546fc5d..7874cec91a 100644 --- a/pcep/pcc-mock/pom.xml +++ b/pcep/pcc-mock/pom.xml @@ -27,6 +27,10 @@ ${project.groupId} util + + ${project.groupId} + concepts + ${project.groupId} pcep-api @@ -39,6 +43,10 @@ ${project.groupId} pcep-impl + + ${project.groupId} + pcep-base-parser + ${project.groupId} rsvp-api @@ -64,10 +72,6 @@ io.netty netty-buffer - - io.netty - netty-codec - io.netty netty-common @@ -81,10 +85,6 @@ netty-transport-native-epoll linux-x86_64 - - io.netty - netty-handler - ch.qos.logback logback-classic @@ -95,10 +95,6 @@ - - junit - junit - org.mockito mockito-core diff --git a/pcep/segment-routing/pom.xml b/pcep/segment-routing/pom.xml index 3ec3aaed20..3a5f01b4ca 100644 --- a/pcep/segment-routing/pom.xml +++ b/pcep/segment-routing/pom.xml @@ -42,17 +42,16 @@ ${project.groupId} - pcep-impl + rsvp-api ${project.groupId} - rsvp-api + pcep-topology-api ${project.groupId} - pcep-topology-api + pcep-base-parser - org.opendaylight.mdsal yang-binding @@ -73,6 +72,10 @@ org.opendaylight.mdsal.model ietf-topology + + org.opendaylight.controller + sal-common-api + io.netty netty-buffer @@ -81,20 +84,12 @@ com.google.guava guava - - org.slf4j - slf4j-api - org.osgi org.osgi.core provided - - junit - junit - org.opendaylight.yangtools mockito-configuration diff --git a/pcep/spi/pom.xml b/pcep/spi/pom.xml index cda41d2dc2..641cb3ca18 100644 --- a/pcep/spi/pom.xml +++ b/pcep/spi/pom.xml @@ -41,12 +41,10 @@ ${project.groupId} concepts - - org.opendaylight.yangtools - concepts + org.opendaylight.mdsal + yang-binding - io.netty netty-buffer @@ -74,10 +72,6 @@ org.opendaylight.yangtools mockito-configuration - - junit - junit - diff --git a/pcep/testtool/pom.xml b/pcep/testtool/pom.xml index 4159e6af71..cc2dcbaacb 100644 --- a/pcep/testtool/pom.xml +++ b/pcep/testtool/pom.xml @@ -26,6 +26,10 @@ ${project.artifactId} + + ${project.groupId} + concepts + ${project.groupId} pcep-api @@ -42,6 +46,10 @@ ${project.groupId} pcep-pcc-mock + + ${project.groupId} + testtool-util + ${project.groupId} @@ -69,12 +77,6 @@ logback-classic runtime - - - - junit - junit - diff --git a/pcep/topology/cli/pom.xml b/pcep/topology/cli/pom.xml index c9c07c9816..ddf61f979b 100644 --- a/pcep/topology/cli/pom.xml +++ b/pcep/topology/cli/pom.xml @@ -29,6 +29,10 @@ ${project.groupId} pcep-topology-api + + ${project.groupId} + pcep-api + ${project.groupId} pcep-ietf-stateful07 @@ -42,31 +46,31 @@ sal-binding-api - org.apache.karaf.shell - org.apache.karaf.shell.console - provided + org.opendaylight.controller + sal-common-api + + + org.opendaylight.mdsal + yang-binding org.apache.karaf.shell - org.apache.karaf.shell.table - ${karaf.version} + org.apache.karaf.shell.console provided org.apache.karaf.shell - org.apache.karaf.shell.commands - ${karaf.version} + org.apache.karaf.shell.core provided - - junit - junit + com.google.guava + guava + org.mockito mockito-core - test commons-io diff --git a/pcep/topology/topology-api/pom.xml b/pcep/topology/topology-api/pom.xml index 09258d968d..a79288f1e5 100644 --- a/pcep/topology/topology-api/pom.xml +++ b/pcep/topology/topology-api/pom.xml @@ -52,6 +52,10 @@ org.opendaylight.mdsal.model ietf-topology + + org.opendaylight.mdsal.model + yang-ext + org.opendaylight.mdsal yang-binding diff --git a/pcep/topology/topology-provider/pom.xml b/pcep/topology/topology-provider/pom.xml index 3ef110f518..6f76803454 100644 --- a/pcep/topology/topology-provider/pom.xml +++ b/pcep/topology/topology-provider/pom.xml @@ -49,6 +49,10 @@ ${project.groupId} programming-spi + + ${project.groupId} + concepts + ${project.groupId} rsvp-api @@ -81,6 +85,10 @@ org.opendaylight.mdsal.model ietf-inet-types-2013-07-15 + + org.opendaylight.mdsal + mdsal-singleton-common-api + org.opendaylight.mdsal.model ietf-topology @@ -89,6 +97,10 @@ org.opendaylight.mdsal yang-binding + + org.opendaylight.mdsal + mdsal-common-api + org.opendaylight.yangtools yang-common @@ -101,19 +113,10 @@ io.netty netty-common - - io.netty - netty-buffer - io.netty netty-transport - - io.netty - netty-transport-native-epoll - linux-x86_64 - ${project.groupId} @@ -138,11 +141,6 @@ testtool-util test - - junit - junit - test - org.mockito mockito-core diff --git a/pcep/topology/topology-spi/pom.xml b/pcep/topology/topology-spi/pom.xml index 43f6ea1067..755766569f 100644 --- a/pcep/topology/topology-spi/pom.xml +++ b/pcep/topology/topology-spi/pom.xml @@ -25,6 +25,10 @@ ${project.artifactId} + + ${project.groupId} + pcep-api + ${project.groupId} pcep-topology-api @@ -37,6 +41,14 @@ ${project.groupId} programming-spi + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.mdsal.model + ietf-topology + org.slf4j slf4j-api diff --git a/pcep/topology/topology-stats/pom.xml b/pcep/topology/topology-stats/pom.xml index 0a960014db..96694d8d7e 100644 --- a/pcep/topology/topology-stats/pom.xml +++ b/pcep/topology/topology-stats/pom.xml @@ -41,12 +41,28 @@ pcep-topology-spi - ${project.groupId} - pcep-ietf-stateful07 + org.opendaylight.controller + sal-binding-api org.opendaylight.controller - sal-binding-api + sal-common-api + + + org.opendaylight.yangtools + yang-common + + + org.opendaylight.yangtools + concepts + + + org.opendaylight.mdsal + mdsal-common-api + + + com.google.guava + guava diff --git a/pcep/tunnel/tunnel-api/pom.xml b/pcep/tunnel/tunnel-api/pom.xml index 1870512bf0..55e63078b7 100644 --- a/pcep/tunnel/tunnel-api/pom.xml +++ b/pcep/tunnel/tunnel-api/pom.xml @@ -69,6 +69,10 @@ org.opendaylight.mdsal.model ietf-topology + + org.opendaylight.mdsal.model + yang-ext + com.google.guava guava diff --git a/pcep/tunnel/tunnel-provider/pom.xml b/pcep/tunnel/tunnel-provider/pom.xml index b2474e9ec8..ce1a89d612 100644 --- a/pcep/tunnel/tunnel-provider/pom.xml +++ b/pcep/tunnel/tunnel-provider/pom.xml @@ -37,10 +37,6 @@ ${project.groupId} pcep-ietf-stateful07 - - ${project.groupId} - pcep-impl - ${project.groupId} pcep-tunnel-api @@ -53,10 +49,6 @@ ${project.groupId} pcep-api - - ${project.groupId} - pcep-spi - ${project.groupId} programming-topology-api @@ -73,10 +65,18 @@ ${project.groupId} topology-api + + ${project.groupId} + concepts + ${project.groupId} topology-tunnel-api + + ${project.groupId} + rsvp-api + org.opendaylight.controller sal-binding-api @@ -94,6 +94,14 @@ org.opendaylight.mdsal yang-binding + + org.opendaylight.mdsal + mdsal-common-api + + + org.opendaylight.mdsal + mdsal-singleton-common-api + org.opendaylight.yangtools yang-common @@ -138,10 +146,6 @@ testtool-util test - - junit - junit - org.opendaylight.yangtools mockito-configuration diff --git a/programming/api/pom.xml b/programming/api/pom.xml index ff30fc4e4c..c7401604f2 100644 --- a/programming/api/pom.xml +++ b/programming/api/pom.xml @@ -49,12 +49,6 @@ com.google.guava guava - - - - junit - junit - diff --git a/programming/impl/pom.xml b/programming/impl/pom.xml index b968296e9d..a02e959990 100644 --- a/programming/impl/pom.xml +++ b/programming/impl/pom.xml @@ -50,18 +50,21 @@ io.netty netty-common - + + org.opendaylight.mdsal + mdsal-common-api + org.opendaylight.mdsal yang-binding - org.opendaylight.yangtools - yang-common + org.opendaylight.mdsal + mdsal-singleton-common-api org.opendaylight.yangtools - concepts + yang-common org.opendaylight.controller @@ -85,10 +88,6 @@ testtool-util test - - junit - junit - org.mockito mockito-core @@ -131,7 +130,6 @@ org.hamcrest hamcrest-core - test org.opendaylight.yangtools diff --git a/programming/spi/pom.xml b/programming/spi/pom.xml index 1273857066..e38dd5d246 100644 --- a/programming/spi/pom.xml +++ b/programming/spi/pom.xml @@ -34,10 +34,9 @@ com.google.guava guava - - org.opendaylight.mdsal - yang-binding + org.opendaylight.yangtools + concepts org.opendaylight.mdsal diff --git a/rsvp/api/pom.xml b/rsvp/api/pom.xml index ba3baed9fe..74a6a3d571 100644 --- a/rsvp/api/pom.xml +++ b/rsvp/api/pom.xml @@ -29,7 +29,6 @@ ${project.groupId} concepts - org.opendaylight.mdsal yang-binding @@ -42,7 +41,6 @@ org.opendaylight.yangtools concepts - org.opendaylight.mdsal.model ietf-inet-types-2013-07-15 diff --git a/rsvp/impl/pom.xml b/rsvp/impl/pom.xml index 5a8aebbc32..26d001d1f9 100644 --- a/rsvp/impl/pom.xml +++ b/rsvp/impl/pom.xml @@ -37,6 +37,10 @@ rsvp-spi ${project.version} + + ${project.groupId} + concepts + com.google.guava guava @@ -46,17 +50,17 @@ slf4j-api - org.opendaylight.yangtools - concepts + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 - - org.opendaylight.yangtools - mockito-configuration + io.netty + netty-buffer + - junit - junit + org.opendaylight.yangtools + mockito-configuration diff --git a/rsvp/spi/pom.xml b/rsvp/spi/pom.xml index 1bf32f633d..0beac9df6b 100644 --- a/rsvp/spi/pom.xml +++ b/rsvp/spi/pom.xml @@ -32,6 +32,10 @@ ${project.groupId} rsvp-api + + ${project.groupId} + concepts + com.google.guava guava @@ -41,13 +45,14 @@ slf4j-api - org.opendaylight.yangtools - concepts + org.opendaylight.mdsal + yang-binding - junit - junit + io.netty + netty-buffer + org.mockito mockito-core diff --git a/testtool-parent/pom.xml b/testtool-parent/pom.xml index c745c22abf..106f73d4b3 100644 --- a/testtool-parent/pom.xml +++ b/testtool-parent/pom.xml @@ -36,6 +36,13 @@ + + + junit + junit + + + @@ -59,6 +66,22 @@ true + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + analyze-only + + + true + true + + + + diff --git a/testtool-util/pom.xml b/testtool-util/pom.xml index 432aeb2074..4ed7af6f48 100644 --- a/testtool-util/pom.xml +++ b/testtool-util/pom.xml @@ -37,20 +37,28 @@ org.opendaylight.controller sal-binding-api + + org.opendaylight.controller + sal-common-api + io.netty netty-common + + org.opendaylight.mdsal + yang-binding + + + ch.qos.logback + logback-core + org.opendaylight.mdsal.model ietf-topology test - - junit - junit - org.mockito mockito-core diff --git a/util/pom.xml b/util/pom.xml index d7e503e387..6b814b3f8b 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -53,8 +53,8 @@ - junit - junit + org.hamcrest + hamcrest-core -- 2.36.6