From ec177aa1c823d20e9637842a976a70ce3d61fe2a Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Fri, 24 Mar 2017 11:34:24 +0100 Subject: [PATCH] Bug 7631: provide Karaf 4 features Change-Id: Id0e917f0a2867ebf8453bb692cf65ac04ad9c41a Signed-off-by: Stephen Kitt --- nemo-features/nemo-features/pom.xml | 227 ++++++++++++++++ .../src/main/features/features.xml | 114 ++++---- nemo-features/nemo-features4/pom.xml | 73 +++++ nemo-features/odl-nemo-api/pom.xml | 42 +++ nemo-features/odl-nemo-cli-renderer/pom.xml | 82 ++++++ .../src/main/feature/feature.xml | 27 ++ nemo-features/odl-nemo-engine-rest/pom.xml | 51 ++++ nemo-features/odl-nemo-engine-ui/pom.xml | 49 ++++ nemo-features/odl-nemo-engine/pom.xml | 57 ++++ .../src/main/feature/feature.xml | 15 + .../odl-nemo-openflow-renderer/pom.xml | 96 +++++++ .../src/main/feature/feature.xml | 27 ++ nemo-features/pom.xml | 256 +++--------------- 13 files changed, 840 insertions(+), 276 deletions(-) create mode 100644 nemo-features/nemo-features/pom.xml rename nemo-features/{ => nemo-features}/src/main/features/features.xml (98%) create mode 100644 nemo-features/nemo-features4/pom.xml create mode 100644 nemo-features/odl-nemo-api/pom.xml create mode 100644 nemo-features/odl-nemo-cli-renderer/pom.xml create mode 100644 nemo-features/odl-nemo-cli-renderer/src/main/feature/feature.xml create mode 100644 nemo-features/odl-nemo-engine-rest/pom.xml create mode 100644 nemo-features/odl-nemo-engine-ui/pom.xml create mode 100644 nemo-features/odl-nemo-engine/pom.xml create mode 100644 nemo-features/odl-nemo-engine/src/main/feature/feature.xml create mode 100644 nemo-features/odl-nemo-openflow-renderer/pom.xml create mode 100644 nemo-features/odl-nemo-openflow-renderer/src/main/feature/feature.xml diff --git a/nemo-features/nemo-features/pom.xml b/nemo-features/nemo-features/pom.xml new file mode 100644 index 0000000..ba94212 --- /dev/null +++ b/nemo-features/nemo-features/pom.xml @@ -0,0 +1,227 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + features-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.nemo + nemo-features + 1.2.0-SNAPSHOT + + ODL :: nemo :: ${project.artifactId} + + + 3.1.1 + + + + 0.10.0-SNAPSHOT + 1.5.0-SNAPSHOT + 1.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.4.0-SNAPSHOT + + + + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + ${mdsal.model.version} + pom + import + + + org.opendaylight.controller + mdsal-artifacts + ${mdsal.version} + pom + import + + + org.opendaylight.netconf + restconf-artifacts + ${restconf.version} + pom + import + + + org.opendaylight.dlux + features-dlux + ${dlux.version} + pom + import + + + + + + + org.opendaylight.mdsal.model + features-mdsal-model + ${mdsal.model.version} + features + xml + runtime + + + org.opendaylight.controller + features-mdsal + features + xml + runtime + + + org.opendaylight.netconf + features-restconf + ${restconf.version} + features + xml + runtime + + + org.opendaylight.dlux + features-dlux + ${dlux.version} + features + xml + runtime + + + org.opendaylight.openflowplugin + features-openflowplugin + ${openflowplugin.version} + features + xml + + + org.opendaylight.openflowplugin + features-openflowplugin-extension + ${openflowplugin.version} + features + xml + + + ${project.groupId} + nemo-api + ${project.version} + + + ${project.groupId} + nemo-impl + ${project.version} + + + ${project.groupId} + nemo-impl + ${project.version} + config + xml + + + ${project.groupId} + openflow-renderer + ${project.version} + + + ${project.groupId} + openflow-renderer + ${project.version} + config + xml + + + ${project.groupId} + openflow-renderer + ${project.version} + node-resource + json + + + ${project.groupId} + openflow-renderer + ${project.version} + host-resource + json + + + ${project.groupId} + openflow-renderer + ${project.version} + link-resource + json + + + ${project.groupId} + openflow-renderer + ${project.version} + external-resource + json + + + ${project.groupId} + cli-renderer + ${project.version} + + + ${project.groupId} + cli-renderer + ${project.version} + config + xml + + + ${project.groupId} + cli-renderer + ${project.version} + node-resource + json + + + ${project.groupId} + cli-renderer + ${project.version} + host-resource + json + + + ${project.groupId} + cli-renderer + ${project.version} + link-resource + json + + + ${project.groupId} + cli-renderer + ${project.version} + external-resource + json + + + ${project.groupId} + nemo-ui + ${project.version} + + + + + scm:git:ssh://git.opendaylight.org:29418/nemo.git + scm:git:ssh://git.opendaylight.org:29418/nemo.git + https://wiki.opendaylight.org/view/NEMO:Main + HEAD + + diff --git a/nemo-features/src/main/features/features.xml b/nemo-features/nemo-features/src/main/features/features.xml similarity index 98% rename from nemo-features/src/main/features/features.xml rename to nemo-features/nemo-features/src/main/features/features.xml index 05a7290..d10d547 100644 --- a/nemo-features/src/main/features/features.xml +++ b/nemo-features/nemo-features/src/main/features/features.xml @@ -1,57 +1,57 @@ - - - - mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features - mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features - mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features - mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features - mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflowplugin.version}/xml/features - mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${openflowplugin.version}/xml/features - - odl-mdsal-models - mvn:org.opendaylight.nemo/nemo-api/${project.version} - - - odl-mdsal-broker - odl-nemo-api - mvn:org.opendaylight.nemo/nemo-impl/${project.version} - mvn:org.opendaylight.nemo/nemo-impl/${project.version}/xml/config - - - odl-restconf - odl-mdsal-apidocs - odl-nemo-engine - - - odl-openflowplugin-flow-services - odl-openflowplugin-nxm-extensions - odl-nemo-engine-rest - mvn:org.opendaylight.nemo/openflow-renderer/${project.version} - mvn:org.opendaylight.nemo/openflow-renderer/${project.version}/xml/config - mvn:org.opendaylight.nemo/openflow-renderer/${project.version}/json/node-resource - mvn:org.opendaylight.nemo/openflow-renderer/${project.version}/json/link-resource - mvn:org.opendaylight.nemo/openflow-renderer/${project.version}/json/host-resource - mvn:org.opendaylight.nemo/openflow-renderer/${project.version}/json/external-resource - - - odl-nemo-engine-rest - mvn:org.opendaylight.nemo/cli-renderer/${project.version} - mvn:org.opendaylight.nemo/cli-renderer/${project.version}/xml/config - mvn:org.opendaylight.nemo/cli-renderer/${project.version}/json/node-resource - mvn:org.opendaylight.nemo/cli-renderer/${project.version}/json/link-resource - mvn:org.opendaylight.nemo/cli-renderer/${project.version}/json/host-resource - mvn:org.opendaylight.nemo/cli-renderer/${project.version}/json/external-resource - - - odl-dlux-core - odl-nemo-engine-rest - mvn:org.opendaylight.nemo/nemo-ui/${project.version} - - + + + + mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features + mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features + mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features + mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features + mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflowplugin.version}/xml/features + mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${openflowplugin.version}/xml/features + + odl-mdsal-models + mvn:org.opendaylight.nemo/nemo-api/${project.version} + + + odl-mdsal-broker + odl-nemo-api + mvn:org.opendaylight.nemo/nemo-impl/${project.version} + mvn:org.opendaylight.nemo/nemo-impl/${project.version}/xml/config + + + odl-restconf + odl-mdsal-apidocs + odl-nemo-engine + + + odl-openflowplugin-flow-services + odl-openflowplugin-nxm-extensions + odl-nemo-engine-rest + mvn:org.opendaylight.nemo/openflow-renderer/${project.version} + mvn:org.opendaylight.nemo/openflow-renderer/${project.version}/xml/config + mvn:org.opendaylight.nemo/openflow-renderer/${project.version}/json/node-resource + mvn:org.opendaylight.nemo/openflow-renderer/${project.version}/json/link-resource + mvn:org.opendaylight.nemo/openflow-renderer/${project.version}/json/host-resource + mvn:org.opendaylight.nemo/openflow-renderer/${project.version}/json/external-resource + + + odl-nemo-engine-rest + mvn:org.opendaylight.nemo/cli-renderer/${project.version} + mvn:org.opendaylight.nemo/cli-renderer/${project.version}/xml/config + mvn:org.opendaylight.nemo/cli-renderer/${project.version}/json/node-resource + mvn:org.opendaylight.nemo/cli-renderer/${project.version}/json/link-resource + mvn:org.opendaylight.nemo/cli-renderer/${project.version}/json/host-resource + mvn:org.opendaylight.nemo/cli-renderer/${project.version}/json/external-resource + + + odl-dlux-core + odl-nemo-engine-rest + mvn:org.opendaylight.nemo/nemo-ui/${project.version} + + diff --git a/nemo-features/nemo-features4/pom.xml b/nemo-features/nemo-features4/pom.xml new file mode 100644 index 0000000..44ca46b --- /dev/null +++ b/nemo-features/nemo-features4/pom.xml @@ -0,0 +1,73 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + feature-repo-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.nemo + nemo-features4 + 1.2.0-SNAPSHOT + + ODL :: nemo :: ${project.artifactId} + feature + + + + ${project.groupId} + odl-nemo-api + ${project.version} + xml + features + + + ${project.groupId} + odl-nemo-engine + ${project.version} + xml + features + + + ${project.groupId} + odl-nemo-engine-rest + ${project.version} + xml + features + + + ${project.groupId} + odl-nemo-openflow-renderer + ${project.version} + xml + features + + + ${project.groupId} + odl-nemo-cli-renderer + ${project.version} + xml + features + + + ${project.groupId} + odl-nemo-engine-ui + ${project.version} + xml + features + + + \ No newline at end of file diff --git a/nemo-features/odl-nemo-api/pom.xml b/nemo-features/odl-nemo-api/pom.xml new file mode 100644 index 0000000..99f6fc4 --- /dev/null +++ b/nemo-features/odl-nemo-api/pom.xml @@ -0,0 +1,42 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.nemo + odl-nemo-api + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: NEMO :: API + + + + org.opendaylight.mdsal.model + odl-mdsal-models + 0.10.0-SNAPSHOT + xml + features + + + ${project.groupId} + nemo-api + ${project.version} + + + \ No newline at end of file diff --git a/nemo-features/odl-nemo-cli-renderer/pom.xml b/nemo-features/odl-nemo-cli-renderer/pom.xml new file mode 100644 index 0000000..4c966b4 --- /dev/null +++ b/nemo-features/odl-nemo-cli-renderer/pom.xml @@ -0,0 +1,82 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.nemo + odl-nemo-cli-renderer + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: NEMO :: CLI Renderer + + + + ${project.groupId} + odl-nemo-engine-rest + ${project.version} + xml + features + + + ${project.groupId} + cli-renderer + ${project.version} + + + + ${project.groupId} + cli-renderer + ${project.version} + xml + config + + + + ${project.groupId} + cli-renderer + ${project.version} + json + node-resource + + + + ${project.groupId} + cli-renderer + ${project.version} + json + link-resource + + + + ${project.groupId} + cli-renderer + ${project.version} + json + host-resource + + + + ${project.groupId} + cli-renderer + ${project.version} + json + external-resource + + + \ No newline at end of file diff --git a/nemo-features/odl-nemo-cli-renderer/src/main/feature/feature.xml b/nemo-features/odl-nemo-cli-renderer/src/main/feature/feature.xml new file mode 100644 index 0000000..33036da --- /dev/null +++ b/nemo-features/odl-nemo-cli-renderer/src/main/feature/feature.xml @@ -0,0 +1,27 @@ + + + + + + mvn:org.opendaylight.nemo/cli-renderer/${project.version}/xml/config + + + mvn:org.opendaylight.nemo/cli-renderer/${project.version}/json/node-resource + + + mvn:org.opendaylight.nemo/cli-renderer/${project.version}/json/link-resource + + + mvn:org.opendaylight.nemo/cli-renderer/${project.version}/json/host-resource + + + mvn:org.opendaylight.nemo/cli-renderer/${project.version}/json/external-resource + + + diff --git a/nemo-features/odl-nemo-engine-rest/pom.xml b/nemo-features/odl-nemo-engine-rest/pom.xml new file mode 100644 index 0000000..87aec21 --- /dev/null +++ b/nemo-features/odl-nemo-engine-rest/pom.xml @@ -0,0 +1,51 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.nemo + odl-nemo-engine-rest + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: NEMO :: Engine :: REST + + + + org.opendaylight.netconf + odl-restconf + 1.5.0-SNAPSHOT + xml + features + + + org.opendaylight.netconf + odl-mdsal-apidocs + 1.5.0-SNAPSHOT + xml + features + + + ${project.groupId} + odl-nemo-engine + ${project.version} + xml + features + + + \ No newline at end of file diff --git a/nemo-features/odl-nemo-engine-ui/pom.xml b/nemo-features/odl-nemo-engine-ui/pom.xml new file mode 100644 index 0000000..1f97bda --- /dev/null +++ b/nemo-features/odl-nemo-engine-ui/pom.xml @@ -0,0 +1,49 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.nemo + odl-nemo-engine-ui + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: NEMO :: Engine :: UI + + + + org.opendaylight.dlux + odl-dlux-core + 0.5.0-SNAPSHOT + xml + features + + + ${project.groupId} + odl-nemo-engine-rest + ${project.version} + xml + features + + + org.opendaylight.nemo + nemo-ui + ${project.version} + + + \ No newline at end of file diff --git a/nemo-features/odl-nemo-engine/pom.xml b/nemo-features/odl-nemo-engine/pom.xml new file mode 100644 index 0000000..cdcbd75 --- /dev/null +++ b/nemo-features/odl-nemo-engine/pom.xml @@ -0,0 +1,57 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.nemo + odl-nemo-engine + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: NEMO :: Engine + + + + org.opendaylight.controller + odl-mdsal-broker + 1.5.0-SNAPSHOT + xml + features + + + ${project.groupId} + odl-nemo-api + ${project.version} + xml + features + + + ${project.groupId} + nemo-impl + ${project.version} + + + + ${project.groupId} + nemo-impl + ${project.version} + xml + config + + + \ No newline at end of file diff --git a/nemo-features/odl-nemo-engine/src/main/feature/feature.xml b/nemo-features/odl-nemo-engine/src/main/feature/feature.xml new file mode 100644 index 0000000..5e09973 --- /dev/null +++ b/nemo-features/odl-nemo-engine/src/main/feature/feature.xml @@ -0,0 +1,15 @@ + + + + + + mvn:org.opendaylight.nemo/nemo-impl/${project.version}/xml/config + + + diff --git a/nemo-features/odl-nemo-openflow-renderer/pom.xml b/nemo-features/odl-nemo-openflow-renderer/pom.xml new file mode 100644 index 0000000..2dd657c --- /dev/null +++ b/nemo-features/odl-nemo-openflow-renderer/pom.xml @@ -0,0 +1,96 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.nemo + odl-nemo-openflow-renderer + 1.2.0-SNAPSHOT + feature + + OpenDaylight :: NEMO :: OpenFlow Renderer + + + + org.opendaylight.openflowplugin + odl-openflowplugin-flow-services + 0.4.0-SNAPSHOT + xml + features + + + org.opendaylight.openflowplugin + odl-openflowplugin-nxm-extensions + 0.4.0-SNAPSHOT + xml + features + + + ${project.groupId} + odl-nemo-engine-rest + ${project.version} + xml + features + + + ${project.groupId} + openflow-renderer + ${project.version} + + + + ${project.groupId} + openflow-renderer + ${project.version} + xml + config + + + + ${project.groupId} + openflow-renderer + ${project.version} + json + node-resource + + + + ${project.groupId} + openflow-renderer + ${project.version} + json + link-resource + + + + ${project.groupId} + openflow-renderer + ${project.version} + json + host-resource + + + + ${project.groupId} + openflow-renderer + ${project.version} + json + external-resource + + + \ No newline at end of file diff --git a/nemo-features/odl-nemo-openflow-renderer/src/main/feature/feature.xml b/nemo-features/odl-nemo-openflow-renderer/src/main/feature/feature.xml new file mode 100644 index 0000000..4dd927a --- /dev/null +++ b/nemo-features/odl-nemo-openflow-renderer/src/main/feature/feature.xml @@ -0,0 +1,27 @@ + + + + + + mvn:org.opendaylight.nemo/openflow-renderer/${project.version}/xml/config + + + mvn:org.opendaylight.nemo/openflow-renderer/${project.version}/json/node-resource + + + mvn:org.opendaylight.nemo/openflow-renderer/${project.version}/json/link-resource + + + mvn:org.opendaylight.nemo/openflow-renderer/${project.version}/json/host-resource + + + mvn:org.opendaylight.nemo/openflow-renderer/${project.version}/json/external-resource + + + diff --git a/nemo-features/pom.xml b/nemo-features/pom.xml index ba94212..c159e6b 100644 --- a/nemo-features/pom.xml +++ b/nemo-features/pom.xml @@ -1,227 +1,45 @@ - - 4.0.0 - - - org.opendaylight.odlparent - features-parent - 1.8.0-SNAPSHOT - - + Copyright © 2017 Red Hat, Inc. and others. - org.opendaylight.nemo - nemo-features - 1.2.0-SNAPSHOT - - ODL :: nemo :: ${project.artifactId} - - - 3.1.1 - + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v1.0 which accompanies this distribution, + and is available at http://www.eclipse.org/legal/epl-v10.html + --> + + 4.0.0 - - 0.10.0-SNAPSHOT - 1.5.0-SNAPSHOT - 1.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.4.0-SNAPSHOT - + + org.opendaylight.odlparent + odlparent-lite + 1.8.0-SNAPSHOT + + - - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${mdsal.model.version} - pom - import - - - org.opendaylight.controller - mdsal-artifacts - ${mdsal.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${restconf.version} - pom - import - - - org.opendaylight.dlux - features-dlux - ${dlux.version} - pom - import - - - + org.opendaylight.nemo + nemo-features-aggregator + 1.2.0-SNAPSHOT + + ODL :: nemo :: ${project.artifactId} + pom - - - org.opendaylight.mdsal.model - features-mdsal-model - ${mdsal.model.version} - features - xml - runtime - - - org.opendaylight.controller - features-mdsal - features - xml - runtime - - - org.opendaylight.netconf - features-restconf - ${restconf.version} - features - xml - runtime - - - org.opendaylight.dlux - features-dlux - ${dlux.version} - features - xml - runtime - - - org.opendaylight.openflowplugin - features-openflowplugin - ${openflowplugin.version} - features - xml - - - org.opendaylight.openflowplugin - features-openflowplugin-extension - ${openflowplugin.version} - features - xml - - - ${project.groupId} - nemo-api - ${project.version} - - - ${project.groupId} - nemo-impl - ${project.version} - - - ${project.groupId} - nemo-impl - ${project.version} - config - xml - - - ${project.groupId} - openflow-renderer - ${project.version} - - - ${project.groupId} - openflow-renderer - ${project.version} - config - xml - - - ${project.groupId} - openflow-renderer - ${project.version} - node-resource - json - - - ${project.groupId} - openflow-renderer - ${project.version} - host-resource - json - - - ${project.groupId} - openflow-renderer - ${project.version} - link-resource - json - - - ${project.groupId} - openflow-renderer - ${project.version} - external-resource - json - - - ${project.groupId} - cli-renderer - ${project.version} - - - ${project.groupId} - cli-renderer - ${project.version} - config - xml - - - ${project.groupId} - cli-renderer - ${project.version} - node-resource - json - - - ${project.groupId} - cli-renderer - ${project.version} - host-resource - json - - - ${project.groupId} - cli-renderer - ${project.version} - link-resource - json - - - ${project.groupId} - cli-renderer - ${project.version} - external-resource - json - - - ${project.groupId} - nemo-ui - ${project.version} - - + + nemo-features + nemo-features4 + odl-nemo-api + odl-nemo-engine + odl-nemo-engine-rest + odl-nemo-openflow-renderer + odl-nemo-cli-renderer + odl-nemo-engine-ui + - - scm:git:ssh://git.opendaylight.org:29418/nemo.git - scm:git:ssh://git.opendaylight.org:29418/nemo.git - https://wiki.opendaylight.org/view/NEMO:Main - HEAD - + + scm:git:ssh://git.opendaylight.org:29418/nemo.git + scm:git:ssh://git.opendaylight.org:29418/nemo.git + https://wiki.opendaylight.org/view/NEMO:Main + HEAD + -- 2.36.6