From ddd6b9224cbd5de5153710a266f55e548ada03a7 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Wed, 11 Jan 2017 17:37:32 +0100 Subject: [PATCH] BUG-7529: provide Karaf 4 features Change-Id: I649dcae1d60155d5dd656eb3416183889a8f6a14 Signed-off-by: Stephen Kitt Signed-off-by: Robert Varga --- .../features-netconf-connector/pom.xml | 134 +++++++++ .../src/main/features/features.xml | 0 .../features4-netconf-connector/pom.xml | 77 ++++++ .../netconf-connector/odl-message-bus/pom.xml | 49 ++++ .../odl-netconf-clustered-topology/pom.xml | 49 ++++ .../odl-netconf-connector-all/pom.xml | 44 +++ .../odl-netconf-connector-ssh/pom.xml | 42 +++ .../odl-netconf-connector/pom.xml | 91 ++++++ .../odl-netconf-console/pom.xml | 56 ++++ .../odl-netconf-topology/pom.xml | 49 ++++ features/netconf-connector/pom.xml | 153 ++--------- features/netconf/features-netconf/pom.xml | 259 ++++++++++++++++++ .../src/main/features/features.xml | 0 features/netconf/features4-netconf/pom.xml | 140 ++++++++++ .../odl-aaa-netconf-plugin-no-cluster/pom.xml | 64 +++++ .../netconf/odl-aaa-netconf-plugin/pom.xml | 54 ++++ .../odl-config-netconf-connector/pom.xml | 83 ++++++ features/netconf/odl-netconf-all/pom.xml | 86 ++++++ features/netconf/odl-netconf-api/pom.xml | 96 +++++++ features/netconf/odl-netconf-client/pom.xml | 59 ++++ features/netconf/odl-netconf-impl/pom.xml | 103 +++++++ .../netconf/odl-netconf-mapping-api/pom.xml | 42 +++ features/netconf/odl-netconf-mdsal/pom.xml | 125 +++++++++ .../netconf/odl-netconf-monitoring/pom.xml | 42 +++ .../netconf/odl-netconf-netty-util/pom.xml | 71 +++++ .../odl-netconf-notifications-api/pom.xml | 49 ++++ .../odl-netconf-notifications-impl/pom.xml | 49 ++++ features/netconf/odl-netconf-ssh/pom.xml | 56 ++++ features/netconf/odl-netconf-tcp/pom.xml | 56 ++++ features/netconf/odl-netconf-util/pom.xml | 56 ++++ .../src/main/feature/feature.xml | 15 + features/netconf/pom.xml | 259 ++---------------- features/restconf/features-restconf/pom.xml | 191 +++++++++++++ .../src/main/features/features.xml | 0 features/restconf/features4-restconf/pom.xml | 56 ++++ features/restconf/odl-mdsal-apidocs/pom.xml | 86 ++++++ features/restconf/odl-restconf-all/pom.xml | 44 +++ features/restconf/odl-restconf-noauth/pom.xml | 146 ++++++++++ .../src/main/feature/feature.xml | 19 ++ features/restconf/odl-restconf/pom.xml | 44 +++ features/restconf/pom.xml | 207 ++------------ features/yanglib/features-yanglib/pom.xml | 129 +++++++++ .../src/main/features/features.xml | 0 features/yanglib/features4-yanglib/pom.xml | 35 +++ features/yanglib/odl-yanglib/pom.xml | 64 +++++ .../odl-yanglib/src/main/feature/feature.xml | 13 + features/yanglib/pom.xml | 114 +------- netconf/netconf-console/pom.xml | 21 ++ netconf/tools/netconf-testtool/pom.xml | 2 +- .../opendaylight/netconf/test/tool/Main.java | 2 +- restconf/sal-rest-connector/pom.xml | 6 - 51 files changed, 3038 insertions(+), 649 deletions(-) create mode 100644 features/netconf-connector/features-netconf-connector/pom.xml rename features/netconf-connector/{ => features-netconf-connector}/src/main/features/features.xml (100%) create mode 100644 features/netconf-connector/features4-netconf-connector/pom.xml create mode 100644 features/netconf-connector/odl-message-bus/pom.xml create mode 100644 features/netconf-connector/odl-netconf-clustered-topology/pom.xml create mode 100644 features/netconf-connector/odl-netconf-connector-all/pom.xml create mode 100644 features/netconf-connector/odl-netconf-connector-ssh/pom.xml create mode 100644 features/netconf-connector/odl-netconf-connector/pom.xml create mode 100644 features/netconf-connector/odl-netconf-console/pom.xml create mode 100644 features/netconf-connector/odl-netconf-topology/pom.xml create mode 100644 features/netconf/features-netconf/pom.xml rename features/netconf/{ => features-netconf}/src/main/features/features.xml (100%) create mode 100644 features/netconf/features4-netconf/pom.xml create mode 100644 features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml create mode 100644 features/netconf/odl-aaa-netconf-plugin/pom.xml create mode 100644 features/netconf/odl-config-netconf-connector/pom.xml create mode 100644 features/netconf/odl-netconf-all/pom.xml create mode 100644 features/netconf/odl-netconf-api/pom.xml create mode 100644 features/netconf/odl-netconf-client/pom.xml create mode 100644 features/netconf/odl-netconf-impl/pom.xml create mode 100644 features/netconf/odl-netconf-mapping-api/pom.xml create mode 100644 features/netconf/odl-netconf-mdsal/pom.xml create mode 100644 features/netconf/odl-netconf-monitoring/pom.xml create mode 100644 features/netconf/odl-netconf-netty-util/pom.xml create mode 100644 features/netconf/odl-netconf-notifications-api/pom.xml create mode 100644 features/netconf/odl-netconf-notifications-impl/pom.xml create mode 100644 features/netconf/odl-netconf-ssh/pom.xml create mode 100644 features/netconf/odl-netconf-tcp/pom.xml create mode 100644 features/netconf/odl-netconf-util/pom.xml create mode 100644 features/netconf/odl-netconf-util/src/main/feature/feature.xml create mode 100644 features/restconf/features-restconf/pom.xml rename features/restconf/{ => features-restconf}/src/main/features/features.xml (100%) create mode 100644 features/restconf/features4-restconf/pom.xml create mode 100644 features/restconf/odl-mdsal-apidocs/pom.xml create mode 100644 features/restconf/odl-restconf-all/pom.xml create mode 100644 features/restconf/odl-restconf-noauth/pom.xml create mode 100644 features/restconf/odl-restconf-noauth/src/main/feature/feature.xml create mode 100644 features/restconf/odl-restconf/pom.xml create mode 100644 features/yanglib/features-yanglib/pom.xml rename features/yanglib/{ => features-yanglib}/src/main/features/features.xml (100%) create mode 100644 features/yanglib/features4-yanglib/pom.xml create mode 100644 features/yanglib/odl-yanglib/pom.xml create mode 100644 features/yanglib/odl-yanglib/src/main/feature/feature.xml diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml new file mode 100644 index 0000000000..0750c52c2d --- /dev/null +++ b/features/netconf-connector/features-netconf-connector/pom.xml @@ -0,0 +1,134 @@ + + + + 4.0.0 + + org.opendaylight.odlparent + features-parent + 1.8.0-SNAPSHOT + + + org.opendaylight.netconf + features-netconf-connector + 1.2.0-SNAPSHOT + jar + + + 1.8.0-SNAPSHOT + 1.5.0-SNAPSHOT + 0.6.0-SNAPSHOT + 1.8.0-SNAPSHOT + 2.2.0-SNAPSHOT + 0.10.0-SNAPSHOT + 1.2.0-SNAPSHOT + 1.5.0-SNAPSHOT + 1.1.0-SNAPSHOT + + + + + + org.opendaylight.netconf + netconf-artifacts + 1.2.0-SNAPSHOT + pom + import + + + + + + + org.opendaylight.yangtools + features-yangtools + ${yangtools.version} + features + xml + + + org.opendaylight.controller + features-mdsal + ${controller.mdsal.version} + features + xml + runtime + + + org.opendaylight.mdsal.model + features-mdsal-model + ${mdsal.model.version} + features + xml + runtime + + + ${project.groupId} + features-netconf + features + xml + + + ${project.groupId} + sal-netconf-connector + + + org.opendaylight.netconf + messagebus-netconf + + + ${project.groupId} + netconf-console + ${project.version} + + + ${project.groupId} + netconf-topology + + + ${project.groupId} + netconf-topology-config + + + ${project.groupId} + netconf-tcp + + + ${project.groupId} + netconf-ssh + + + org.bouncycastle + bcpkix-jdk15on + + + org.bouncycastle + bcprov-jdk15on + + + ${project.groupId} + netconf-topology-singleton + + + ${project.groupId} + netconf-connector-config + + + ${project.groupId} + netconf-config + + + + + scm:git:http://git.opendaylight.org/gerrit/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + HEAD + https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=summary + + diff --git a/features/netconf-connector/src/main/features/features.xml b/features/netconf-connector/features-netconf-connector/src/main/features/features.xml similarity index 100% rename from features/netconf-connector/src/main/features/features.xml rename to features/netconf-connector/features-netconf-connector/src/main/features/features.xml diff --git a/features/netconf-connector/features4-netconf-connector/pom.xml b/features/netconf-connector/features4-netconf-connector/pom.xml new file mode 100644 index 0000000000..6b5b5372f7 --- /dev/null +++ b/features/netconf-connector/features4-netconf-connector/pom.xml @@ -0,0 +1,77 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + feature-repo-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + features4-netconf-connector + 1.2.0-SNAPSHOT + feature + + + + ${project.groupId} + odl-message-bus + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-clustered-topology + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-connector + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-connector-all + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-connector-ssh + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-console + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-topology + ${project.version} + xml + features + + + \ No newline at end of file diff --git a/features/netconf-connector/odl-message-bus/pom.xml b/features/netconf-connector/odl-message-bus/pom.xml new file mode 100644 index 0000000000..72bb79f28d --- /dev/null +++ b/features/netconf-connector/odl-message-bus/pom.xml @@ -0,0 +1,49 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-message-bus + 1.2.0-SNAPSHOT + feature + + + + + + ${project.groupId} + odl-netconf-connector-all + ${project.version} + xml + features + + + org.opendaylight.controller + odl-message-bus-collector + 1.5.0-SNAPSHOT + xml + features + + + ${project.groupId} + messagebus-netconf + ${project.version} + + + \ No newline at end of file diff --git a/features/netconf-connector/odl-netconf-clustered-topology/pom.xml b/features/netconf-connector/odl-netconf-clustered-topology/pom.xml new file mode 100644 index 0000000000..b47b5ef19c --- /dev/null +++ b/features/netconf-connector/odl-netconf-clustered-topology/pom.xml @@ -0,0 +1,49 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-netconf-clustered-topology + 1.2.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} + + + \ No newline at end of file diff --git a/features/netconf-connector/odl-netconf-connector-all/pom.xml b/features/netconf-connector/odl-netconf-connector-all/pom.xml new file mode 100644 index 0000000000..7f0ebe0aa5 --- /dev/null +++ b/features/netconf-connector/odl-netconf-connector-all/pom.xml @@ -0,0 +1,44 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-netconf-connector-all + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: Netconf Connector :: All + + + + ${project.groupId} + odl-netconf-connector + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-connector-ssh + ${project.version} + xml + features + + + \ No newline at end of file diff --git a/features/netconf-connector/odl-netconf-connector-ssh/pom.xml b/features/netconf-connector/odl-netconf-connector-ssh/pom.xml new file mode 100644 index 0000000000..3424bfb272 --- /dev/null +++ b/features/netconf-connector/odl-netconf-connector-ssh/pom.xml @@ -0,0 +1,42 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-netconf-connector-ssh + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: Netconf Connector :: Netconf Connector + Netconf SSH Server + loopback connection configuration + + + + ${project.groupId} + odl-netconf-topology + ${project.version} + xml + features + + + ${project.groupId} + netconf-connector-config + ${project.version} + + + \ No newline at end of file diff --git a/features/netconf-connector/odl-netconf-connector/pom.xml b/features/netconf-connector/odl-netconf-connector/pom.xml new file mode 100644 index 0000000000..0d6508933a --- /dev/null +++ b/features/netconf-connector/odl-netconf-connector/pom.xml @@ -0,0 +1,91 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-netconf-connector + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: Netconf Connector :: Netconf Connector + + + + + org.opendaylight.netconf + netconf-artifacts + 1.2.0-SNAPSHOT + pom + import + + + + + + + org.opendaylight.controller + odl-mdsal-broker + 1.5.0-SNAPSHOT + xml + features + + + org.opendaylight.netconf + odl-netconf-notifications-api + ${project.version} + xml + features + + + org.opendaylight.netconf + odl-netconf-client + ${project.version} + xml + features + + + org.opendaylight.mdsal.model + odl-mdsal-models + 0.10.0-SNAPSHOT + xml + features + + + com.google.code.gson + gson + + + org.opendaylight.netconf + sal-netconf-connector + + + org.opendaylight.controller.model + model-inventory + 1.5.0-SNAPSHOT + + + org.opendaylight.netconf + netconf-topology + + + org.opendaylight.netconf + netconf-config + + + \ No newline at end of file diff --git a/features/netconf-connector/odl-netconf-console/pom.xml b/features/netconf-connector/odl-netconf-console/pom.xml new file mode 100644 index 0000000000..c8e427d3f2 --- /dev/null +++ b/features/netconf-connector/odl-netconf-console/pom.xml @@ -0,0 +1,56 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-netconf-console + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: Netconf Console + Karaf CLI for netconf CRUD operations + + + + org.opendaylight.netconf + odl-netconf-mdsal + 1.5.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} + + + \ No newline at end of file diff --git a/features/netconf-connector/odl-netconf-topology/pom.xml b/features/netconf-connector/odl-netconf-topology/pom.xml new file mode 100644 index 0000000000..ee0a099af7 --- /dev/null +++ b/features/netconf-connector/odl-netconf-topology/pom.xml @@ -0,0 +1,49 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-netconf-topology + 1.2.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-config + ${project.version} + + + \ No newline at end of file diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml index 0750c52c2d..2928bb3aa5 100644 --- a/features/netconf-connector/pom.xml +++ b/features/netconf-connector/pom.xml @@ -1,134 +1,41 @@ + --> - 4.0.0 - - org.opendaylight.odlparent - features-parent - 1.8.0-SNAPSHOT - - - org.opendaylight.netconf - features-netconf-connector - 1.2.0-SNAPSHOT - jar + 4.0.0 + + org.opendaylight.odlparent + odlparent-lite + 1.8.0-SNAPSHOT + + + org.opendaylight.netconf + features-netconf-connector-aggregator + 1.2.0-SNAPSHOT + pom - - 1.8.0-SNAPSHOT - 1.5.0-SNAPSHOT - 0.6.0-SNAPSHOT - 1.8.0-SNAPSHOT - 2.2.0-SNAPSHOT - 0.10.0-SNAPSHOT - 1.2.0-SNAPSHOT - 1.5.0-SNAPSHOT - 1.1.0-SNAPSHOT - + + features-netconf-connector + features4-netconf-connector + odl-message-bus + odl-netconf-clustered-topology + odl-netconf-connector + odl-netconf-connector-all + odl-netconf-connector-ssh + odl-netconf-console + odl-netconf-topology + - - - - org.opendaylight.netconf - netconf-artifacts - 1.2.0-SNAPSHOT - pom - import - - - - - - - org.opendaylight.yangtools - features-yangtools - ${yangtools.version} - features - xml - - - org.opendaylight.controller - features-mdsal - ${controller.mdsal.version} - features - xml - runtime - - - org.opendaylight.mdsal.model - features-mdsal-model - ${mdsal.model.version} - features - xml - runtime - - - ${project.groupId} - features-netconf - features - xml - - - ${project.groupId} - sal-netconf-connector - - - org.opendaylight.netconf - messagebus-netconf - - - ${project.groupId} - netconf-console - ${project.version} - - - ${project.groupId} - netconf-topology - - - ${project.groupId} - netconf-topology-config - - - ${project.groupId} - netconf-tcp - - - ${project.groupId} - netconf-ssh - - - org.bouncycastle - bcpkix-jdk15on - - - org.bouncycastle - bcprov-jdk15on - - - ${project.groupId} - netconf-topology-singleton - - - ${project.groupId} - netconf-connector-config - - - ${project.groupId} - netconf-config - - - - - scm:git:http://git.opendaylight.org/gerrit/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git - HEAD - https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=summary - + + scm:git:http://git.opendaylight.org/gerrit/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + HEAD + https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=summary + diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml new file mode 100644 index 0000000000..0eb098842b --- /dev/null +++ b/features/netconf/features-netconf/pom.xml @@ -0,0 +1,259 @@ + + + + 4.0.0 + + org.opendaylight.odlparent + features-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + features-netconf + 1.2.0-SNAPSHOT + jar + + + 0.5.0-SNAPSHOT + 1.8.0-SNAPSHOT + 1.5.0-SNAPSHOT + 0.6.0-SNAPSHOT + 1.8.0-SNAPSHOT + 0.10.0-SNAPSHOT + 1.2.0-SNAPSHOT + 0.9.0-SNAPSHOT + 1.1.0-SNAPSHOT + 0.14.0 + + + + + + org.opendaylight.aaa + aaa-artifacts + ${aaa.version} + pom + import + + + org.opendaylight.odlparent + odlparent-artifacts + 1.8.0-SNAPSHOT + pom + import + + + org.opendaylight.controller + config-artifacts + ${config.version} + pom + import + + + org.opendaylight.controller + mdsal-artifacts + ${controller.mdsal.version} + pom + import + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + ${mdsal.model.version} + pom + import + + + org.opendaylight.netconf + netconf-artifacts + ${netconf.version} + pom + import + + + org.opendaylight.yangtools + yangtools-artifacts + ${yangtools.version} + pom + import + + + + + + + org.opendaylight.odlparent + features-odlparent + features + xml + + + org.opendaylight.controller + features-protocol-framework + ${protocol-framework.version} + features + xml + runtime + + + org.opendaylight.controller + features-config + features + xml + + + org.opendaylight.controller + features-config-persister + features + xml + + + org.opendaylight.controller + features-config-netty + features + xml + + + org.opendaylight.aaa + features-aaa-shiro + features + xml + + + ${project.groupId} + aaa-authn-odl-plugin + + + ${project.groupId} + netconf-api + + + ${project.groupId} + netconf-auth + + + ${project.groupId} + netconf-notifications-api + + + ${project.groupId} + netconf-notifications-impl + + + ${project.groupId} + netconf-ssh + + + ${project.groupId} + mdsal-netconf-notification + + + ${project.groupId} + ietf-netconf + + + ${project.groupId} + ietf-netconf-monitoring + + + ${project.groupId} + ietf-netconf-yang-library + + + ${project.groupId} + ietf-netconf-monitoring-extension + + + ${project.groupId} + ietf-netconf-notifications + + + ${project.groupId} + netconf-mapping-api + + + ${project.groupId} + netconf-util + + + ${project.groupId} + netconf-util + cfg + config + + + ${project.groupId} + netconf-impl + + + org.opendaylight.controller + config-manager-facade-xml + + + ${project.groupId} + config-netconf-connector + + + ${project.groupId} + netconf-netty-util + + + org.bouncycastle + bcpkix-jdk15on + + + org.bouncycastle + bcprov-jdk15on + + + ${project.groupId} + netconf-client + + + ${project.groupId} + netconf-config + + + ${project.groupId} + netconf-monitoring + + + org.opendaylight.netconf + mdsal-netconf-ssh + + + org.opendaylight.netconf + mdsal-netconf-tcp + + + ${project.groupId} + mdsal-netconf-monitoring + + + ${project.groupId} + mdsal-netconf-connector + + + org.opendaylight.netconf + mdsal-netconf-yang-library + + + org.opendaylight.netconf + mdsal-netconf-impl + + + + + scm:git:http://git.opendaylight.org/gerrit/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + HEAD + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL + + diff --git a/features/netconf/src/main/features/features.xml b/features/netconf/features-netconf/src/main/features/features.xml similarity index 100% rename from features/netconf/src/main/features/features.xml rename to features/netconf/features-netconf/src/main/features/features.xml diff --git a/features/netconf/features4-netconf/pom.xml b/features/netconf/features4-netconf/pom.xml new file mode 100644 index 0000000000..040d8099c9 --- /dev/null +++ b/features/netconf/features4-netconf/pom.xml @@ -0,0 +1,140 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + feature-repo-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + features4-netconf + 1.2.0-SNAPSHOT + feature + + + + ${project.groupId} + odl-aaa-netconf-plugin + ${project.version} + xml + features + + + ${project.groupId} + odl-aaa-netconf-plugin-no-cluster + ${project.version} + xml + features + + + ${project.groupId} + odl-config-netconf-connector + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-all + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-api + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-client + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-impl + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-mapping-api + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-mdsal + 1.5.0-SNAPSHOT + xml + features + + + ${project.groupId} + odl-netconf-monitoring + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-netty-util + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-notifications-api + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-notifications-impl + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-ssh + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-tcp + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-util + ${project.version} + xml + features + + + \ No newline at end of file diff --git a/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml b/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml new file mode 100644 index 0000000000..d04d3a41b5 --- /dev/null +++ b/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml @@ -0,0 +1,64 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-aaa-netconf-plugin-no-cluster + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: AAA :: ODL NETCONF Plugin - NO CLUSTER + + + + + org.opendaylight.netconf + netconf-artifacts + ${project.version} + pom + import + + + + + + + org.opendaylight.controller + odl-config-api + 0.6.0-SNAPSHOT + xml + features + + + org.opendaylight.netconf + netconf-auth + + + org.opendaylight.aaa + odl-aaa-shiro + 0.5.0-SNAPSHOT + xml + features + + + org.opendaylight.netconf + aaa-authn-odl-plugin + + + \ No newline at end of file diff --git a/features/netconf/odl-aaa-netconf-plugin/pom.xml b/features/netconf/odl-aaa-netconf-plugin/pom.xml new file mode 100644 index 0000000000..22c3c3952e --- /dev/null +++ b/features/netconf/odl-aaa-netconf-plugin/pom.xml @@ -0,0 +1,54 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-aaa-netconf-plugin + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: AAA :: ODL NETCONF Plugin + + + + org.opendaylight.controller + odl-config-api + 0.6.0-SNAPSHOT + xml + features + + + ${project.groupId} + netconf-auth + ${project.version} + + + org.opendaylight.aaa + odl-aaa-shiro + 0.5.0-SNAPSHOT + xml + features + + + ${project.groupId} + aaa-authn-odl-plugin + ${project.version} + + + \ No newline at end of file diff --git a/features/netconf/odl-config-netconf-connector/pom.xml b/features/netconf/odl-config-netconf-connector/pom.xml new file mode 100644 index 0000000000..b20ead4c50 --- /dev/null +++ b/features/netconf/odl-config-netconf-connector/pom.xml @@ -0,0 +1,83 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-config-netconf-connector + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: Netconf :: Connector + + + + org.opendaylight.controller + yang-jmx-generator + 0.6.0-SNAPSHOT + + + org.opendaylight.controller + config-manager-facade-xml + 0.6.0-SNAPSHOT + + + org.opendaylight.controller + odl-config-manager + 0.6.0-SNAPSHOT + xml + features + + + ${project.groupId} + odl-netconf-netty-util + ${project.version} + xml + features + + + ${project.groupId} + netconf-impl + ${project.version} + + + ${project.groupId} + odl-netconf-notifications-api + ${project.version} + xml + features + + + org.opendaylight.controller + odl-config-netty + 0.6.0-SNAPSHOT + xml + features + + + ${project.groupId} + netconf-notifications-impl + ${project.version} + + + ${project.groupId} + config-netconf-connector + ${project.version} + + + \ No newline at end of file diff --git a/features/netconf/odl-netconf-all/pom.xml b/features/netconf/odl-netconf-all/pom.xml new file mode 100644 index 0000000000..19aa5f3eeb --- /dev/null +++ b/features/netconf/odl-netconf-all/pom.xml @@ -0,0 +1,86 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-netconf-all + 1.2.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-config-netconf-connector + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-netty-util + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-client + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-monitoring + ${project.version} + xml + features + + + \ No newline at end of file diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml new file mode 100644 index 0000000000..794b07cd9a --- /dev/null +++ b/features/netconf/odl-netconf-api/pom.xml @@ -0,0 +1,96 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-netconf-api + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: Netconf :: API + + + + + org.opendaylight.netconf + netconf-artifacts + 1.2.0-SNAPSHOT + pom + import + + + + + + + org.opendaylight.controller + odl-protocol-framework + 0.9.0-SNAPSHOT + xml + features + + + org.opendaylight.yangtools + odl-yangtools-yang-data + 1.1.0-SNAPSHOT + xml + features + + + org.opendaylight.controller + config-util + 0.6.0-SNAPSHOT + + + org.opendaylight.netconf + netconf-api + + + org.opendaylight.netconf + netconf-auth + + + org.opendaylight.netconf + ietf-netconf-monitoring + + + org.opendaylight.netconf + ietf-netconf + + + org.opendaylight.netconf + ietf-netconf-notifications + + + org.opendaylight.netconf + ietf-netconf-monitoring-extension + + + org.opendaylight.netconf + ietf-netconf-yang-library + + + org.opendaylight.mdsal.model + odl-mdsal-models + 0.10.0-SNAPSHOT + xml + features + + + \ No newline at end of file diff --git a/features/netconf/odl-netconf-client/pom.xml b/features/netconf/odl-netconf-client/pom.xml new file mode 100644 index 0000000000..4bbdb6a896 --- /dev/null +++ b/features/netconf/odl-netconf-client/pom.xml @@ -0,0 +1,59 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-netconf-client + 1.2.0-SNAPSHOT + feature + + + + org.opendaylight.controller + odl-config-all + 0.6.0-SNAPSHOT + xml + features + + + org.opendaylight.controller + odl-config-netty + 0.6.0-SNAPSHOT + xml + features + + + ${project.groupId} + odl-netconf-netty-util + ${project.version} + xml + features + + + ${project.groupId} + netconf-client + ${project.version} + + + ${project.groupId} + netconf-config + ${project.version} + + + \ No newline at end of file diff --git a/features/netconf/odl-netconf-impl/pom.xml b/features/netconf/odl-netconf-impl/pom.xml new file mode 100644 index 0000000000..616ea9e786 --- /dev/null +++ b/features/netconf/odl-netconf-impl/pom.xml @@ -0,0 +1,103 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-netconf-impl + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: Netconf :: Impl + + + + org.opendaylight.controller + yang-jmx-generator + 0.6.0-SNAPSHOT + + + ${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 + + + org.opendaylight.controller + odl-config-netty + 0.6.0-SNAPSHOT + xml + features + + + + ${project.groupId} + odl-config-netconf-connector + ${project.version} + xml + features + + + + org.opendaylight.controller + config-manager-facade-xml + 0.6.0-SNAPSHOT + + + ${project.groupId} + odl-netconf-monitoring + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-notifications-impl + ${project.version} + xml + features + + + ${project.groupId} + netconf-impl + ${project.version} + + + \ No newline at end of file diff --git a/features/netconf/odl-netconf-mapping-api/pom.xml b/features/netconf/odl-netconf-mapping-api/pom.xml new file mode 100644 index 0000000000..a92bdbe271 --- /dev/null +++ b/features/netconf/odl-netconf-mapping-api/pom.xml @@ -0,0 +1,42 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-netconf-mapping-api + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: Netconf :: Mapping API + + + + org.opendaylight.netconf + odl-netconf-api + 1.2.0-SNAPSHOT + xml + features + + + org.opendaylight.netconf + netconf-mapping-api + 1.2.0-SNAPSHOT + + + \ No newline at end of file diff --git a/features/netconf/odl-netconf-mdsal/pom.xml b/features/netconf/odl-netconf-mdsal/pom.xml new file mode 100644 index 0000000000..81dfb02f62 --- /dev/null +++ b/features/netconf/odl-netconf-mdsal/pom.xml @@ -0,0 +1,125 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-netconf-mdsal + + 1.5.0-SNAPSHOT + feature + + OpenDaylight :: Netconf :: Mdsal + + + 1.2.0-SNAPSHOT + ${project.version} + + + + + + ${project.groupId} + netconf-artifacts + ${netconf.version} + pom + import + + + + + + + org.opendaylight.controller + odl-config-all + 0.6.0-SNAPSHOT + xml + features + + + org.opendaylight.controller + odl-config-netty + 0.6.0-SNAPSHOT + xml + features + + + ${project.groupId} + odl-netconf-all + ${netconf.version} + xml + features + + + ${project.groupId} + odl-netconf-tcp + ${netconf.version} + xml + features + + + ${project.groupId} + odl-netconf-ssh + ${netconf.version} + xml + features + + + ${project.groupId} + odl-netconf-client + ${netconf.version} + xml + features + + + org.opendaylight.controller + odl-mdsal-broker + ${controller.mdsal.version} + xml + features + + + ${project.groupId} + mdsal-netconf-ssh + + + ${project.groupId} + mdsal-netconf-tcp + + + ${project.groupId} + mdsal-netconf-notification + + + ${project.groupId} + mdsal-netconf-connector + + + ${project.groupId} + mdsal-netconf-monitoring + + + ${project.groupId} + mdsal-netconf-yang-library + + + ${project.groupId} + mdsal-netconf-impl + + + \ No newline at end of file diff --git a/features/netconf/odl-netconf-monitoring/pom.xml b/features/netconf/odl-netconf-monitoring/pom.xml new file mode 100644 index 0000000000..ecd80259d5 --- /dev/null +++ b/features/netconf/odl-netconf-monitoring/pom.xml @@ -0,0 +1,42 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-netconf-monitoring + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: Netconf :: Monitoring + + + + ${project.groupId} + odl-netconf-util + ${project.version} + xml + features + + + ${project.groupId} + netconf-monitoring + ${project.version} + + + \ No newline at end of file diff --git a/features/netconf/odl-netconf-netty-util/pom.xml b/features/netconf/odl-netconf-netty-util/pom.xml new file mode 100644 index 0000000000..26e63eedcd --- /dev/null +++ b/features/netconf/odl-netconf-netty-util/pom.xml @@ -0,0 +1,71 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-netconf-netty-util + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: Netconf :: Netty Util + + + + ${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 + + + org.opendaylight.odlparent + odl4-netty-4 + 1.8.0-SNAPSHOT + xml + features + + + ${project.groupId} + netconf-netty-util + ${project.version} + + + org.bouncycastle + bcpkix-jdk15on + + + org.bouncycastle + bcprov-jdk15on + + + \ No newline at end of file diff --git a/features/netconf/odl-netconf-notifications-api/pom.xml b/features/netconf/odl-netconf-notifications-api/pom.xml new file mode 100644 index 0000000000..92cc3f201a --- /dev/null +++ b/features/netconf/odl-netconf-notifications-api/pom.xml @@ -0,0 +1,49 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-netconf-notifications-api + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: Netconf :: Notification :: Api + + + + org.opendaylight.controller + odl-config-manager-facade-xml + 0.6.0-SNAPSHOT + xml + features + + + ${project.groupId} + odl-netconf-api + ${project.version} + xml + features + + + ${project.groupId} + netconf-notifications-api + ${project.version} + + + \ No newline at end of file diff --git a/features/netconf/odl-netconf-notifications-impl/pom.xml b/features/netconf/odl-netconf-notifications-impl/pom.xml new file mode 100644 index 0000000000..55df3c9e10 --- /dev/null +++ b/features/netconf/odl-netconf-notifications-impl/pom.xml @@ -0,0 +1,49 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-netconf-notifications-impl + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: Netconf :: Monitoring :: Impl + + + + ${project.groupId} + odl-netconf-notifications-api + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-util + ${project.version} + xml + features + + + ${project.groupId} + netconf-notifications-impl + ${project.version} + + + \ No newline at end of file diff --git a/features/netconf/odl-netconf-ssh/pom.xml b/features/netconf/odl-netconf-ssh/pom.xml new file mode 100644 index 0000000000..c0fff3f470 --- /dev/null +++ b/features/netconf/odl-netconf-ssh/pom.xml @@ -0,0 +1,56 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-netconf-ssh + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: Netconf Connector :: SSH + + + + ${project.groupId} + odl-netconf-util + ${project.version} + xml + features + + + ${project.groupId} + odl-netconf-tcp + ${project.version} + xml + features + + + ${project.groupId} + odl-aaa-netconf-plugin + ${project.version} + xml + features + + + ${project.groupId} + netconf-ssh + ${project.version} + + + \ No newline at end of file diff --git a/features/netconf/odl-netconf-tcp/pom.xml b/features/netconf/odl-netconf-tcp/pom.xml new file mode 100644 index 0000000000..319ea71d7e --- /dev/null +++ b/features/netconf/odl-netconf-tcp/pom.xml @@ -0,0 +1,56 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-netconf-tcp + 1.2.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 + + + org.opendaylight.controller + odl-config-netty + 0.6.0-SNAPSHOT + xml + features + + + ${project.groupId} + netconf-tcp + ${project.version} + + + \ No newline at end of file diff --git a/features/netconf/odl-netconf-util/pom.xml b/features/netconf/odl-netconf-util/pom.xml new file mode 100644 index 0000000000..b27c3de614 --- /dev/null +++ b/features/netconf/odl-netconf-util/pom.xml @@ -0,0 +1,56 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-netconf-util + 1.2.0-SNAPSHOT + feature + + + + org.opendaylight.netconf + odl-netconf-mapping-api + ${project.version} + xml + features + + + org.opendaylight.yangtools + odl-yangtools-yang-data + 1.1.0-SNAPSHOT + xml + features + + + org.opendaylight.netconf + netconf-util + ${project.version} + + + + org.opendaylight.netconf + netconf-util + ${project.version} + cfg + config + provided + + + \ No newline at end of file diff --git a/features/netconf/odl-netconf-util/src/main/feature/feature.xml b/features/netconf/odl-netconf-util/src/main/feature/feature.xml new file mode 100644 index 0000000000..2735392ec3 --- /dev/null +++ b/features/netconf/odl-netconf-util/src/main/feature/feature.xml @@ -0,0 +1,15 @@ + + + + + + mvn:org.opendaylight.netconf/netconf-util/${project.version}/cfg/config + + + diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml index 0eb098842b..a4540acfee 100644 --- a/features/netconf/pom.xml +++ b/features/netconf/pom.xml @@ -1,254 +1,45 @@ + --> 4.0.0 org.opendaylight.odlparent - features-parent + odlparent-lite 1.8.0-SNAPSHOT org.opendaylight.netconf - features-netconf + features-netconf-aggregator 1.2.0-SNAPSHOT - jar + pom - - 0.5.0-SNAPSHOT - 1.8.0-SNAPSHOT - 1.5.0-SNAPSHOT - 0.6.0-SNAPSHOT - 1.8.0-SNAPSHOT - 0.10.0-SNAPSHOT - 1.2.0-SNAPSHOT - 0.9.0-SNAPSHOT - 1.1.0-SNAPSHOT - 0.14.0 - - - - - - org.opendaylight.aaa - aaa-artifacts - ${aaa.version} - pom - import - - - org.opendaylight.odlparent - odlparent-artifacts - 1.8.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - config-artifacts - ${config.version} - pom - import - - - org.opendaylight.controller - mdsal-artifacts - ${controller.mdsal.version} - pom - import - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${mdsal.model.version} - pom - import - - - org.opendaylight.netconf - netconf-artifacts - ${netconf.version} - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - ${yangtools.version} - pom - import - - - - - - - org.opendaylight.odlparent - features-odlparent - features - xml - - - org.opendaylight.controller - features-protocol-framework - ${protocol-framework.version} - features - xml - runtime - - - org.opendaylight.controller - features-config - features - xml - - - org.opendaylight.controller - features-config-persister - features - xml - - - org.opendaylight.controller - features-config-netty - features - xml - - - org.opendaylight.aaa - features-aaa-shiro - features - xml - - - ${project.groupId} - aaa-authn-odl-plugin - - - ${project.groupId} - netconf-api - - - ${project.groupId} - netconf-auth - - - ${project.groupId} - netconf-notifications-api - - - ${project.groupId} - netconf-notifications-impl - - - ${project.groupId} - netconf-ssh - - - ${project.groupId} - mdsal-netconf-notification - - - ${project.groupId} - ietf-netconf - - - ${project.groupId} - ietf-netconf-monitoring - - - ${project.groupId} - ietf-netconf-yang-library - - - ${project.groupId} - ietf-netconf-monitoring-extension - - - ${project.groupId} - ietf-netconf-notifications - - - ${project.groupId} - netconf-mapping-api - - - ${project.groupId} - netconf-util - - - ${project.groupId} - netconf-util - cfg - config - - - ${project.groupId} - netconf-impl - - - org.opendaylight.controller - config-manager-facade-xml - - - ${project.groupId} - config-netconf-connector - - - ${project.groupId} - netconf-netty-util - - - org.bouncycastle - bcpkix-jdk15on - - - org.bouncycastle - bcprov-jdk15on - - - ${project.groupId} - netconf-client - - - ${project.groupId} - netconf-config - - - ${project.groupId} - netconf-monitoring - - - org.opendaylight.netconf - mdsal-netconf-ssh - - - org.opendaylight.netconf - mdsal-netconf-tcp - - - ${project.groupId} - mdsal-netconf-monitoring - - - ${project.groupId} - mdsal-netconf-connector - - - org.opendaylight.netconf - mdsal-netconf-yang-library - - - org.opendaylight.netconf - mdsal-netconf-impl - - + + features-netconf + features4-netconf + odl-aaa-netconf-plugin + odl-aaa-netconf-plugin-no-cluster + odl-config-netconf-connector + odl-netconf-all + odl-netconf-api + odl-netconf-client + odl-netconf-impl + odl-netconf-mapping-api + odl-netconf-mdsal + odl-netconf-monitoring + odl-netconf-netty-util + odl-netconf-notifications-api + odl-netconf-notifications-impl + odl-netconf-ssh + odl-netconf-tcp + odl-netconf-util + scm:git:http://git.opendaylight.org/gerrit/controller.git diff --git a/features/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml new file mode 100644 index 0000000000..e971f412d4 --- /dev/null +++ b/features/restconf/features-restconf/pom.xml @@ -0,0 +1,191 @@ + + + + 4.0.0 + + org.opendaylight.odlparent + features-parent + 1.8.0-SNAPSHOT + + + features-restconf + org.opendaylight.netconf + 1.5.0-SNAPSHOT + jar + + 0.5.0-SNAPSHOT + 1.8.0-SNAPSHOT + 1.5.0-SNAPSHOT + 1.8.0-SNAPSHOT + 2.2.0-SNAPSHOT + 0.10.0-SNAPSHOT + 1.5.0-SNAPSHOT + 1.1.0-SNAPSHOT + + features.xml + etc/opendaylight/karaf + 10-rest-connector.xml + 10-restconf-service.xml + + + + + + org.opendaylight.odlparent + odlparent-artifacts + 1.8.0-SNAPSHOT + pom + import + + + org.opendaylight.aaa + aaa-artifacts + ${aaa.version} + pom + import + + + org.opendaylight.yangtools + yangtools-artifacts + ${yangtools.version} + pom + import + + + + + + + org.opendaylight.odlparent + features-odlparent + features + xml + + + org.opendaylight.yangtools + features-yangtools + features + xml + + + org.opendaylight.mdsal + features-mdsal + ${mdsal.version} + features + xml + + + org.opendaylight.mdsal.model + features-mdsal-model + ${mdsal.model.version} + features + xml + + + org.opendaylight.aaa + features-aaa-shiro + features + xml + + + + org.opendaylight.netconf + sal-rest-connector + ${restconf.version} + + + + com.google.code.gson + gson + + + + org.opendaylight.netconf + sal-rest-connector-config + ${restconf.version} + xml + config + + + + org.opendaylight.netconf + sal-rest-connector-config + ${restconf.version} + xml + configrestconfservice + + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.datatype + jackson-datatype-json-org + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + org.json + json + + + + org.opendaylight.yangtools + yang-data-codec-gson + + + + org.opendaylight.netconf + sal-rest-docgen + ${restconf.version} + + + ${project.groupId} + ietf-yang-library + ${project.version} + + + ${project.groupId} + ietf-restconf-monitoring + ${project.version} + + + org.opendaylight.netconf + ietf-restconf + ${project.version} + + + + + scm:git:http://git.opendaylight.org/gerrit/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + HEAD + https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=summary + + diff --git a/features/restconf/src/main/features/features.xml b/features/restconf/features-restconf/src/main/features/features.xml similarity index 100% rename from features/restconf/src/main/features/features.xml rename to features/restconf/features-restconf/src/main/features/features.xml diff --git a/features/restconf/features4-restconf/pom.xml b/features/restconf/features4-restconf/pom.xml new file mode 100644 index 0000000000..b713e9cc31 --- /dev/null +++ b/features/restconf/features4-restconf/pom.xml @@ -0,0 +1,56 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + feature-repo-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + features4-restconf + 1.5.0-SNAPSHOT + feature + + + + ${project.groupId} + odl-mdsal-apidocs + ${project.version} + xml + features + + + ${project.groupId} + odl-restconf + ${project.version} + xml + features + + + ${project.groupId} + odl-restconf-all + ${project.version} + xml + features + + + ${project.groupId} + odl-restconf-noauth + ${project.version} + xml + features + + + \ No newline at end of file diff --git a/features/restconf/odl-mdsal-apidocs/pom.xml b/features/restconf/odl-mdsal-apidocs/pom.xml new file mode 100644 index 0000000000..aeb2c7595b --- /dev/null +++ b/features/restconf/odl-mdsal-apidocs/pom.xml @@ -0,0 +1,86 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-mdsal-apidocs + 1.5.0-SNAPSHOT + feature + + OpenDaylight :: MDSAL :: APIDOCS + + + + org.opendaylight.netconf + odl-restconf + ${project.version} + xml + features + + + org.opendaylight.netconf + sal-rest-docgen + ${project.version} + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.datatype + jackson-datatype-json-org + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-server + + + com.sun.jersey + jersey-servlet + + + org.json + json + + + \ No newline at end of file diff --git a/features/restconf/odl-restconf-all/pom.xml b/features/restconf/odl-restconf-all/pom.xml new file mode 100644 index 0000000000..d2b68c14f3 --- /dev/null +++ b/features/restconf/odl-restconf-all/pom.xml @@ -0,0 +1,44 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-restconf-all + 1.5.0-SNAPSHOT + feature + + OpenDaylight :: Restconf :: All + + + + ${project.groupId} + odl-restconf + ${project.version} + xml + features + + + ${project.groupId} + odl-mdsal-apidocs + ${project.version} + xml + features + + + \ No newline at end of file diff --git a/features/restconf/odl-restconf-noauth/pom.xml b/features/restconf/odl-restconf-noauth/pom.xml new file mode 100644 index 0000000000..92eea0277a --- /dev/null +++ b/features/restconf/odl-restconf-noauth/pom.xml @@ -0,0 +1,146 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-restconf-noauth + 1.5.0-SNAPSHOT + feature + + OpenDaylight :: Restconf + + + etc/opendaylight/karaf + 10-rest-connector.xml + 10-restconf-service.xml + + + + + + org.opendaylight.odlparent + odlparent-artifacts + 1.8.0-SNAPSHOT + pom + import + + + org.opendaylight.yangtools + yangtools-artifacts + 1.1.0-SNAPSHOT + pom + import + + + org.opendaylight.aaa + aaa-artifacts + 0.5.0-SNAPSHOT + pom + import + + + org.opendaylight.netconf + netconf-artifacts + 1.2.0-SNAPSHOT + pom + import + + + org.opendaylight.netconf + restconf-artifacts + 1.5.0-SNAPSHOT + pom + import + + + + + + + org.opendaylight.aaa + odl-aaa-shiro + 0.5.0-SNAPSHOT + xml + features + + + org.opendaylight.controller + odl-mdsal-broker + 1.5.0-SNAPSHOT + xml + features + + + org.opendaylight.odlparent + odl4-netty-4 + 1.8.0-SNAPSHOT + xml + features + + + + org.opendaylight.netconf + ietf-restconf + + + org.opendaylight.netconf + ietf-yang-library + + + org.opendaylight.netconf + ietf-restconf-monitoring + + + org.opendaylight.netconf + sal-rest-connector + + + com.google.code.gson + gson + + + org.opendaylight.yangtools + yang-data-codec-gson + + + org.opendaylight.yangtools + yang-model-export + + + + org.opendaylight.netconf + sal-rest-connector-config + ${project.version} + xml + config + provided + + + + org.opendaylight.netconf + sal-rest-connector-config + ${project.version} + xml + configrestconfservice + provided + + + \ No newline at end of file diff --git a/features/restconf/odl-restconf-noauth/src/main/feature/feature.xml b/features/restconf/odl-restconf-noauth/src/main/feature/feature.xml new file mode 100644 index 0000000000..f189d69ecd --- /dev/null +++ b/features/restconf/odl-restconf-noauth/src/main/feature/feature.xml @@ -0,0 +1,19 @@ + + + + + war + + mvn:org.opendaylight.netconf/sal-rest-connector-config/${project.version}/xml/config + + + mvn:org.opendaylight.netconf/sal-rest-connector-config/${project.version}/xml/configrestconfservice + + + diff --git a/features/restconf/odl-restconf/pom.xml b/features/restconf/odl-restconf/pom.xml new file mode 100644 index 0000000000..939076e0f7 --- /dev/null +++ b/features/restconf/odl-restconf/pom.xml @@ -0,0 +1,44 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-restconf + 1.5.0-SNAPSHOT + feature + + OpenDaylight :: Restconf + + + + + + org.opendaylight.aaa + aaa-shiro-act + 0.5.0-SNAPSHOT + + + org.opendaylight.netconf + odl-restconf-noauth + ${project.version} + xml + features + + + \ No newline at end of file diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml index e971f412d4..6433a81303 100644 --- a/features/restconf/pom.xml +++ b/features/restconf/pom.xml @@ -1,191 +1,38 @@ + --> - 4.0.0 - - org.opendaylight.odlparent - features-parent - 1.8.0-SNAPSHOT - - - features-restconf - org.opendaylight.netconf - 1.5.0-SNAPSHOT - jar - - 0.5.0-SNAPSHOT - 1.8.0-SNAPSHOT - 1.5.0-SNAPSHOT - 1.8.0-SNAPSHOT - 2.2.0-SNAPSHOT - 0.10.0-SNAPSHOT - 1.5.0-SNAPSHOT - 1.1.0-SNAPSHOT - - features.xml - etc/opendaylight/karaf - 10-rest-connector.xml - 10-restconf-service.xml - - - - - + 4.0.0 + org.opendaylight.odlparent - odlparent-artifacts + odlparent-lite 1.8.0-SNAPSHOT - pom - import - - - org.opendaylight.aaa - aaa-artifacts - ${aaa.version} - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - ${yangtools.version} - pom - import - - - - - - - org.opendaylight.odlparent - features-odlparent - features - xml - - - org.opendaylight.yangtools - features-yangtools - features - xml - - - org.opendaylight.mdsal - features-mdsal - ${mdsal.version} - features - xml - - - org.opendaylight.mdsal.model - features-mdsal-model - ${mdsal.model.version} - features - xml - - - org.opendaylight.aaa - features-aaa-shiro - features - xml - - - - org.opendaylight.netconf - sal-rest-connector - ${restconf.version} - - - - com.google.code.gson - gson - - - - org.opendaylight.netconf - sal-rest-connector-config - ${restconf.version} - xml - config - - - - org.opendaylight.netconf - sal-rest-connector-config - ${restconf.version} - xml - configrestconfservice - - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.datatype - jackson-datatype-json-org - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - - - org.json - json - - - - org.opendaylight.yangtools - yang-data-codec-gson - - - - org.opendaylight.netconf - sal-rest-docgen - ${restconf.version} - - - ${project.groupId} - ietf-yang-library - ${project.version} - - - ${project.groupId} - ietf-restconf-monitoring - ${project.version} - - - org.opendaylight.netconf - ietf-restconf - ${project.version} - - - - - scm:git:http://git.opendaylight.org/gerrit/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git - HEAD - https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=summary - + + + features-restconf-aggregator + org.opendaylight.netconf + 1.5.0-SNAPSHOT + pom + + + features-restconf + features4-restconf + odl-mdsal-apidocs + odl-restconf + odl-restconf-all + odl-restconf-noauth + + + + scm:git:http://git.opendaylight.org/gerrit/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + HEAD + https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=summary + diff --git a/features/yanglib/features-yanglib/pom.xml b/features/yanglib/features-yanglib/pom.xml new file mode 100644 index 0000000000..fecd2fbab9 --- /dev/null +++ b/features/yanglib/features-yanglib/pom.xml @@ -0,0 +1,129 @@ + + + + + 4.0.0 + + org.opendaylight.odlparent + features-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + features-yanglib + 1.2.0-SNAPSHOT + jar + + + 1.5.0-SNAPSHOT + 1.2.0-SNAPSHOT + 2.2.0-SNAPSHOT + 0.10.0-SNAPSHOT + 1.5.0-SNAPSHOT + 1.1.0-SNAPSHOT + + + + + + org.opendaylight.odlparent + odlparent-artifacts + 1.8.0-SNAPSHOT + pom + import + + + org.opendaylight.controller + mdsal-artifacts + ${controller.mdsal.version} + pom + import + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + ${mdsal.model.version} + pom + import + + + org.opendaylight.netconf + netconf-artifacts + ${netconf.version} + pom + import + + + org.opendaylight.netconf + restconf-artifacts + ${restconf.version} + pom + import + + + org.opendaylight.yangtools + yangtools-artifacts + ${yangtools.version} + pom + import + + + + + + + org.opendaylight.odlparent + features-odlparent + features + xml + + + org.opendaylight.mdsal.model + features-mdsal-model + ${mdsal.model.version} + features + xml + + + org.opendaylight.mdsal + features-mdsal + ${mdsal.version} + features + xml + + + org.opendaylight.netconf + features-restconf + features + xml + + + org.opendaylight.yangtools + features-yangtools + features + xml + + + ${project.groupId} + ietf-netconf-yang-library + + + ${project.groupId} + yanglib + + + + + scm:git:http://git.opendaylight.org/gerrit/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + HEAD + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL + + diff --git a/features/yanglib/src/main/features/features.xml b/features/yanglib/features-yanglib/src/main/features/features.xml similarity index 100% rename from features/yanglib/src/main/features/features.xml rename to features/yanglib/features-yanglib/src/main/features/features.xml diff --git a/features/yanglib/features4-yanglib/pom.xml b/features/yanglib/features4-yanglib/pom.xml new file mode 100644 index 0000000000..d7887692db --- /dev/null +++ b/features/yanglib/features4-yanglib/pom.xml @@ -0,0 +1,35 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + feature-repo-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + features4-yanglib + 1.2.0-SNAPSHOT + feature + + + + ${project.groupId} + odl-yanglib + ${project.version} + xml + features + + + \ No newline at end of file diff --git a/features/yanglib/odl-yanglib/pom.xml b/features/yanglib/odl-yanglib/pom.xml new file mode 100644 index 0000000000..a195f7a40c --- /dev/null +++ b/features/yanglib/odl-yanglib/pom.xml @@ -0,0 +1,64 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.netconf + odl-yanglib + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: Yanglib + + + + org.opendaylight.netconf + yanglib + 1.2.0-SNAPSHOT + + + org.opendaylight.yangtools + odl-yangtools-yang-data + 1.1.0-SNAPSHOT + xml + features + + + org.opendaylight.netconf + odl-restconf + 1.5.0-SNAPSHOT + xml + features + + + org.opendaylight.mdsal.model + odl-mdsal-models + 0.10.0-SNAPSHOT + xml + features + + + org.opendaylight.netconf + ietf-netconf-yang-library + 1.2.0-SNAPSHOT + + + + \ No newline at end of file diff --git a/features/yanglib/odl-yanglib/src/main/feature/feature.xml b/features/yanglib/odl-yanglib/src/main/feature/feature.xml new file mode 100644 index 0000000000..2d0c4d15f7 --- /dev/null +++ b/features/yanglib/odl-yanglib/src/main/feature/feature.xml @@ -0,0 +1,13 @@ + + + + + war + + diff --git a/features/yanglib/pom.xml b/features/yanglib/pom.xml index fecd2fbab9..faacc3e084 100644 --- a/features/yanglib/pom.xml +++ b/features/yanglib/pom.xml @@ -1,124 +1,30 @@ - + --> 4.0.0 org.opendaylight.odlparent - features-parent + odlparent-lite 1.8.0-SNAPSHOT org.opendaylight.netconf - features-yanglib + features-yanglib-aggregator 1.2.0-SNAPSHOT - jar + pom - - 1.5.0-SNAPSHOT - 1.2.0-SNAPSHOT - 2.2.0-SNAPSHOT - 0.10.0-SNAPSHOT - 1.5.0-SNAPSHOT - 1.1.0-SNAPSHOT - - - - - - org.opendaylight.odlparent - odlparent-artifacts - 1.8.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - mdsal-artifacts - ${controller.mdsal.version} - pom - import - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${mdsal.model.version} - pom - import - - - org.opendaylight.netconf - netconf-artifacts - ${netconf.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${restconf.version} - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - ${yangtools.version} - pom - import - - - - - - - org.opendaylight.odlparent - features-odlparent - features - xml - - - org.opendaylight.mdsal.model - features-mdsal-model - ${mdsal.model.version} - features - xml - - - org.opendaylight.mdsal - features-mdsal - ${mdsal.version} - features - xml - - - org.opendaylight.netconf - features-restconf - features - xml - - - org.opendaylight.yangtools - features-yangtools - features - xml - - - ${project.groupId} - ietf-netconf-yang-library - - - ${project.groupId} - yanglib - - + + features-yanglib + features4-yanglib + odl-yanglib + scm:git:http://git.opendaylight.org/gerrit/controller.git diff --git a/netconf/netconf-console/pom.xml b/netconf/netconf-console/pom.xml index 8b34f0f180..804b481884 100644 --- a/netconf/netconf-console/pom.xml +++ b/netconf/netconf-console/pom.xml @@ -71,4 +71,25 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL yang-test-util + + + + + org.apache.felix + maven-bundle-plugin + true + + + + + org.apache.karaf.shell.commands;version="[3.0.0,4.1)", + org.apache.karaf.shell.console;version="[3.0.0,4.1)", + org.apache.karaf.shell.table;version="[3.0.0,4.1)", + * + + + + + + diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml index 5d4ac6f645..0a4d8cad1d 100644 --- a/netconf/tools/netconf-testtool/pom.xml +++ b/netconf/tools/netconf-testtool/pom.xml @@ -160,7 +160,7 @@ org.apache.karaf.features org.apache.karaf.features.core - ${karaf.version} + ${karaf4.version} diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/Main.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/Main.java index 66ad61abff..befa1dec4d 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/Main.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/Main.java @@ -212,7 +212,7 @@ public final class Main { public void updateFeatureFile(final List generated) { for (final File fileFeatures : ncFeatureFiles) { try { - final Features f = JaxbUtil.unmarshal(new FileInputStream(fileFeatures), false); + final Features f = JaxbUtil.unmarshal(fileFeatures.toURI().toString(), false); for (final Feature feature : f.getFeature()) { if (NETCONF_CONNECTOR_ALL_FEATURE.equals(feature.getName())) { diff --git a/restconf/sal-rest-connector/pom.xml b/restconf/sal-rest-connector/pom.xml index 86aac56e40..3dfb2da248 100644 --- a/restconf/sal-rest-connector/pom.xml +++ b/restconf/sal-rest-connector/pom.xml @@ -151,11 +151,6 @@ logback-classic test - - javax.annotation - javax.annotation-api - 1.2 - org.json @@ -204,7 +199,6 @@ org.opendaylight.netconf.sal.restconf.impl, org.opendaylight.netconf.md.sal.rest.common.*, org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.rest.connector.rev140724.*, - javax.annotation *, -- 2.36.6