From 4d5817a913974a739cc721cf49b4c0669c380c5a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 20 Aug 2019 19:04:21 +0200 Subject: [PATCH] Move netconf-parent This parent is a dead ringer for restconf-parent, promote it to project-wide parent and inherit dependencies from restconf-parent, hence we lose duplicate definitions of upstream dependencies. Change-Id: If2e994a6a76f1826e2976855f9e9624597628ca8 Signed-off-by: Robert Varga --- netconf/aaa-authn-odl-plugin/pom.xml | 2 +- netconf/callhome-model/pom.xml | 2 +- netconf/callhome-protocol/pom.xml | 2 +- netconf/callhome-provider/pom.xml | 2 +- netconf/mdsal-netconf-connector/pom.xml | 2 +- netconf/mdsal-netconf-impl/pom.xml | 2 +- netconf/mdsal-netconf-monitoring/pom.xml | 2 +- netconf/mdsal-netconf-notification/pom.xml | 2 +- netconf/mdsal-netconf-ssh/pom.xml | 2 +- netconf/mdsal-netconf-tcp/pom.xml | 2 +- netconf/mdsal-netconf-yang-library/pom.xml | 2 +- netconf/messagebus-netconf/pom.xml | 2 +- .../ietf-netconf-monitoring-extension/pom.xml | 2 +- .../models/ietf-netconf-monitoring/pom.xml | 2 +- netconf/models/ietf-netconf-nmda/pom.xml | 2 +- .../models/ietf-netconf-notifications/pom.xml | 2 +- .../models/ietf-netconf-with-defaults/pom.xml | 2 +- netconf/models/ietf-netconf/pom.xml | 2 +- netconf/netconf-api/pom.xml | 2 +- netconf/netconf-auth/pom.xml | 2 +- netconf/netconf-client/pom.xml | 2 +- netconf/netconf-console/pom.xml | 2 +- netconf/netconf-impl/pom.xml | 2 +- netconf/netconf-mapping-api/pom.xml | 2 +- netconf/netconf-netty-util/pom.xml | 2 +- netconf/netconf-notifications-api/pom.xml | 2 +- netconf/netconf-topology-singleton/pom.xml | 2 +- netconf/netconf-topology/pom.xml | 2 +- netconf/netconf-util/pom.xml | 2 +- netconf/pom.xml | 1 - netconf/sal-netconf-connector/pom.xml | 2 +- netconf/tools/netconf-testtool/pom.xml | 2 +- netconf/yanglib/pom.xml | 2 +- {netconf/netconf-parent => parent}/pom.xml | 15 +++++ pom.xml | 1 + restconf/restconf-parent/pom.xml | 67 ++----------------- 36 files changed, 52 insertions(+), 96 deletions(-) rename {netconf/netconf-parent => parent}/pom.xml (82%) diff --git a/netconf/aaa-authn-odl-plugin/pom.xml b/netconf/aaa-authn-odl-plugin/pom.xml index dbb38b27b0..8f0ec7fdd9 100644 --- a/netconf/aaa-authn-odl-plugin/pom.xml +++ b/netconf/aaa-authn-odl-plugin/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/callhome-model/pom.xml b/netconf/callhome-model/pom.xml index d56de714ac..c46b4b18eb 100644 --- a/netconf/callhome-model/pom.xml +++ b/netconf/callhome-model/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/callhome-protocol/pom.xml b/netconf/callhome-protocol/pom.xml index 98299e073f..4d52ba9fd6 100644 --- a/netconf/callhome-protocol/pom.xml +++ b/netconf/callhome-protocol/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/callhome-provider/pom.xml b/netconf/callhome-provider/pom.xml index 20da7ba353..567e9b95ec 100644 --- a/netconf/callhome-provider/pom.xml +++ b/netconf/callhome-provider/pom.xml @@ -7,7 +7,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/mdsal-netconf-connector/pom.xml b/netconf/mdsal-netconf-connector/pom.xml index fabdd3f553..0179e53121 100644 --- a/netconf/mdsal-netconf-connector/pom.xml +++ b/netconf/mdsal-netconf-connector/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/mdsal-netconf-impl/pom.xml b/netconf/mdsal-netconf-impl/pom.xml index 9cf719df91..4784dfd83e 100644 --- a/netconf/mdsal-netconf-impl/pom.xml +++ b/netconf/mdsal-netconf-impl/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/mdsal-netconf-monitoring/pom.xml b/netconf/mdsal-netconf-monitoring/pom.xml index 79de476a0a..9fe76ca6b8 100644 --- a/netconf/mdsal-netconf-monitoring/pom.xml +++ b/netconf/mdsal-netconf-monitoring/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/mdsal-netconf-notification/pom.xml b/netconf/mdsal-netconf-notification/pom.xml index 4153a7d0d6..17fe14be66 100644 --- a/netconf/mdsal-netconf-notification/pom.xml +++ b/netconf/mdsal-netconf-notification/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent mdsal-netconf-notification diff --git a/netconf/mdsal-netconf-ssh/pom.xml b/netconf/mdsal-netconf-ssh/pom.xml index 259b2d9b94..f1895fb2f0 100644 --- a/netconf/mdsal-netconf-ssh/pom.xml +++ b/netconf/mdsal-netconf-ssh/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent mdsal-netconf-ssh diff --git a/netconf/mdsal-netconf-tcp/pom.xml b/netconf/mdsal-netconf-tcp/pom.xml index c656657788..8e618e6bdd 100644 --- a/netconf/mdsal-netconf-tcp/pom.xml +++ b/netconf/mdsal-netconf-tcp/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent mdsal-netconf-tcp diff --git a/netconf/mdsal-netconf-yang-library/pom.xml b/netconf/mdsal-netconf-yang-library/pom.xml index 6495d0e276..71ef074522 100644 --- a/netconf/mdsal-netconf-yang-library/pom.xml +++ b/netconf/mdsal-netconf-yang-library/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/messagebus-netconf/pom.xml b/netconf/messagebus-netconf/pom.xml index b527aa938b..8b54ae1423 100644 --- a/netconf/messagebus-netconf/pom.xml +++ b/netconf/messagebus-netconf/pom.xml @@ -15,7 +15,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/models/ietf-netconf-monitoring-extension/pom.xml b/netconf/models/ietf-netconf-monitoring-extension/pom.xml index 78943004ed..d55013a2d1 100644 --- a/netconf/models/ietf-netconf-monitoring-extension/pom.xml +++ b/netconf/models/ietf-netconf-monitoring-extension/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../../netconf-parent + ../../../parent org.opendaylight.netconf diff --git a/netconf/models/ietf-netconf-monitoring/pom.xml b/netconf/models/ietf-netconf-monitoring/pom.xml index a5bfb57af7..880a77883b 100644 --- a/netconf/models/ietf-netconf-monitoring/pom.xml +++ b/netconf/models/ietf-netconf-monitoring/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../../netconf-parent + ../../../parent org.opendaylight.netconf diff --git a/netconf/models/ietf-netconf-nmda/pom.xml b/netconf/models/ietf-netconf-nmda/pom.xml index a021508155..5da4ad7d89 100644 --- a/netconf/models/ietf-netconf-nmda/pom.xml +++ b/netconf/models/ietf-netconf-nmda/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../../netconf-parent + ../../../parent org.opendaylight.netconf diff --git a/netconf/models/ietf-netconf-notifications/pom.xml b/netconf/models/ietf-netconf-notifications/pom.xml index fd0bfaeadd..baee903066 100644 --- a/netconf/models/ietf-netconf-notifications/pom.xml +++ b/netconf/models/ietf-netconf-notifications/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../../netconf-parent + ../../../parent org.opendaylight.netconf diff --git a/netconf/models/ietf-netconf-with-defaults/pom.xml b/netconf/models/ietf-netconf-with-defaults/pom.xml index be6827f649..bbf57db1c3 100644 --- a/netconf/models/ietf-netconf-with-defaults/pom.xml +++ b/netconf/models/ietf-netconf-with-defaults/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../../netconf-parent + ../../../parent org.opendaylight.netconf diff --git a/netconf/models/ietf-netconf/pom.xml b/netconf/models/ietf-netconf/pom.xml index 28b95d8779..76ca5cb8a4 100644 --- a/netconf/models/ietf-netconf/pom.xml +++ b/netconf/models/ietf-netconf/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../../netconf-parent + ../../../parent org.opendaylight.netconf diff --git a/netconf/netconf-api/pom.xml b/netconf/netconf-api/pom.xml index b6117c4b23..2690f0d9fd 100644 --- a/netconf/netconf-api/pom.xml +++ b/netconf/netconf-api/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/netconf-auth/pom.xml b/netconf/netconf-auth/pom.xml index b505a8b836..b28acff4a6 100644 --- a/netconf/netconf-auth/pom.xml +++ b/netconf/netconf-auth/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/netconf-client/pom.xml b/netconf/netconf-client/pom.xml index 5044cb2fc3..1408e540b1 100644 --- a/netconf/netconf-client/pom.xml +++ b/netconf/netconf-client/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/netconf-console/pom.xml b/netconf/netconf-console/pom.xml index a0760da253..784f322d78 100644 --- a/netconf/netconf-console/pom.xml +++ b/netconf/netconf-console/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/netconf-impl/pom.xml b/netconf/netconf-impl/pom.xml index eb93e6b9a8..771be0670e 100644 --- a/netconf/netconf-impl/pom.xml +++ b/netconf/netconf-impl/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/netconf-mapping-api/pom.xml b/netconf/netconf-mapping-api/pom.xml index 7d5f4b7d53..5caceae4c1 100644 --- a/netconf/netconf-mapping-api/pom.xml +++ b/netconf/netconf-mapping-api/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/netconf-netty-util/pom.xml b/netconf/netconf-netty-util/pom.xml index a596ecb340..8fff64f5c6 100644 --- a/netconf/netconf-netty-util/pom.xml +++ b/netconf/netconf-netty-util/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/netconf-notifications-api/pom.xml b/netconf/netconf-notifications-api/pom.xml index 310688a861..fae294585a 100644 --- a/netconf/netconf-notifications-api/pom.xml +++ b/netconf/netconf-notifications-api/pom.xml @@ -16,7 +16,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/netconf-topology-singleton/pom.xml b/netconf/netconf-topology-singleton/pom.xml index be7f4f5e31..7898c3fcae 100644 --- a/netconf/netconf-topology-singleton/pom.xml +++ b/netconf/netconf-topology-singleton/pom.xml @@ -15,7 +15,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/netconf-topology/pom.xml b/netconf/netconf-topology/pom.xml index 16ddb787fa..4784a31100 100644 --- a/netconf/netconf-topology/pom.xml +++ b/netconf/netconf-topology/pom.xml @@ -7,7 +7,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/netconf-util/pom.xml b/netconf/netconf-util/pom.xml index 4a97676777..e410049598 100644 --- a/netconf/netconf-util/pom.xml +++ b/netconf/netconf-util/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/pom.xml b/netconf/pom.xml index 9612a73d38..af02c5d449 100644 --- a/netconf/pom.xml +++ b/netconf/pom.xml @@ -39,7 +39,6 @@ mdsal-netconf-notification mdsal-netconf-yang-library mdsal-netconf-impl - netconf-parent netconf-util netconf-netty-util netconf-mapping-api diff --git a/netconf/sal-netconf-connector/pom.xml b/netconf/sal-netconf-connector/pom.xml index 6a6e42fc1c..85e0968b99 100644 --- a/netconf/sal-netconf-connector/pom.xml +++ b/netconf/sal-netconf-connector/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml index 2729a19491..730b41e8e8 100644 --- a/netconf/tools/netconf-testtool/pom.xml +++ b/netconf/tools/netconf-testtool/pom.xml @@ -15,7 +15,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../../netconf-parent + ../../../parent org.opendaylight.netconf diff --git a/netconf/yanglib/pom.xml b/netconf/yanglib/pom.xml index 74484ad884..7fa65218e6 100644 --- a/netconf/yanglib/pom.xml +++ b/netconf/yanglib/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.netconf netconf-parent 1.8.0-SNAPSHOT - ../netconf-parent + ../../parent org.opendaylight.netconf diff --git a/netconf/netconf-parent/pom.xml b/parent/pom.xml similarity index 82% rename from netconf/netconf-parent/pom.xml rename to parent/pom.xml index 1d0a25c172..5ee3c4b532 100644 --- a/netconf/netconf-parent/pom.xml +++ b/parent/pom.xml @@ -29,6 +29,13 @@ pom import + + org.opendaylight.controller + config-artifacts + 0.12.0-SNAPSHOT + pom + import + org.opendaylight.controller mdsal-artifacts @@ -36,6 +43,14 @@ pom import + + org.opendaylight.infrautils + infrautils-artifacts + 1.7.0-SNAPSHOT + pom + import + + org.opendaylight.netconf netconf-artifacts diff --git a/pom.xml b/pom.xml index b5ef338dec..57c3a9ca94 100644 --- a/pom.xml +++ b/pom.xml @@ -30,6 +30,7 @@ artifacts + parent features karaf netconf diff --git a/restconf/restconf-parent/pom.xml b/restconf/restconf-parent/pom.xml index 6cdfe3a542..b85100b614 100644 --- a/restconf/restconf-parent/pom.xml +++ b/restconf/restconf-parent/pom.xml @@ -9,73 +9,14 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 4.0.4 - + org.opendaylight.netconf + netconf-parent + 1.8.0-SNAPSHOT + ../../parent org.opendaylight.netconf restconf-parent 1.11.0-SNAPSHOT pom - - - - - org.opendaylight.infrautils - infrautils-artifacts - 1.7.0-SNAPSHOT - pom - import - - - org.opendaylight.aaa - aaa-artifacts - 0.11.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.11.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - config-artifacts - 0.12.0-SNAPSHOT - pom - import - - - org.opendaylight.netconf - netconf-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - checkstyle.violationSeverity=error - - - - com.github.spotbugs - spotbugs-maven-plugin - - true - - - - -- 2.36.6