From 49ad475b53d4cffcfbd2576db048178e83754124 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 20 Aug 2019 20:16:15 +0200 Subject: [PATCH] Add feature-parent This centralizes a feature-parent pom.xml for reuse in single feature artifacts. Change-Id: I7153166a86721dea9d732e5a13174f82865e24c4 Signed-off-by: Robert Varga --- artifacts/pom.xml | 26 ++++++++++ .../netconf-connector/odl-message-bus/pom.xml | 13 ++--- .../odl-netconf-callhome-ssh/pom.xml | 14 ++--- .../odl-netconf-clustered-topology/pom.xml | 14 ++--- .../odl-netconf-connector-all/pom.xml | 13 ++--- .../odl-netconf-connector/pom.xml | 39 ++------------ .../odl-netconf-console/pom.xml | 15 ++---- .../odl-netconf-topology/pom.xml | 14 ++--- .../odl-aaa-netconf-plugin-no-cluster/pom.xml | 24 ++------- .../netconf/odl-aaa-netconf-plugin/pom.xml | 22 +++----- features/netconf/odl-netconf-all/pom.xml | 17 ++----- features/netconf/odl-netconf-api/pom.xml | 37 ++------------ features/netconf/odl-netconf-client/pom.xml | 14 ++--- features/netconf/odl-netconf-impl/pom.xml | 29 ++--------- .../netconf/odl-netconf-mapping-api/pom.xml | 13 ++--- features/netconf/odl-netconf-mdsal/pom.xml | 24 ++------- .../netconf/odl-netconf-netty-util/pom.xml | 30 ++--------- .../odl-netconf-notifications-api/pom.xml | 13 ++--- .../odl-netconf-notifications-impl/pom.xml | 35 ++++--------- features/netconf/odl-netconf-ssh/pom.xml | 14 ++--- features/netconf/odl-netconf-tcp/pom.xml | 13 ++--- .../netconf/odl-netconf-test-tools/pom.xml | 21 ++------ features/netconf/odl-netconf-util/pom.xml | 14 ++--- features/parent/pom.xml | 36 +++++++++++++ features/pom.xml | 1 + features/restconf/odl-mdsal-apidocs/pom.xml | 14 ++--- features/restconf/odl-restconf-all/pom.xml | 13 ++--- features/restconf/odl-restconf-common/pom.xml | 51 ++----------------- .../odl-restconf-nb-bierman02/pom.xml | 32 ++---------- .../restconf/odl-restconf-nb-rfc8040/pom.xml | 30 ++--------- features/restconf/odl-restconf/pom.xml | 13 ++--- features/yanglib/odl-yanglib/pom.xml | 23 ++------- 32 files changed, 188 insertions(+), 493 deletions(-) create mode 100644 features/parent/pom.xml diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 2fa50ea430..48a8304252 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -263,6 +263,11 @@ netconf-topology-singleton ${project.version} + + ${project.groupId} + netconf-console + ${project.version} + ${project.groupId} @@ -513,6 +518,13 @@ sal-rest-connector-config 1.13.0-SNAPSHOT + + org.opendaylight.netconf + sal-rest-connector-config + 1.13.0-SNAPSHOT + cfg + restconf + ${project.groupId} sal-rest-docgen @@ -570,6 +582,20 @@ xml features + + ${project.groupId} + odl-restconf-nb-bierman02 + 1.13.0-SNAPSHOT + xml + features + + + ${project.groupId} + odl-restconf-nb-rfc8040 + 1.13.0-SNAPSHOT + xml + features + diff --git a/features/netconf-connector/odl-message-bus/pom.xml b/features/netconf-connector/odl-message-bus/pom.xml index 83a55563c6..2282aa5db0 100644 --- a/features/netconf-connector/odl-message-bus/pom.xml +++ b/features/netconf-connector/odl-message-bus/pom.xml @@ -10,15 +10,13 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-message-bus - 1.13.0-SNAPSHOT feature @@ -27,21 +25,18 @@ ${project.groupId} odl-netconf-connector-all - ${project.version} xml features org.opendaylight.controller odl-controller-exp-messagebus - 3.0.6 xml features ${project.groupId} messagebus-netconf - ${project.version} diff --git a/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml b/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml index 0e8e395e39..1c90f78806 100644 --- a/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml +++ b/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml @@ -10,15 +10,13 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-netconf-callhome-ssh - 1.13.0-SNAPSHOT feature OpenDaylight :: Netconf Connector :: Netconf Callhome Connector + Netconf SSH Server @@ -27,24 +25,20 @@ ${project.groupId} odl-netconf-topology - ${project.version} xml features ${project.groupId} callhome-model - ${project.version} ${project.groupId} callhome-protocol - ${project.version} ${project.groupId} callhome-provider - ${project.version} diff --git a/features/netconf-connector/odl-netconf-clustered-topology/pom.xml b/features/netconf-connector/odl-netconf-clustered-topology/pom.xml index 248322ccf4..bce300bc83 100644 --- a/features/netconf-connector/odl-netconf-clustered-topology/pom.xml +++ b/features/netconf-connector/odl-netconf-clustered-topology/pom.xml @@ -10,38 +10,32 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-netconf-clustered-topology - 1.13.0-SNAPSHOT feature - OpenDaylight :: Clustered Netconf Topology :: Netconf Connector + Netconf SSH Server org.opendaylight.netconf odl-netconf-ssh - ${project.version} xml features org.opendaylight.netconf odl-netconf-connector - ${project.version} xml features org.opendaylight.netconf netconf-topology-singleton - ${project.version} diff --git a/features/netconf-connector/odl-netconf-connector-all/pom.xml b/features/netconf-connector/odl-netconf-connector-all/pom.xml index 81fd45fc4d..97377ed205 100644 --- a/features/netconf-connector/odl-netconf-connector-all/pom.xml +++ b/features/netconf-connector/odl-netconf-connector-all/pom.xml @@ -10,31 +10,26 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-netconf-connector-all - 1.13.0-SNAPSHOT feature - OpenDaylight :: Netconf Connector :: All ${project.groupId} odl-netconf-connector - ${project.version} xml features ${project.groupId} odl-netconf-callhome-ssh - ${project.version} xml features diff --git a/features/netconf-connector/odl-netconf-connector/pom.xml b/features/netconf-connector/odl-netconf-connector/pom.xml index 397d682192..91e0f6ce01 100644 --- a/features/netconf-connector/odl-netconf-connector/pom.xml +++ b/features/netconf-connector/odl-netconf-connector/pom.xml @@ -10,45 +10,17 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-netconf-connector - 1.13.0-SNAPSHOT feature OpenDaylight :: Netconf Connector :: Netconf Connector - - - - org.opendaylight.mdsal - mdsal-artifacts - 7.0.5 - pom - import - - - org.opendaylight.controller - controller-artifacts - 3.0.6 - pom - import - - - org.opendaylight.netconf - netconf-artifacts - 1.13.0-SNAPSHOT - pom - import - - - - org.opendaylight.controller @@ -59,14 +31,12 @@ org.opendaylight.netconf odl-netconf-notifications-api - ${project.version} xml features org.opendaylight.netconf odl-netconf-client - ${project.version} xml features @@ -91,7 +61,6 @@ org.opendaylight.aaa odl-aaa-encryption-service - 0.13.1 xml features diff --git a/features/netconf-connector/odl-netconf-console/pom.xml b/features/netconf-connector/odl-netconf-console/pom.xml index cafb2978cf..4131b92f13 100644 --- a/features/netconf-connector/odl-netconf-console/pom.xml +++ b/features/netconf-connector/odl-netconf-console/pom.xml @@ -10,45 +10,38 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-netconf-console - 1.13.0-SNAPSHOT feature - OpenDaylight :: Netconf Console + Karaf CLI for netconf CRUD operations org.opendaylight.netconf odl-netconf-mdsal - 1.13.0-SNAPSHOT xml features org.opendaylight.netconf odl-netconf-connector-all - ${project.version} xml features org.opendaylight.netconf odl-netconf-topology - ${project.version} xml features org.opendaylight.netconf netconf-console - ${project.version} diff --git a/features/netconf-connector/odl-netconf-topology/pom.xml b/features/netconf-connector/odl-netconf-topology/pom.xml index e93eeb0367..9369343da0 100644 --- a/features/netconf-connector/odl-netconf-topology/pom.xml +++ b/features/netconf-connector/odl-netconf-topology/pom.xml @@ -10,38 +10,32 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-netconf-topology - 1.13.0-SNAPSHOT feature - OpenDaylight :: Netconf Topology :: Netconf Connector + Netconf SSH Server + Netconf configuration via config topology datastore org.opendaylight.netconf odl-netconf-ssh - ${project.version} xml features org.opendaylight.netconf odl-netconf-connector - ${project.version} xml features org.opendaylight.netconf netconf-topology-impl - ${project.version} diff --git a/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml b/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml index 4dfced52e6..f9564b2d5f 100644 --- a/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml +++ b/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml @@ -10,31 +10,16 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-aaa-netconf-plugin-no-cluster - 1.13.0-SNAPSHOT feature - OpenDaylight :: AAA :: ODL NETCONF Plugin - NO CLUSTER - - - - org.opendaylight.netconf - netconf-artifacts - ${project.version} - pom - import - - - - org.opendaylight.netconf @@ -43,7 +28,6 @@ org.opendaylight.aaa odl-aaa-shiro - 0.13.1 xml features diff --git a/features/netconf/odl-aaa-netconf-plugin/pom.xml b/features/netconf/odl-aaa-netconf-plugin/pom.xml index 796d7a2f42..ba74517f27 100644 --- a/features/netconf/odl-aaa-netconf-plugin/pom.xml +++ b/features/netconf/odl-aaa-netconf-plugin/pom.xml @@ -10,36 +10,30 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-aaa-netconf-plugin - 1.13.0-SNAPSHOT feature - OpenDaylight :: AAA :: ODL NETCONF Plugin - - ${project.groupId} - netconf-auth - ${project.version} - org.opendaylight.aaa odl-aaa-shiro - 0.13.1 xml features ${project.groupId} aaa-authn-odl-plugin - ${project.version} + + + ${project.groupId} + netconf-auth diff --git a/features/netconf/odl-netconf-all/pom.xml b/features/netconf/odl-netconf-all/pom.xml index 4b8d1edaee..a7abd2a1e1 100644 --- a/features/netconf/odl-netconf-all/pom.xml +++ b/features/netconf/odl-netconf-all/pom.xml @@ -10,59 +10,50 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-netconf-all - 1.13.0-SNAPSHOT feature - OpenDaylight :: Netconf :: All ${project.groupId} odl-netconf-api - ${project.version} xml features ${project.groupId} odl-netconf-mapping-api - ${project.version} xml features ${project.groupId} odl-netconf-util - ${project.version} xml features ${project.groupId} odl-netconf-impl - ${project.version} xml features ${project.groupId} odl-netconf-netty-util - ${project.version} xml features ${project.groupId} odl-netconf-client - ${project.version} xml features diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml index 7ae0654ccb..3300302676 100644 --- a/features/netconf/odl-netconf-api/pom.xml +++ b/features/netconf/odl-netconf-api/pom.xml @@ -10,45 +10,16 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-netconf-api - 1.13.0-SNAPSHOT feature - OpenDaylight :: Netconf :: API - - - - org.opendaylight.yangtools - yangtools-artifacts - 6.0.4 - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - 7.0.5 - pom - import - - - org.opendaylight.netconf - netconf-artifacts - 1.13.0-SNAPSHOT - pom - import - - - - org.opendaylight.odlparent diff --git a/features/netconf/odl-netconf-client/pom.xml b/features/netconf/odl-netconf-client/pom.xml index 3da11e2ed0..77212b3fec 100644 --- a/features/netconf/odl-netconf-client/pom.xml +++ b/features/netconf/odl-netconf-client/pom.xml @@ -10,41 +10,35 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-netconf-client - 1.13.0-SNAPSHOT feature org.opendaylight.controller odl-controller-exp-netty-config - 3.0.6 xml features ${project.groupId} odl-netconf-netty-util - ${project.version} xml features ${project.groupId} netconf-client - ${project.version} ${project.groupId} netconf-config - ${project.version} diff --git a/features/netconf/odl-netconf-impl/pom.xml b/features/netconf/odl-netconf-impl/pom.xml index e7a0dea525..7eaeb45a5a 100644 --- a/features/netconf/odl-netconf-impl/pom.xml +++ b/features/netconf/odl-netconf-impl/pom.xml @@ -10,31 +10,16 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-netconf-impl - 1.13.0-SNAPSHOT feature - OpenDaylight :: Netconf :: Impl - - - - org.opendaylight.controller - controller-artifacts - 3.0.6 - pom - import - - - - org.opendaylight.controller @@ -45,42 +30,36 @@ ${project.groupId} odl-netconf-api - ${project.version} xml features ${project.groupId} odl-netconf-mapping-api - ${project.version} xml features ${project.groupId} odl-netconf-util - ${project.version} xml features ${project.groupId} odl-netconf-netty-util - ${project.version} xml features ${project.groupId} odl-netconf-notifications-impl - ${project.version} xml features ${project.groupId} netconf-impl - ${project.version} diff --git a/features/netconf/odl-netconf-mapping-api/pom.xml b/features/netconf/odl-netconf-mapping-api/pom.xml index 8687ce353e..f30fa1fd43 100644 --- a/features/netconf/odl-netconf-mapping-api/pom.xml +++ b/features/netconf/odl-netconf-mapping-api/pom.xml @@ -10,31 +10,26 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-netconf-mapping-api - 1.13.0-SNAPSHOT feature - OpenDaylight :: Netconf :: Mapping API org.opendaylight.netconf odl-netconf-api - 1.13.0-SNAPSHOT xml features org.opendaylight.netconf netconf-mapping-api - 1.13.0-SNAPSHOT diff --git a/features/netconf/odl-netconf-mdsal/pom.xml b/features/netconf/odl-netconf-mdsal/pom.xml index 40b022b01b..f08394d2b4 100644 --- a/features/netconf/odl-netconf-mdsal/pom.xml +++ b/features/netconf/odl-netconf-mdsal/pom.xml @@ -10,32 +10,16 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-netconf-mdsal - - 1.13.0-SNAPSHOT feature - OpenDaylight :: Netconf :: Mdsal - - - - ${project.groupId} - netconf-artifacts - 1.13.0-SNAPSHOT - pom - import - - - - ${project.groupId} diff --git a/features/netconf/odl-netconf-netty-util/pom.xml b/features/netconf/odl-netconf-netty-util/pom.xml index 70a96178a5..d7edacd502 100644 --- a/features/netconf/odl-netconf-netty-util/pom.xml +++ b/features/netconf/odl-netconf-netty-util/pom.xml @@ -10,38 +10,16 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-netconf-netty-util - 1.13.0-SNAPSHOT feature - OpenDaylight :: Netconf :: Netty Util - - - - ${project.groupId} - netconf-artifacts - ${project.version} - import - pom - - - org.opendaylight.aaa - aaa-artifacts - 0.13.1 - import - pom - - - - org.apache.karaf.features diff --git a/features/netconf/odl-netconf-notifications-api/pom.xml b/features/netconf/odl-netconf-notifications-api/pom.xml index 21d74f9a7b..e3305bb70c 100644 --- a/features/netconf/odl-netconf-notifications-api/pom.xml +++ b/features/netconf/odl-netconf-notifications-api/pom.xml @@ -10,31 +10,26 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-netconf-notifications-api - 1.13.0-SNAPSHOT feature - OpenDaylight :: Netconf :: Notification :: Api ${project.groupId} odl-netconf-api - ${project.version} xml features ${project.groupId} netconf-notifications-api - ${project.version} diff --git a/features/netconf/odl-netconf-notifications-impl/pom.xml b/features/netconf/odl-netconf-notifications-impl/pom.xml index 6a96493fe4..c2cbe00701 100644 --- a/features/netconf/odl-netconf-notifications-impl/pom.xml +++ b/features/netconf/odl-netconf-notifications-impl/pom.xml @@ -10,49 +10,32 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-netconf-notifications-impl - 1.13.0-SNAPSHOT feature - OpenDaylight :: Netconf :: Monitoring :: Impl - - - - org.opendaylight.mdsal - mdsal-artifacts - 7.0.5 - pom - import - - - - - ${project.groupId} - odl-netconf-notifications-api - ${project.version} + org.opendaylight.mdsal + odl-mdsal-binding-runtime xml features ${project.groupId} - odl-netconf-util - ${project.version} + odl-netconf-notifications-api xml features - org.opendaylight.mdsal - odl-mdsal-binding-runtime + ${project.groupId} + odl-netconf-util xml features diff --git a/features/netconf/odl-netconf-ssh/pom.xml b/features/netconf/odl-netconf-ssh/pom.xml index 69a3480b15..6cd83dc9cf 100644 --- a/features/netconf/odl-netconf-ssh/pom.xml +++ b/features/netconf/odl-netconf-ssh/pom.xml @@ -10,38 +10,32 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-netconf-ssh - 1.13.0-SNAPSHOT feature - OpenDaylight :: Netconf Connector :: SSH ${project.groupId} odl-aaa-netconf-plugin - ${project.version} xml features ${project.groupId} odl-netconf-util - ${project.version} xml features ${project.groupId} odl-netconf-tcp - ${project.version} xml features diff --git a/features/netconf/odl-netconf-tcp/pom.xml b/features/netconf/odl-netconf-tcp/pom.xml index 0feafa3c3b..6ff19a0a39 100644 --- a/features/netconf/odl-netconf-tcp/pom.xml +++ b/features/netconf/odl-netconf-tcp/pom.xml @@ -10,31 +10,26 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-netconf-tcp - 1.13.0-SNAPSHOT feature - OpenDaylight :: Netconf Connector :: TCP ${project.groupId} odl-netconf-util - ${project.version} xml features ${project.groupId} odl-netconf-impl - ${project.version} xml features diff --git a/features/netconf/odl-netconf-test-tools/pom.xml b/features/netconf/odl-netconf-test-tools/pom.xml index 7778cedcc3..09b4ddb400 100644 --- a/features/netconf/odl-netconf-test-tools/pom.xml +++ b/features/netconf/odl-netconf-test-tools/pom.xml @@ -8,32 +8,19 @@ --> - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent 4.0.0 org.opendaylight.netconf odl-netconf-test-tools - 1.13.0-SNAPSHOT feature OpenDaylight :: NETCONF Test Tools :: Tools used for performance testing - - - - ${project.groupId} - netconf-artifacts - 1.13.0-SNAPSHOT - pom - import - - - - ${project.groupId} diff --git a/features/netconf/odl-netconf-util/pom.xml b/features/netconf/odl-netconf-util/pom.xml index c5090194ba..574d98975a 100644 --- a/features/netconf/odl-netconf-util/pom.xml +++ b/features/netconf/odl-netconf-util/pom.xml @@ -10,42 +10,36 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-netconf-util - 1.13.0-SNAPSHOT feature org.opendaylight.netconf odl-netconf-mapping-api - ${project.version} xml features org.opendaylight.yangtools odl-yangtools-codec - 6.0.4 xml features org.opendaylight.netconf netconf-util - ${project.version} org.opendaylight.netconf netconf-util - ${project.version} cfg config diff --git a/features/parent/pom.xml b/features/parent/pom.xml new file mode 100644 index 0000000000..1028d8ae8d --- /dev/null +++ b/features/parent/pom.xml @@ -0,0 +1,36 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 8.1.0 + + + + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + pom + + + + + org.opendaylight.netconf + netconf-parent + 1.13.0-SNAPSHOT + pom + import + + + + + diff --git a/features/pom.xml b/features/pom.xml index ad52398609..ab0d2a4221 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -26,6 +26,7 @@ + parent netconf netconf-connector restconf diff --git a/features/restconf/odl-mdsal-apidocs/pom.xml b/features/restconf/odl-mdsal-apidocs/pom.xml index 51efd8b5f8..99a1a46a24 100644 --- a/features/restconf/odl-mdsal-apidocs/pom.xml +++ b/features/restconf/odl-mdsal-apidocs/pom.xml @@ -10,38 +10,32 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-mdsal-apidocs - 1.13.0-SNAPSHOT feature - OpenDaylight :: MDSAL :: APIDOCS org.opendaylight.odlparent odl-jackson-2.11 - 8.1.0 xml features org.opendaylight.netconf odl-restconf - ${project.version} xml features org.opendaylight.netconf sal-rest-docgen - ${project.version} diff --git a/features/restconf/odl-restconf-all/pom.xml b/features/restconf/odl-restconf-all/pom.xml index 036b6a1881..ed5a0a7689 100644 --- a/features/restconf/odl-restconf-all/pom.xml +++ b/features/restconf/odl-restconf-all/pom.xml @@ -10,31 +10,26 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-restconf-all - 1.13.0-SNAPSHOT feature - OpenDaylight :: Restconf :: All ${project.groupId} odl-restconf - ${project.version} xml features ${project.groupId} odl-mdsal-apidocs - ${project.version} xml features diff --git a/features/restconf/odl-restconf-common/pom.xml b/features/restconf/odl-restconf-common/pom.xml index f99c15eeae..7a76e16d0d 100644 --- a/features/restconf/odl-restconf-common/pom.xml +++ b/features/restconf/odl-restconf-common/pom.xml @@ -10,59 +10,16 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-restconf-common - 1.13.0-SNAPSHOT feature - OpenDaylight :: Restconf :: Common - - - - org.opendaylight.yangtools - yangtools-artifacts - 6.0.4 - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - 7.0.5 - pom - import - - - org.opendaylight.controller - controller-artifacts - 3.0.6 - pom - import - - - org.opendaylight.aaa - aaa-artifacts - 0.13.1 - pom - import - - - org.opendaylight.netconf - netconf-artifacts - 1.13.0-SNAPSHOT - pom - import - - - - org.opendaylight.odlparent diff --git a/features/restconf/odl-restconf-nb-bierman02/pom.xml b/features/restconf/odl-restconf-nb-bierman02/pom.xml index fa75243566..228efbb558 100644 --- a/features/restconf/odl-restconf-nb-bierman02/pom.xml +++ b/features/restconf/odl-restconf-nb-bierman02/pom.xml @@ -10,38 +10,16 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-restconf-nb-bierman02 - 1.13.0-SNAPSHOT feature - OpenDaylight :: Restconf :: NB :: bierman02 - - - - org.opendaylight.mdsal - mdsal-artifacts - 7.0.5 - pom - import - - - org.opendaylight.netconf - netconf-artifacts - 1.13.0-SNAPSHOT - pom - import - - - - org.opendaylight.netconf @@ -58,12 +36,10 @@ org.opendaylight.netconf restconf-nb-bierman02 - ${project.version} org.opendaylight.netconf sal-rest-connector-config - ${project.version} cfg restconf diff --git a/features/restconf/odl-restconf-nb-rfc8040/pom.xml b/features/restconf/odl-restconf-nb-rfc8040/pom.xml index d6a6d82b7b..05e5c8a3e7 100644 --- a/features/restconf/odl-restconf-nb-rfc8040/pom.xml +++ b/features/restconf/odl-restconf-nb-rfc8040/pom.xml @@ -10,38 +10,16 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-restconf-nb-rfc8040 - 1.13.0-SNAPSHOT feature - OpenDaylight :: Restconf :: NB :: RFC8040 - - - - org.opendaylight.controller - controller-artifacts - 3.0.6 - pom - import - - - org.opendaylight.netconf - netconf-artifacts - 1.13.0-SNAPSHOT - pom - import - - - - org.opendaylight.controller diff --git a/features/restconf/odl-restconf/pom.xml b/features/restconf/odl-restconf/pom.xml index db04c5373d..d248c1d5e2 100644 --- a/features/restconf/odl-restconf/pom.xml +++ b/features/restconf/odl-restconf/pom.xml @@ -10,31 +10,26 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-restconf - 1.13.0-SNAPSHOT feature - OpenDaylight :: Restconf org.opendaylight.netconf odl-restconf-nb-bierman02 - ${project.version} xml features org.opendaylight.netconf odl-restconf-nb-rfc8040 - ${project.version} xml features diff --git a/features/yanglib/odl-yanglib/pom.xml b/features/yanglib/odl-yanglib/pom.xml index 43fcc179c0..60d39c6f01 100644 --- a/features/yanglib/odl-yanglib/pom.xml +++ b/features/yanglib/odl-yanglib/pom.xml @@ -10,31 +10,16 @@ 4.0.0 - org.opendaylight.odlparent - single-feature-parent - 8.1.0 - + org.opendaylight.netconf + feature-parent + 1.13.0-SNAPSHOT + ../../parent - org.opendaylight.netconf odl-yanglib - 1.13.0-SNAPSHOT feature - OpenDaylight :: Yanglib - - - - org.opendaylight.netconf - netconf-artifacts - 1.13.0-SNAPSHOT - pom - import - - - - org.opendaylight.netconf -- 2.36.6