From 95fe25d438b661e5ba32ddb012095d97ea3fb473 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 29 Jul 2017 10:28:05 +0200 Subject: [PATCH] Cleanup build system Clean up pom.xmls, to eliminate dupliciate aggragator functions, properly import upstream artifacts and correct relativePath declarations. Change-Id: I0786e5fdf207ad544a7bb5c72e035be78b867b5e Signed-off-by: Robert Varga --- features/pom.xml | 11 ++-- netconf/aaa-authn-odl-plugin/pom.xml | 9 ++- netconf/callhome-protocol/pom.xml | 2 +- netconf/callhome-provider/pom.xml | 9 ++- netconf/config-netconf-connector/pom.xml | 28 +++++++-- netconf/mdsal-netconf-connector/pom.xml | 16 ++++- netconf/mdsal-netconf-impl/pom.xml | 2 +- netconf/mdsal-netconf-monitoring/pom.xml | 23 ++++++- netconf/mdsal-netconf-notification/pom.xml | 16 ++++- netconf/mdsal-netconf-ssh/pom.xml | 2 +- netconf/mdsal-netconf-tcp/pom.xml | 2 +- netconf/mdsal-netconf-yang-library/pom.xml | 23 ++++++- netconf/messagebus-netconf/pom.xml | 16 ++++- netconf/netconf-api/pom.xml | 24 +++++++- netconf/netconf-artifacts/pom.xml | 15 ----- netconf/netconf-client/pom.xml | 13 ++-- netconf/netconf-connector-config/pom.xml | 2 +- netconf/netconf-console/pom.xml | 16 ++++- netconf/netconf-impl/pom.xml | 25 ++++---- netconf/netconf-mapping-api/pom.xml | 2 +- netconf/netconf-monitoring/pom.xml | 16 ++++- netconf/netconf-netty-util/pom.xml | 14 ++--- netconf/netconf-notifications-api/pom.xml | 2 +- netconf/netconf-notifications-impl/pom.xml | 23 ++++++- netconf/netconf-ssh/pom.xml | 23 ++++++- netconf/netconf-tcp/pom.xml | 16 ++++- netconf/netconf-topology-config/pom.xml | 2 +- netconf/netconf-topology-singleton/pom.xml | 9 ++- netconf/netconf-topology/pom.xml | 27 +++++++-- netconf/netconf-util/pom.xml | 28 ++++++--- netconf/pom.xml | 26 -------- netconf/tools/netconf-cli/pom.xml | 23 ++++++- netconf/tools/netconf-testtool/pom.xml | 30 +++++++++- netconf/tools/pom.xml | 9 ++- pom.xml | 60 ------------------- .../models/ietf-restconf-monitoring/pom.xml | 2 +- restconf/models/ietf-restconf/pom.xml | 2 +- restconf/models/ietf-yang-library/pom.xml | 2 +- restconf/models/pom.xml | 9 ++- restconf/pom.xml | 19 ------ restconf/restconf-artifacts/pom.xml | 7 --- restconf/sal-rest-connector/pom.xml | 22 +++++++ restconf/sal-rest-docgen-maven/pom.xml | 7 +-- restconf/sal-rest-docgen/pom.xml | 13 +++- 44 files changed, 433 insertions(+), 214 deletions(-) diff --git a/features/pom.xml b/features/pom.xml index 6e555be83f..3b183f224d 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -9,12 +9,15 @@ 4.0.0 - org.opendaylight.netconf - netconf-parent - 1.3.0-SNAPSHOT - .. + org.opendaylight.odlparent + odlparent-lite + 2.0.2 + + + org.opendaylight.netconf netconf-features-parent + 1.3.0-SNAPSHOT pom diff --git a/netconf/aaa-authn-odl-plugin/pom.xml b/netconf/aaa-authn-odl-plugin/pom.xml index 265a124027..e918c03e93 100644 --- a/netconf/aaa-authn-odl-plugin/pom.xml +++ b/netconf/aaa-authn-odl-plugin/pom.xml @@ -25,11 +25,18 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import + + org.opendaylight.aaa + aaa-artifacts + 0.6.0-SNAPSHOT + pom + import + diff --git a/netconf/callhome-protocol/pom.xml b/netconf/callhome-protocol/pom.xml index 578d6a26bf..4f706c6387 100644 --- a/netconf/callhome-protocol/pom.xml +++ b/netconf/callhome-protocol/pom.xml @@ -25,7 +25,7 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import diff --git a/netconf/callhome-provider/pom.xml b/netconf/callhome-provider/pom.xml index 9b4aaa1406..6a85aa50ee 100644 --- a/netconf/callhome-provider/pom.xml +++ b/netconf/callhome-provider/pom.xml @@ -19,11 +19,18 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + diff --git a/netconf/config-netconf-connector/pom.xml b/netconf/config-netconf-connector/pom.xml index 66edaf3c6f..6a2eb71fa8 100644 --- a/netconf/config-netconf-connector/pom.xml +++ b/netconf/config-netconf-connector/pom.xml @@ -26,11 +26,32 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import + + org.opendaylight.controller + config-artifacts + 0.7.0-SNAPSHOT + pom + import + + + org.opendaylight.mdsal + mdsal-artifacts + 2.3.0-SNAPSHOT + pom + import + + + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT + pom + import + @@ -68,10 +89,6 @@ ${project.groupId} netconf-util - - org.opendaylight.controller - yang-jmx-generator - com.google.guava guava @@ -83,6 +100,7 @@ org.opendaylight.mdsal mdsal-binding-generator-impl + test org.slf4j diff --git a/netconf/mdsal-netconf-connector/pom.xml b/netconf/mdsal-netconf-connector/pom.xml index 73b3b777d5..e0c6983205 100644 --- a/netconf/mdsal-netconf-connector/pom.xml +++ b/netconf/mdsal-netconf-connector/pom.xml @@ -26,11 +26,25 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import + + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT + pom + import + + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + diff --git a/netconf/mdsal-netconf-impl/pom.xml b/netconf/mdsal-netconf-impl/pom.xml index 44eb9092f3..d4dc7373db 100644 --- a/netconf/mdsal-netconf-impl/pom.xml +++ b/netconf/mdsal-netconf-impl/pom.xml @@ -26,7 +26,7 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import diff --git a/netconf/mdsal-netconf-monitoring/pom.xml b/netconf/mdsal-netconf-monitoring/pom.xml index de39fb4a49..506b8bf43c 100644 --- a/netconf/mdsal-netconf-monitoring/pom.xml +++ b/netconf/mdsal-netconf-monitoring/pom.xml @@ -25,11 +25,32 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import + + org.opendaylight.mdsal.model + mdsal-model-artifacts + 0.11.0-SNAPSHOT + pom + import + + + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT + pom + import + + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + diff --git a/netconf/mdsal-netconf-notification/pom.xml b/netconf/mdsal-netconf-notification/pom.xml index 454f9168eb..3aeba6412c 100644 --- a/netconf/mdsal-netconf-notification/pom.xml +++ b/netconf/mdsal-netconf-notification/pom.xml @@ -25,11 +25,25 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + + + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT + pom + import + diff --git a/netconf/mdsal-netconf-ssh/pom.xml b/netconf/mdsal-netconf-ssh/pom.xml index d4c8673368..fa5f0f788b 100644 --- a/netconf/mdsal-netconf-ssh/pom.xml +++ b/netconf/mdsal-netconf-ssh/pom.xml @@ -26,7 +26,7 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import diff --git a/netconf/mdsal-netconf-tcp/pom.xml b/netconf/mdsal-netconf-tcp/pom.xml index fcfee60d2c..27f11b40de 100644 --- a/netconf/mdsal-netconf-tcp/pom.xml +++ b/netconf/mdsal-netconf-tcp/pom.xml @@ -26,7 +26,7 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import diff --git a/netconf/mdsal-netconf-yang-library/pom.xml b/netconf/mdsal-netconf-yang-library/pom.xml index 30cb34fce2..ea96b7dd26 100644 --- a/netconf/mdsal-netconf-yang-library/pom.xml +++ b/netconf/mdsal-netconf-yang-library/pom.xml @@ -26,11 +26,32 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + 0.11.0-SNAPSHOT + pom + import + + + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT + pom + import + diff --git a/netconf/messagebus-netconf/pom.xml b/netconf/messagebus-netconf/pom.xml index 93ea90d936..6750a90d52 100644 --- a/netconf/messagebus-netconf/pom.xml +++ b/netconf/messagebus-netconf/pom.xml @@ -28,11 +28,25 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + + + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT + pom + import + diff --git a/netconf/netconf-api/pom.xml b/netconf/netconf-api/pom.xml index 1eb0c49e22..33d61e9d4e 100644 --- a/netconf/netconf-api/pom.xml +++ b/netconf/netconf-api/pom.xml @@ -26,11 +26,32 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import + + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT + pom + import + + + org.opendaylight.controller + config-artifacts + 0.7.0-SNAPSHOT + pom + import + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + 0.11.0-SNAPSHOT + pom + import + @@ -50,6 +71,7 @@ org.opendaylight.controller protocol-framework + 0.10.0-SNAPSHOT org.opendaylight.mdsal.model diff --git a/netconf/netconf-artifacts/pom.xml b/netconf/netconf-artifacts/pom.xml index 683665908e..761b103960 100644 --- a/netconf/netconf-artifacts/pom.xml +++ b/netconf/netconf-artifacts/pom.xml @@ -151,13 +151,6 @@ messagebus-netconf ${project.version} - - ${project.groupId} - features-netconf-connector - ${project.version} - features - xml - ${project.groupId} @@ -281,14 +274,6 @@ ${project.version} - - ${project.groupId} - features-netconf - ${project.version} - xml - features - - ${project.groupId} diff --git a/netconf/netconf-client/pom.xml b/netconf/netconf-client/pom.xml index 7de7fbf6de..2cfed47470 100644 --- a/netconf/netconf-client/pom.xml +++ b/netconf/netconf-client/pom.xml @@ -26,11 +26,18 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import + + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT + pom + import + @@ -57,10 +64,6 @@ com.google.guava guava - - org.opendaylight.controller - protocol-framework - org.slf4j slf4j-api diff --git a/netconf/netconf-connector-config/pom.xml b/netconf/netconf-connector-config/pom.xml index 73fe934730..d3be6f5891 100644 --- a/netconf/netconf-connector-config/pom.xml +++ b/netconf/netconf-connector-config/pom.xml @@ -27,7 +27,7 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import diff --git a/netconf/netconf-console/pom.xml b/netconf/netconf-console/pom.xml index 2bbc05eed3..4a5595c4cb 100644 --- a/netconf/netconf-console/pom.xml +++ b/netconf/netconf-console/pom.xml @@ -25,11 +25,25 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + + + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT + pom + import + diff --git a/netconf/netconf-impl/pom.xml b/netconf/netconf-impl/pom.xml index 06a5e232e5..35241b6bf4 100644 --- a/netconf/netconf-impl/pom.xml +++ b/netconf/netconf-impl/pom.xml @@ -26,11 +26,25 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import + + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT + pom + import + + + org.opendaylight.controller + config-artifacts + 0.7.0-SNAPSHOT + pom + import + @@ -72,10 +86,6 @@ com.google.guava guava - - org.opendaylight.controller - protocol-framework - org.opendaylight.controller threadpool-config-api @@ -86,11 +96,6 @@ mockito-configuration - - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - org.slf4j slf4j-api diff --git a/netconf/netconf-mapping-api/pom.xml b/netconf/netconf-mapping-api/pom.xml index 1b1c8bc1c0..cbe00f7148 100644 --- a/netconf/netconf-mapping-api/pom.xml +++ b/netconf/netconf-mapping-api/pom.xml @@ -26,7 +26,7 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import diff --git a/netconf/netconf-monitoring/pom.xml b/netconf/netconf-monitoring/pom.xml index 21c4a9e410..c4ba5a0c7b 100644 --- a/netconf/netconf-monitoring/pom.xml +++ b/netconf/netconf-monitoring/pom.xml @@ -26,11 +26,25 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import + + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT + pom + import + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + 0.11.0-SNAPSHOT + pom + import + diff --git a/netconf/netconf-netty-util/pom.xml b/netconf/netconf-netty-util/pom.xml index 792a1d479b..44fa3c6fa6 100644 --- a/netconf/netconf-netty-util/pom.xml +++ b/netconf/netconf-netty-util/pom.xml @@ -26,20 +26,18 @@ org.opendaylight.netconf - netconf-parent + netconf-artifacts ${project.version} pom import - - org.opendaylight.netconf - netconf-subsystem - ${project.version} + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT pom import - openexi nagasena @@ -75,10 +73,6 @@ io.netty netty-handler - - org.opendaylight.controller - protocol-framework - org.apache.sshd sshd-core diff --git a/netconf/netconf-notifications-api/pom.xml b/netconf/netconf-notifications-api/pom.xml index 752dfd0978..aef8fde9b2 100644 --- a/netconf/netconf-notifications-api/pom.xml +++ b/netconf/netconf-notifications-api/pom.xml @@ -28,7 +28,7 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import diff --git a/netconf/netconf-notifications-impl/pom.xml b/netconf/netconf-notifications-impl/pom.xml index 1be1d3b3f6..50f8c40f60 100644 --- a/netconf/netconf-notifications-impl/pom.xml +++ b/netconf/netconf-notifications-impl/pom.xml @@ -27,11 +27,32 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + + + org.opendaylight.mdsal + mdsal-artifacts + 2.3.0-SNAPSHOT + pom + import + + + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT + pom + import + diff --git a/netconf/netconf-ssh/pom.xml b/netconf/netconf-ssh/pom.xml index 15ad387997..10cb64b162 100644 --- a/netconf/netconf-ssh/pom.xml +++ b/netconf/netconf-ssh/pom.xml @@ -25,11 +25,32 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import + + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT + pom + import + + + org.opendaylight.controller + config-artifacts + 0.7.0-SNAPSHOT + pom + import + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + 0.11.0-SNAPSHOT + pom + import + diff --git a/netconf/netconf-tcp/pom.xml b/netconf/netconf-tcp/pom.xml index 73e1b285e6..b802e1c42f 100644 --- a/netconf/netconf-tcp/pom.xml +++ b/netconf/netconf-tcp/pom.xml @@ -26,11 +26,25 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import + + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT + pom + import + + + org.opendaylight.controller + config-artifacts + 0.7.0-SNAPSHOT + pom + import + diff --git a/netconf/netconf-topology-config/pom.xml b/netconf/netconf-topology-config/pom.xml index bd063fe2e2..2f6d55f38d 100644 --- a/netconf/netconf-topology-config/pom.xml +++ b/netconf/netconf-topology-config/pom.xml @@ -28,7 +28,7 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import diff --git a/netconf/netconf-topology-singleton/pom.xml b/netconf/netconf-topology-singleton/pom.xml index 4014443859..ca8f498472 100644 --- a/netconf/netconf-topology-singleton/pom.xml +++ b/netconf/netconf-topology-singleton/pom.xml @@ -28,11 +28,18 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import + + org.opendaylight.controller + config-artifacts + 0.7.0-SNAPSHOT + pom + import + org.opendaylight.controller mdsal-artifacts diff --git a/netconf/netconf-topology/pom.xml b/netconf/netconf-topology/pom.xml index 09bade9544..34dfc2d843 100644 --- a/netconf/netconf-topology/pom.xml +++ b/netconf/netconf-topology/pom.xml @@ -19,11 +19,32 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import + + org.opendaylight.controller + config-artifacts + 0.7.0-SNAPSHOT + pom + import + + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + + + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT + pom + import + @@ -32,10 +53,6 @@ org.opendaylight.controller sal-binding-api - - org.opendaylight.mdsal - mdsal-binding-generator-impl - org.opendaylight.controller sal-core-api diff --git a/netconf/netconf-util/pom.xml b/netconf/netconf-util/pom.xml index 43ec022c23..85b6bb1fc5 100644 --- a/netconf/netconf-util/pom.xml +++ b/netconf/netconf-util/pom.xml @@ -26,15 +26,22 @@ org.opendaylight.netconf - netconf-parent + netconf-artifacts ${project.version} pom import - org.opendaylight.netconf - netconf-subsystem - ${project.version} + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT + pom + import + + + org.opendaylight.mdsal + mdsal-artifacts + 2.3.0-SNAPSHOT pom import @@ -43,10 +50,6 @@ - - org.opendaylight.mdsal - mdsal-binding-generator-impl - ${project.groupId} netconf-api @@ -72,6 +75,11 @@ xmlunit test + + org.opendaylight.mdsal + mdsal-binding-generator-impl + test + org.opendaylight.yangtools mockito-configuration @@ -84,6 +92,10 @@ org.opendaylight.yangtools yang-data-api + + org.opendaylight.yangtools + yang-data-impl + org.osgi org.osgi.compendium diff --git a/netconf/pom.xml b/netconf/pom.xml index 2330254ac9..fe028cff3d 100644 --- a/netconf/pom.xml +++ b/netconf/pom.xml @@ -63,30 +63,4 @@ netconf-artifacts - - - - - org.opendaylight.netconf - netconf-parent - ${project.version} - pom - import - - - - org.opendaylight.netconf - netconf-artifacts - ${project.version} - pom - import - - - - org.opendaylight.controller - protocol-framework - 0.10.0-SNAPSHOT - - - diff --git a/netconf/tools/netconf-cli/pom.xml b/netconf/tools/netconf-cli/pom.xml index 0d855c4ed6..e7ed9b517d 100644 --- a/netconf/tools/netconf-cli/pom.xml +++ b/netconf/tools/netconf-cli/pom.xml @@ -30,11 +30,32 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import + + org.opendaylight.mdsal + mdsal-artifacts + 2.3.0-SNAPSHOT + pom + import + + + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT + pom + import + + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml index b7cbc16210..090b03cb8a 100644 --- a/netconf/tools/netconf-testtool/pom.xml +++ b/netconf/tools/netconf-testtool/pom.xml @@ -32,11 +32,39 @@ org.opendaylight.netconf - netconf-subsystem + netconf-artifacts ${project.version} pom import + + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT + pom + import + + + org.opendaylight.controller + config-artifacts + 0.7.0-SNAPSHOT + pom + import + + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + 0.11.0-SNAPSHOT + pom + import + diff --git a/netconf/tools/pom.xml b/netconf/tools/pom.xml index 6ca3d458ad..2cc0aae07c 100644 --- a/netconf/tools/pom.xml +++ b/netconf/tools/pom.xml @@ -10,12 +10,15 @@ 4.0.0 - org.opendaylight.netconf - netconf-subsystem - 1.3.0-SNAPSHOT + org.opendaylight.odlparent + odlparent-lite + 2.0.2 + + org.opendaylight.netconf netconf-tools + 1.3.0-SNAPSHOT pom ${project.artifactId} diff --git a/pom.xml b/pom.xml index 42087923be..7085fbbf3f 100644 --- a/pom.xml +++ b/pom.xml @@ -30,66 +30,6 @@ karaf - - 0.7.0-SNAPSHOT - etc/opendaylight/karaf - - 2.3.0-SNAPSHOT - 0.11.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.3.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.2.0-SNAPSHOT - - - - - - - org.opendaylight.yangtools - yangtools-artifacts - ${yangtools.version} - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - ${mdsal.version} - pom - import - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${mdsal.model.version} - pom - import - - - org.opendaylight.aaa - aaa-artifacts - 0.6.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - config-artifacts - ${config.version} - pom - import - - - org.opendaylight.controller - mdsal-artifacts - ${controller.mdsal.version} - pom - import - - - - integrationtests diff --git a/restconf/models/ietf-restconf-monitoring/pom.xml b/restconf/models/ietf-restconf-monitoring/pom.xml index da693b1b06..72dce29541 100644 --- a/restconf/models/ietf-restconf-monitoring/pom.xml +++ b/restconf/models/ietf-restconf-monitoring/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.mdsal binding-parent 0.11.0-SNAPSHOT - ../../../binding/binding-parent + org.opendaylight.netconf diff --git a/restconf/models/ietf-restconf/pom.xml b/restconf/models/ietf-restconf/pom.xml index af2dddf504..8592df4312 100644 --- a/restconf/models/ietf-restconf/pom.xml +++ b/restconf/models/ietf-restconf/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.mdsal binding-parent 0.11.0-SNAPSHOT - ../../../binding/binding-parent + org.opendaylight.netconf diff --git a/restconf/models/ietf-yang-library/pom.xml b/restconf/models/ietf-yang-library/pom.xml index db8c7ce41c..dea433040a 100644 --- a/restconf/models/ietf-yang-library/pom.xml +++ b/restconf/models/ietf-yang-library/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.mdsal binding-parent 0.11.0-SNAPSHOT - ../../../binding/binding-parent + org.opendaylight.netconf diff --git a/restconf/models/pom.xml b/restconf/models/pom.xml index 74f2fc4df0..6582e0d5c0 100644 --- a/restconf/models/pom.xml +++ b/restconf/models/pom.xml @@ -10,12 +10,15 @@ 4.0.0 - org.opendaylight.netconf - restconf-parent - 1.6.0-SNAPSHOT + org.opendaylight.odlparent + odlparent-lite + 2.0.2 + + org.opendaylight.netconf restconf-models + 1.3.0-SNAPSHOT pom ${project.artifactId} diff --git a/restconf/pom.xml b/restconf/pom.xml index 4ed92263b9..c32e2c8703 100644 --- a/restconf/pom.xml +++ b/restconf/pom.xml @@ -35,23 +35,4 @@ models - - - - org.opendaylight.netconf - restconf-artifacts - ${project.version} - pom - import - - - org.opendaylight.netconf - netconf-parent - 1.3.0-SNAPSHOT - pom - import - - - - diff --git a/restconf/restconf-artifacts/pom.xml b/restconf/restconf-artifacts/pom.xml index 12a98fcbea..d64b24c51a 100644 --- a/restconf/restconf-artifacts/pom.xml +++ b/restconf/restconf-artifacts/pom.xml @@ -66,13 +66,6 @@ sal-restconf-broker ${project.version} - - ${project.groupId} - features-restconf - ${project.version} - xml - features - diff --git a/restconf/sal-rest-connector/pom.xml b/restconf/sal-rest-connector/pom.xml index b15f4a5b28..4e4d458e5f 100644 --- a/restconf/sal-rest-connector/pom.xml +++ b/restconf/sal-rest-connector/pom.xml @@ -29,6 +29,28 @@ pom import + + org.opendaylight.aaa + aaa-artifacts + 0.6.0-SNAPSHOT + pom + import + + + org.opendaylight.controller + config-artifacts + 0.7.0-SNAPSHOT + pom + import + + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + + org.glassfish.jersey.test-framework.providers jersey-test-framework-provider-grizzly2 diff --git a/restconf/sal-rest-docgen-maven/pom.xml b/restconf/sal-rest-docgen-maven/pom.xml index 33a8d20e19..0bd0fdd73f 100644 --- a/restconf/sal-rest-docgen-maven/pom.xml +++ b/restconf/sal-rest-docgen-maven/pom.xml @@ -30,11 +30,10 @@ pom import - - org.opendaylight.netconf - netconf-parent - 1.3.0-SNAPSHOT + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT pom import diff --git a/restconf/sal-rest-docgen/pom.xml b/restconf/sal-rest-docgen/pom.xml index a123804d27..74734fe652 100644 --- a/restconf/sal-rest-docgen/pom.xml +++ b/restconf/sal-rest-docgen/pom.xml @@ -23,9 +23,16 @@ - org.opendaylight.netconf - netconf-parent - 1.3.0-SNAPSHOT + org.opendaylight.yangtools + yangtools-artifacts + 1.2.0-SNAPSHOT + pom + import + + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT pom import -- 2.36.6