From 2b61b9f35adcd877cfc5cec01eac6f9ca0c3a854 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 26 Apr 2020 18:36:11 +0200 Subject: [PATCH] Move features We want to flatten our structure, make sure we concentrate features in the main directory. Also eliminate odl-extras-all, as that is just an an aggregator for jolokia. Change-Id: I6b7d5a0a8c12e574500c410f6fd3829275f7034b Signed-off-by: Robert Varga --- features/benchmark/pom.xml | 29 ----------- features/config-netty/pom.xml | 34 ------------- features/extras/features-extras/pom.xml | 41 ---------------- features/extras/pom.xml | 35 -------------- .../features-config-netty/pom.xml | 0 .../pom.xml | 7 +-- .../features-mdsal-benchmark/pom.xml | 0 features/{mdsal => }/features-mdsal/pom.xml | 0 features/mdsal/pom.xml | 48 ------------------- .../{benchmark => }/odl-benchmark-api/pom.xml | 0 .../odl-clustering-test-app/pom.xml | 0 .../odl-config-netty/pom.xml | 0 .../src/main/feature/feature.xml | 0 .../odl-controller-blueprint/pom.xml | 0 .../src/main/feature/feature.xml | 0 .../odl-controller-mdsal-common/pom.xml | 0 .../src/main/feature/feature.xml | 0 .../odl-controller-model-topology/pom.xml | 0 .../{benchmark => }/odl-dsbenchmark/pom.xml | 0 features/{extras => }/odl-jolokia/pom.xml | 0 .../odl-jolokia/src/main/feature/feature.xml | 0 .../odl-mdsal-benchmark/pom.xml | 0 .../odl-mdsal-broker-local/pom.xml | 0 .../src/main/feature/feature.xml | 0 features/{mdsal => }/odl-mdsal-broker/pom.xml | 0 .../src/main/feature/feature.xml | 0 .../odl-mdsal-clustering-commons/pom.xml | 0 .../src/main/feature/feature.xml | 0 .../odl-mdsal-distributed-datastore/pom.xml | 0 .../src/main/feature/feature.xml | 0 .../odl-mdsal-model-inventory/pom.xml | 0 .../odl-mdsal-remoterpc-connector/pom.xml | 0 .../odl-message-bus-collector/pom.xml | 0 .../{benchmark => }/odl-ntfbenchmark/pom.xml | 0 features/{mdsal => }/odl-toaster/pom.xml | 0 features/pom.xml | 29 +++++++++-- 36 files changed, 27 insertions(+), 196 deletions(-) delete mode 100644 features/benchmark/pom.xml delete mode 100644 features/config-netty/pom.xml delete mode 100644 features/extras/features-extras/pom.xml delete mode 100644 features/extras/pom.xml rename features/{config-netty => }/features-config-netty/pom.xml (100%) rename features/{extras/odl-extras-all => features-extras}/pom.xml (88%) rename features/{benchmark => }/features-mdsal-benchmark/pom.xml (100%) rename features/{mdsal => }/features-mdsal/pom.xml (100%) delete mode 100644 features/mdsal/pom.xml rename features/{benchmark => }/odl-benchmark-api/pom.xml (100%) rename features/{mdsal => }/odl-clustering-test-app/pom.xml (100%) rename features/{config-netty => }/odl-config-netty/pom.xml (100%) rename features/{config-netty => }/odl-config-netty/src/main/feature/feature.xml (100%) rename features/{mdsal => }/odl-controller-blueprint/pom.xml (100%) rename features/{mdsal => }/odl-controller-blueprint/src/main/feature/feature.xml (100%) rename features/{mdsal => }/odl-controller-mdsal-common/pom.xml (100%) rename features/{mdsal => }/odl-controller-mdsal-common/src/main/feature/feature.xml (100%) rename features/{mdsal => }/odl-controller-model-topology/pom.xml (100%) rename features/{benchmark => }/odl-dsbenchmark/pom.xml (100%) rename features/{extras => }/odl-jolokia/pom.xml (100%) rename features/{extras => }/odl-jolokia/src/main/feature/feature.xml (100%) rename features/{benchmark => }/odl-mdsal-benchmark/pom.xml (100%) rename features/{mdsal => }/odl-mdsal-broker-local/pom.xml (100%) rename features/{mdsal => }/odl-mdsal-broker-local/src/main/feature/feature.xml (100%) rename features/{mdsal => }/odl-mdsal-broker/pom.xml (100%) rename features/{mdsal => }/odl-mdsal-broker/src/main/feature/feature.xml (100%) rename features/{mdsal => }/odl-mdsal-clustering-commons/pom.xml (100%) rename features/{mdsal => }/odl-mdsal-clustering-commons/src/main/feature/feature.xml (100%) rename features/{mdsal => }/odl-mdsal-distributed-datastore/pom.xml (100%) rename features/{mdsal => }/odl-mdsal-distributed-datastore/src/main/feature/feature.xml (100%) rename features/{mdsal => }/odl-mdsal-model-inventory/pom.xml (100%) rename features/{mdsal => }/odl-mdsal-remoterpc-connector/pom.xml (100%) rename features/{mdsal => }/odl-message-bus-collector/pom.xml (100%) rename features/{benchmark => }/odl-ntfbenchmark/pom.xml (100%) rename features/{mdsal => }/odl-toaster/pom.xml (100%) diff --git a/features/benchmark/pom.xml b/features/benchmark/pom.xml deleted file mode 100644 index b158af9ccc..0000000000 --- a/features/benchmark/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - 4.0.0 - - org.opendaylight.odlparent - odlparent-lite - 7.0.1 - - - org.opendaylight.controller - features-mdsal-benchmark-aggregator - 1.10.0-SNAPSHOT - pom - ${project.artifactId} - - - features-mdsal-benchmark - odl-benchmark-api - odl-dsbenchmark - odl-mdsal-benchmark - odl-ntfbenchmark - - diff --git a/features/config-netty/pom.xml b/features/config-netty/pom.xml deleted file mode 100644 index b7a246cba6..0000000000 --- a/features/config-netty/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - 4.0.0 - - org.opendaylight.odlparent - odlparent-lite - 7.0.1 - - - - org.opendaylight.controller - features-config-netty-aggregator - 0.13.0-SNAPSHOT - pom - - - features-config-netty - odl-config-netty - - - - 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/extras/features-extras/pom.xml b/features/extras/features-extras/pom.xml deleted file mode 100644 index cc7a5f9dcf..0000000000 --- a/features/extras/features-extras/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.odlparent - feature-repo-parent - 7.0.1 - - - - org.opendaylight.controller - features-extras - 1.15.0-SNAPSHOT - feature - - - - ${project.groupId} - odl-extras-all - ${project.version} - xml - features - - - ${project.groupId} - odl-jolokia - ${project.version} - xml - features - - - - diff --git a/features/extras/pom.xml b/features/extras/pom.xml deleted file mode 100644 index aff681aefc..0000000000 --- a/features/extras/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - 4.0.0 - - org.opendaylight.odlparent - odlparent-lite - 7.0.1 - - - - org.opendaylight.controller - features-extras-aggregator - 1.15.0-SNAPSHOT - pom - - - features-extras - odl-extras-all - odl-jolokia - - - - 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/config-netty/features-config-netty/pom.xml b/features/features-config-netty/pom.xml similarity index 100% rename from features/config-netty/features-config-netty/pom.xml rename to features/features-config-netty/pom.xml diff --git a/features/extras/odl-extras-all/pom.xml b/features/features-extras/pom.xml similarity index 88% rename from features/extras/odl-extras-all/pom.xml rename to features/features-extras/pom.xml index 79ef99ca49..208b18ce61 100644 --- a/features/extras/odl-extras-all/pom.xml +++ b/features/features-extras/pom.xml @@ -11,18 +11,16 @@ org.opendaylight.odlparent - single-feature-parent + feature-repo-parent 7.0.1 org.opendaylight.controller - odl-extras-all + features-extras 1.15.0-SNAPSHOT feature - OpenDaylight :: Extras :: All - ${project.groupId} @@ -32,5 +30,4 @@ features - diff --git a/features/benchmark/features-mdsal-benchmark/pom.xml b/features/features-mdsal-benchmark/pom.xml similarity index 100% rename from features/benchmark/features-mdsal-benchmark/pom.xml rename to features/features-mdsal-benchmark/pom.xml diff --git a/features/mdsal/features-mdsal/pom.xml b/features/features-mdsal/pom.xml similarity index 100% rename from features/mdsal/features-mdsal/pom.xml rename to features/features-mdsal/pom.xml diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml deleted file mode 100644 index 0660c33429..0000000000 --- a/features/mdsal/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - 4.0.0 - - org.opendaylight.odlparent - odlparent-lite - 7.0.1 - - - - org.opendaylight.controller - features-mdsal-aggregator - 1.12.0-SNAPSHOT - - pom - - - features-mdsal - - odl-clustering-test-app - odl-controller-mdsal-common - odl-mdsal-clustering-commons - odl-controller-blueprint - - odl-mdsal-broker - odl-mdsal-broker-local - odl-mdsal-distributed-datastore - odl-mdsal-model-inventory - odl-controller-model-topology - odl-mdsal-remoterpc-connector - odl-message-bus-collector - odl-toaster - - - - 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/benchmark/odl-benchmark-api/pom.xml b/features/odl-benchmark-api/pom.xml similarity index 100% rename from features/benchmark/odl-benchmark-api/pom.xml rename to features/odl-benchmark-api/pom.xml diff --git a/features/mdsal/odl-clustering-test-app/pom.xml b/features/odl-clustering-test-app/pom.xml similarity index 100% rename from features/mdsal/odl-clustering-test-app/pom.xml rename to features/odl-clustering-test-app/pom.xml diff --git a/features/config-netty/odl-config-netty/pom.xml b/features/odl-config-netty/pom.xml similarity index 100% rename from features/config-netty/odl-config-netty/pom.xml rename to features/odl-config-netty/pom.xml diff --git a/features/config-netty/odl-config-netty/src/main/feature/feature.xml b/features/odl-config-netty/src/main/feature/feature.xml similarity index 100% rename from features/config-netty/odl-config-netty/src/main/feature/feature.xml rename to features/odl-config-netty/src/main/feature/feature.xml diff --git a/features/mdsal/odl-controller-blueprint/pom.xml b/features/odl-controller-blueprint/pom.xml similarity index 100% rename from features/mdsal/odl-controller-blueprint/pom.xml rename to features/odl-controller-blueprint/pom.xml diff --git a/features/mdsal/odl-controller-blueprint/src/main/feature/feature.xml b/features/odl-controller-blueprint/src/main/feature/feature.xml similarity index 100% rename from features/mdsal/odl-controller-blueprint/src/main/feature/feature.xml rename to features/odl-controller-blueprint/src/main/feature/feature.xml diff --git a/features/mdsal/odl-controller-mdsal-common/pom.xml b/features/odl-controller-mdsal-common/pom.xml similarity index 100% rename from features/mdsal/odl-controller-mdsal-common/pom.xml rename to features/odl-controller-mdsal-common/pom.xml diff --git a/features/mdsal/odl-controller-mdsal-common/src/main/feature/feature.xml b/features/odl-controller-mdsal-common/src/main/feature/feature.xml similarity index 100% rename from features/mdsal/odl-controller-mdsal-common/src/main/feature/feature.xml rename to features/odl-controller-mdsal-common/src/main/feature/feature.xml diff --git a/features/mdsal/odl-controller-model-topology/pom.xml b/features/odl-controller-model-topology/pom.xml similarity index 100% rename from features/mdsal/odl-controller-model-topology/pom.xml rename to features/odl-controller-model-topology/pom.xml diff --git a/features/benchmark/odl-dsbenchmark/pom.xml b/features/odl-dsbenchmark/pom.xml similarity index 100% rename from features/benchmark/odl-dsbenchmark/pom.xml rename to features/odl-dsbenchmark/pom.xml diff --git a/features/extras/odl-jolokia/pom.xml b/features/odl-jolokia/pom.xml similarity index 100% rename from features/extras/odl-jolokia/pom.xml rename to features/odl-jolokia/pom.xml diff --git a/features/extras/odl-jolokia/src/main/feature/feature.xml b/features/odl-jolokia/src/main/feature/feature.xml similarity index 100% rename from features/extras/odl-jolokia/src/main/feature/feature.xml rename to features/odl-jolokia/src/main/feature/feature.xml diff --git a/features/benchmark/odl-mdsal-benchmark/pom.xml b/features/odl-mdsal-benchmark/pom.xml similarity index 100% rename from features/benchmark/odl-mdsal-benchmark/pom.xml rename to features/odl-mdsal-benchmark/pom.xml diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/odl-mdsal-broker-local/pom.xml similarity index 100% rename from features/mdsal/odl-mdsal-broker-local/pom.xml rename to features/odl-mdsal-broker-local/pom.xml diff --git a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml b/features/odl-mdsal-broker-local/src/main/feature/feature.xml similarity index 100% rename from features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml rename to features/odl-mdsal-broker-local/src/main/feature/feature.xml diff --git a/features/mdsal/odl-mdsal-broker/pom.xml b/features/odl-mdsal-broker/pom.xml similarity index 100% rename from features/mdsal/odl-mdsal-broker/pom.xml rename to features/odl-mdsal-broker/pom.xml diff --git a/features/mdsal/odl-mdsal-broker/src/main/feature/feature.xml b/features/odl-mdsal-broker/src/main/feature/feature.xml similarity index 100% rename from features/mdsal/odl-mdsal-broker/src/main/feature/feature.xml rename to features/odl-mdsal-broker/src/main/feature/feature.xml diff --git a/features/mdsal/odl-mdsal-clustering-commons/pom.xml b/features/odl-mdsal-clustering-commons/pom.xml similarity index 100% rename from features/mdsal/odl-mdsal-clustering-commons/pom.xml rename to features/odl-mdsal-clustering-commons/pom.xml diff --git a/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml b/features/odl-mdsal-clustering-commons/src/main/feature/feature.xml similarity index 100% rename from features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml rename to features/odl-mdsal-clustering-commons/src/main/feature/feature.xml diff --git a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml b/features/odl-mdsal-distributed-datastore/pom.xml similarity index 100% rename from features/mdsal/odl-mdsal-distributed-datastore/pom.xml rename to features/odl-mdsal-distributed-datastore/pom.xml diff --git a/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml b/features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml similarity index 100% rename from features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml rename to features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml diff --git a/features/mdsal/odl-mdsal-model-inventory/pom.xml b/features/odl-mdsal-model-inventory/pom.xml similarity index 100% rename from features/mdsal/odl-mdsal-model-inventory/pom.xml rename to features/odl-mdsal-model-inventory/pom.xml diff --git a/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml b/features/odl-mdsal-remoterpc-connector/pom.xml similarity index 100% rename from features/mdsal/odl-mdsal-remoterpc-connector/pom.xml rename to features/odl-mdsal-remoterpc-connector/pom.xml diff --git a/features/mdsal/odl-message-bus-collector/pom.xml b/features/odl-message-bus-collector/pom.xml similarity index 100% rename from features/mdsal/odl-message-bus-collector/pom.xml rename to features/odl-message-bus-collector/pom.xml diff --git a/features/benchmark/odl-ntfbenchmark/pom.xml b/features/odl-ntfbenchmark/pom.xml similarity index 100% rename from features/benchmark/odl-ntfbenchmark/pom.xml rename to features/odl-ntfbenchmark/pom.xml diff --git a/features/mdsal/odl-toaster/pom.xml b/features/odl-toaster/pom.xml similarity index 100% rename from features/mdsal/odl-toaster/pom.xml rename to features/odl-toaster/pom.xml diff --git a/features/pom.xml b/features/pom.xml index 1f8eab25d7..185b0263bd 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -26,9 +26,30 @@ - config-netty - mdsal - extras - benchmark + + odl-benchmark-api + odl-clustering-test-app + odl-config-netty + odl-controller-blueprint + odl-controller-mdsal-common + odl-controller-model-topology + odl-dsbenchmark + odl-jolokia + odl-mdsal-benchmark + odl-mdsal-broker-local + odl-mdsal-broker + odl-mdsal-clustering-commons + odl-mdsal-distributed-datastore + odl-mdsal-model-inventory + odl-mdsal-remoterpc-connector + odl-message-bus-collector + odl-ntfbenchmark + odl-toaster + + + features-config-netty + features-extras + features-mdsal + features-mdsal-benchmark -- 2.36.6