From 280ee022860ba5a3604b35f3b363ade5e4b65af7 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 15 Dec 2016 14:46:44 +0100 Subject: [PATCH] Add Karaf 4 features This is a simplified version of https://git.opendaylight.org/gerrit/39468 without any changes to bundles; it just delegates the actual features.xml generation to the plugin. Bug: 7487 Change-Id: I932067005975206be5fdeeaf58589502d1598760 Signed-off-by: Stephen Kitt --- common/artifacts/pom.xml | 100 +++++++++ .../features/{ => features-mdsal}/README.adoc | 0 common/features/features-mdsal/pom.xml | 184 ++++++++++++++++ .../src/main/features/features.xml | 0 common/features/features4-mdsal/pom.xml | 139 ++++++++++++ common/features/odl-mdsal-binding-api/pom.xml | 92 ++++++++ .../features/odl-mdsal-binding-base/pom.xml | 87 ++++++++ .../odl-mdsal-binding-dom-adapter/pom.xml | 81 +++++++ .../odl-mdsal-binding-runtime/pom.xml | 94 ++++++++ common/features/odl-mdsal-binding/pom.xml | 71 ++++++ common/features/odl-mdsal-common/pom.xml | 76 +++++++ common/features/odl-mdsal-dom-api/pom.xml | 86 ++++++++ common/features/odl-mdsal-dom-broker/pom.xml | 95 ++++++++ common/features/odl-mdsal-dom/pom.xml | 65 ++++++ common/features/odl-mdsal-eos-binding/pom.xml | 79 +++++++ common/features/odl-mdsal-eos-common/pom.xml | 86 ++++++++ common/features/odl-mdsal-eos-dom/pom.xml | 69 ++++++ .../odl-mdsal-singleton-common/pom.xml | 69 ++++++ .../features/odl-mdsal-singleton-dom/pom.xml | 81 +++++++ common/features/pom.xml | 204 ++++-------------- model/artifacts/pom.xml | 14 ++ model/features/features-mdsal-model/pom.xml | 156 ++++++++++++++ .../src/main/features/features.xml | 0 model/features/features4-mdsal-model/pom.xml | 61 ++++++ model/features/odl-mdsal-models/pom.xml | 148 +++++++++++++ model/features/pom.xml | 163 +++----------- model/pom.xml | 23 -- 27 files changed, 2000 insertions(+), 323 deletions(-) rename common/features/{ => features-mdsal}/README.adoc (100%) create mode 100644 common/features/features-mdsal/pom.xml rename common/features/{ => features-mdsal}/src/main/features/features.xml (100%) create mode 100644 common/features/features4-mdsal/pom.xml create mode 100644 common/features/odl-mdsal-binding-api/pom.xml create mode 100644 common/features/odl-mdsal-binding-base/pom.xml create mode 100644 common/features/odl-mdsal-binding-dom-adapter/pom.xml create mode 100644 common/features/odl-mdsal-binding-runtime/pom.xml create mode 100644 common/features/odl-mdsal-binding/pom.xml create mode 100644 common/features/odl-mdsal-common/pom.xml create mode 100644 common/features/odl-mdsal-dom-api/pom.xml create mode 100644 common/features/odl-mdsal-dom-broker/pom.xml create mode 100644 common/features/odl-mdsal-dom/pom.xml create mode 100644 common/features/odl-mdsal-eos-binding/pom.xml create mode 100644 common/features/odl-mdsal-eos-common/pom.xml create mode 100644 common/features/odl-mdsal-eos-dom/pom.xml create mode 100644 common/features/odl-mdsal-singleton-common/pom.xml create mode 100644 common/features/odl-mdsal-singleton-dom/pom.xml create mode 100644 model/features/features-mdsal-model/pom.xml rename model/features/{ => features-mdsal-model}/src/main/features/features.xml (100%) create mode 100644 model/features/features4-mdsal-model/pom.xml create mode 100644 model/features/odl-mdsal-models/pom.xml diff --git a/common/artifacts/pom.xml b/common/artifacts/pom.xml index 0c6c4fd561..cc2b67e108 100644 --- a/common/artifacts/pom.xml +++ b/common/artifacts/pom.xml @@ -215,6 +215,106 @@ mdsal-singleton-dom-impl ${project.version} + + + + ${project.groupId} + odl-mdsal-binding + ${project.version} + features + xml + + + ${project.groupId} + odl-mdsal-dom + ${project.version} + features + xml + + + ${project.groupId} + odl-mdsal-common + ${project.version} + features + xml + + + ${project.groupId} + odl-mdsal-dom-api + ${project.version} + features + xml + + + ${project.groupId} + odl-mdsal-dom-broker + ${project.version} + features + xml + + + ${project.groupId} + odl-mdsal-binding-base + ${project.version} + features + xml + + + ${project.groupId} + odl-mdsal-binding-runtime + ${project.version} + features + xml + + + ${project.groupId} + odl-mdsal-binding-api + ${project.version} + features + xml + + + ${project.groupId} + odl-mdsal-binding-dom-adapter + ${project.version} + features + xml + + + ${project.groupId} + odl-mdsal-eos-common + ${project.version} + features + xml + + + ${project.groupId} + odl-mdsal-eos-dom + ${project.version} + features + xml + + + ${project.groupId} + odl-mdsal-eos-binding + ${project.version} + features + xml + + + ${project.groupId} + odl-mdsal-singleton-common + ${project.version} + features + xml + + + ${project.groupId} + odl-mdsal-singleton-dom + ${project.version} + features + xml + diff --git a/common/features/README.adoc b/common/features/features-mdsal/README.adoc similarity index 100% rename from common/features/README.adoc rename to common/features/features-mdsal/README.adoc diff --git a/common/features/features-mdsal/pom.xml b/common/features/features-mdsal/pom.xml new file mode 100644 index 0000000000..a8c8c0c378 --- /dev/null +++ b/common/features/features-mdsal/pom.xml @@ -0,0 +1,184 @@ + + + + + 4.0.0 + + org.opendaylight.odlparent + features-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.mdsal + features-mdsal + 2.2.0-SNAPSHOT + jar + + + 1.8.0-SNAPSHOT + 1.1.0-SNAPSHOT + + + + + + org.opendaylight.odlparent + odlparent-artifacts + ${odlparent.version} + import + pom + + + org.opendaylight.yangtools + yangtools-artifacts + ${yangtools.version} + import + pom + + + org.opendaylight.mdsal + + mdsal-parent + ${project.version} + import + pom + + + + + + + + org.opendaylight.odlparent + features-odlparent + features + xml + + + + org.opendaylight.yangtools + features-yangtools + features + xml + + + + + org.eclipse.xtext + org.eclipse.xtext.xbase.lib + + + + ${project.groupId} + mdsal-common-api + + + + ${project.groupId} + mdsal-dom-api + + + ${project.groupId} + mdsal-dom-spi + + + ${project.groupId} + mdsal-dom-broker + + + ${project.groupId} + mdsal-dom-inmemory-datastore + + + ${project.groupId} + mdsal-eos-common-api + + + ${project.groupId} + mdsal-eos-common-spi + + + ${project.groupId} + mdsal-eos-dom-api + + + ${project.groupId} + mdsal-eos-binding-api + + + ${project.groupId} + mdsal-eos-binding-adapter + + + ${project.groupId} + mdsal-singleton-common-api + + + ${project.groupId} + mdsal-singleton-dom-impl + + + + + ${project.groupId} + mdsal-binding-generator-api + + + ${project.groupId} + mdsal-binding-generator-util + + + ${project.groupId} + mdsal-binding-generator-impl + + + ${project.groupId} + yang-binding + + + ${project.groupId} + mdsal-binding-dom-codec + + + + ${project.groupId} + mdsal-binding-api + + + ${project.groupId} + mdsal-binding-dom-adapter + + + ${project.groupId}.model + yang-ext + + + ${project.groupId}.model + general-entity + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + diff --git a/common/features/src/main/features/features.xml b/common/features/features-mdsal/src/main/features/features.xml similarity index 100% rename from common/features/src/main/features/features.xml rename to common/features/features-mdsal/src/main/features/features.xml diff --git a/common/features/features4-mdsal/pom.xml b/common/features/features4-mdsal/pom.xml new file mode 100644 index 0000000000..33cfffe8b0 --- /dev/null +++ b/common/features/features4-mdsal/pom.xml @@ -0,0 +1,139 @@ + + + + + 4.0.0 + + org.opendaylight.odlparent + feature-repo-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.mdsal + features4-mdsal + 2.2.0-SNAPSHOT + feature + + + + + org.opendaylight.mdsal + mdsal-artifacts + ${project.version} + import + pom + + + + + + + ${project.groupId} + odl-mdsal-binding + features + xml + + + ${project.groupId} + odl-mdsal-binding-api + features + xml + + + ${project.groupId} + odl-mdsal-binding-base + features + xml + + + ${project.groupId} + odl-mdsal-binding-dom-adapter + features + xml + + + ${project.groupId} + odl-mdsal-binding-runtime + features + xml + + + ${project.groupId} + odl-mdsal-common + features + xml + + + ${project.groupId} + odl-mdsal-dom + features + xml + + + ${project.groupId} + odl-mdsal-dom-api + features + xml + + + ${project.groupId} + odl-mdsal-dom-broker + features + xml + + + ${project.groupId} + odl-mdsal-eos-common + features + xml + + + ${project.groupId} + odl-mdsal-eos-dom + features + xml + + + ${project.groupId} + odl-mdsal-eos-binding + features + xml + + + ${project.groupId} + odl-mdsal-singleton-common + features + xml + + + ${project.groupId} + odl-mdsal-singleton-dom + features + xml + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + diff --git a/common/features/odl-mdsal-binding-api/pom.xml b/common/features/odl-mdsal-binding-api/pom.xml new file mode 100644 index 0000000000..a500478efd --- /dev/null +++ b/common/features/odl-mdsal-binding-api/pom.xml @@ -0,0 +1,92 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.mdsal + odl-mdsal-binding-api + 2.2.0-SNAPSHOT + feature + + OpenDaylight :: MD-SAL :: Binding API + + + + + org.opendaylight.mdsal + mdsal-artifacts + ${project.version} + import + pom + + + org.opendaylight.yangtools + yangtools-artifacts + 1.1.0-SNAPSHOT + import + pom + + + + + + + org.opendaylight.mdsal + odl-mdsal-common + xml + features + + + org.opendaylight.mdsal + odl-mdsal-binding-base + xml + features + + + org.opendaylight.yangtools + odl-yangtools-yang-parser + xml + features + + + ${project.groupId} + mdsal-binding-api + + + ${project.groupId} + mdsal-binding-util + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + \ No newline at end of file diff --git a/common/features/odl-mdsal-binding-base/pom.xml b/common/features/odl-mdsal-binding-base/pom.xml new file mode 100644 index 0000000000..5f614e7fd0 --- /dev/null +++ b/common/features/odl-mdsal-binding-base/pom.xml @@ -0,0 +1,87 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.mdsal + odl-mdsal-binding-base + 2.2.0-SNAPSHOT + feature + + OpenDaylight :: MD-SAL :: Binding Base Concepts + + + + + org.opendaylight.yangtools + yangtools-artifacts + 1.1.0-SNAPSHOT + pom + import + + + org.opendaylight.mdsal + mdsal-artifacts + ${project.version} + pom + import + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + 0.10.0-SNAPSHOT + pom + import + + + + + + + org.opendaylight.yangtools + odl-yangtools-common + xml + features + + + ${project.groupId} + yang-binding + + + org.opendaylight.mdsal.model + yang-ext + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + \ No newline at end of file diff --git a/common/features/odl-mdsal-binding-dom-adapter/pom.xml b/common/features/odl-mdsal-binding-dom-adapter/pom.xml new file mode 100644 index 0000000000..cbc8ef8aba --- /dev/null +++ b/common/features/odl-mdsal-binding-dom-adapter/pom.xml @@ -0,0 +1,81 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.mdsal + odl-mdsal-binding-dom-adapter + 2.2.0-SNAPSHOT + feature + + OpenDaylight :: MD-SAL :: DOM Adapter + + + + + org.opendaylight.mdsal + mdsal-artifacts + ${project.version} + import + pom + + + + + + + org.opendaylight.mdsal + odl-mdsal-binding-runtime + xml + features + + + org.opendaylight.mdsal + odl-mdsal-binding-api + xml + features + + + org.opendaylight.mdsal + odl-mdsal-dom-api + xml + features + + + ${project.groupId} + mdsal-binding-dom-adapter + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + \ No newline at end of file diff --git a/common/features/odl-mdsal-binding-runtime/pom.xml b/common/features/odl-mdsal-binding-runtime/pom.xml new file mode 100644 index 0000000000..f78353bd28 --- /dev/null +++ b/common/features/odl-mdsal-binding-runtime/pom.xml @@ -0,0 +1,94 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.mdsal + odl-mdsal-binding-runtime + 2.2.0-SNAPSHOT + feature + + OpenDaylight :: MD-SAL :: Binding Generator + + + + + org.opendaylight.yangtools + yangtools-artifacts + 1.1.0-SNAPSHOT + pom + import + + + org.opendaylight.mdsal + mdsal-artifacts + ${project.version} + pom + import + + + + + + + org.opendaylight.yangtools + odl-yangtools-yang-data + xml + features + + + org.opendaylight.mdsal + odl-mdsal-binding-base + xml + features + + + ${project.groupId} + mdsal-binding-generator-api + + + ${project.groupId} + mdsal-binding-generator-impl + + + ${project.groupId} + mdsal-binding-generator-util + + + ${project.groupId} + mdsal-binding-dom-codec + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + \ No newline at end of file diff --git a/common/features/odl-mdsal-binding/pom.xml b/common/features/odl-mdsal-binding/pom.xml new file mode 100644 index 0000000000..784820e6b6 --- /dev/null +++ b/common/features/odl-mdsal-binding/pom.xml @@ -0,0 +1,71 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.mdsal + odl-mdsal-binding + 2.2.0-SNAPSHOT + feature + + OpenDaylight :: MD-SAL :: Binding + + + + + org.opendaylight.mdsal + mdsal-artifacts + ${project.version} + import + pom + + + + + + + ${project.groupId} + odl-mdsal-binding-dom-adapter + features + xml + + + ${project.groupId} + odl-mdsal-dom + features + xml + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + \ No newline at end of file diff --git a/common/features/odl-mdsal-common/pom.xml b/common/features/odl-mdsal-common/pom.xml new file mode 100644 index 0000000000..a1aff9110c --- /dev/null +++ b/common/features/odl-mdsal-common/pom.xml @@ -0,0 +1,76 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.mdsal + odl-mdsal-common + 2.2.0-SNAPSHOT + feature + + OpenDaylight :: MD-SAL :: Common + + + + + org.opendaylight.mdsal + mdsal-artifacts + ${project.version} + pom + import + + + org.opendaylight.yangtools + yangtools-artifacts + 1.1.0-SNAPSHOT + pom + import + + + + + + + org.opendaylight.yangtools + odl-yangtools-common + xml + features + + + ${project.groupId} + mdsal-common-api + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + \ No newline at end of file diff --git a/common/features/odl-mdsal-dom-api/pom.xml b/common/features/odl-mdsal-dom-api/pom.xml new file mode 100644 index 0000000000..e7ca2b3fc7 --- /dev/null +++ b/common/features/odl-mdsal-dom-api/pom.xml @@ -0,0 +1,86 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.mdsal + odl-mdsal-dom-api + 2.2.0-SNAPSHOT + feature + + OpenDaylight :: MD-SAL :: DOM API and SPI + + + + + org.opendaylight.mdsal + mdsal-artifacts + ${project.version} + pom + import + + + org.opendaylight.yangtools + yangtools-artifacts + 1.1.0-SNAPSHOT + pom + import + + + + + + + org.opendaylight.mdsal + odl-mdsal-common + xml + features + + + org.opendaylight.yangtools + odl-yangtools-yang-data + xml + features + + + ${project.groupId} + mdsal-dom-api + + + ${project.groupId} + mdsal-dom-spi + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + \ No newline at end of file diff --git a/common/features/odl-mdsal-dom-broker/pom.xml b/common/features/odl-mdsal-dom-broker/pom.xml new file mode 100644 index 0000000000..98a5dd8119 --- /dev/null +++ b/common/features/odl-mdsal-dom-broker/pom.xml @@ -0,0 +1,95 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.mdsal + odl-mdsal-dom-broker + 2.2.0-SNAPSHOT + feature + + OpenDaylight :: MD-SAL :: DOM Broker + + + + + org.opendaylight.odlparent + odlparent-artifacts + 1.8.0-SNAPSHOT + pom + import + + + org.opendaylight.yangtools + yangtools-artifacts + 1.1.0-SNAPSHOT + pom + import + + + org.opendaylight.mdsal + mdsal-artifacts + ${project.version} + pom + import + + + + + + + org.opendaylight.yangtools + odl-yangtools-yang-parser + xml + features + + + org.opendaylight.odlparent + odl4-lmax-3 + xml + features + + + org.opendaylight.mdsal + odl-mdsal-dom-api + xml + features + + + ${project.groupId} + mdsal-dom-broker + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + \ No newline at end of file diff --git a/common/features/odl-mdsal-dom/pom.xml b/common/features/odl-mdsal-dom/pom.xml new file mode 100644 index 0000000000..78fe604ae0 --- /dev/null +++ b/common/features/odl-mdsal-dom/pom.xml @@ -0,0 +1,65 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.mdsal + odl-mdsal-dom + 2.2.0-SNAPSHOT + feature + + OpenDaylight :: MD-SAL :: DOM + + + + + org.opendaylight.mdsal + mdsal-artifacts + ${project.version} + import + pom + + + + + + + ${project.groupId} + odl-mdsal-dom-broker + features + xml + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + \ No newline at end of file diff --git a/common/features/odl-mdsal-eos-binding/pom.xml b/common/features/odl-mdsal-eos-binding/pom.xml new file mode 100644 index 0000000000..7fcf7305ac --- /dev/null +++ b/common/features/odl-mdsal-eos-binding/pom.xml @@ -0,0 +1,79 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.mdsal + odl-mdsal-eos-binding + 2.2.0-SNAPSHOT + feature + + OpenDaylight :: MD-SAL :: EOS :: Binding + + + + + org.opendaylight.mdsal + mdsal-artifacts + ${project.version} + import + pom + + + + + + + org.opendaylight.mdsal + odl-mdsal-eos-dom + xml + features + + + org.opendaylight.mdsal + odl-mdsal-binding-dom-adapter + xml + features + + + ${project.groupId} + mdsal-eos-binding-api + + + ${project.groupId} + mdsal-eos-binding-adapter + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + \ No newline at end of file diff --git a/common/features/odl-mdsal-eos-common/pom.xml b/common/features/odl-mdsal-eos-common/pom.xml new file mode 100644 index 0000000000..88d7eb4620 --- /dev/null +++ b/common/features/odl-mdsal-eos-common/pom.xml @@ -0,0 +1,86 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.mdsal + odl-mdsal-eos-common + 2.2.0-SNAPSHOT + feature + + OpenDaylight :: MD-SAL :: EOS :: Common + + + + + org.opendaylight.yangtools + yangtools-artifacts + 1.1.0-SNAPSHOT + pom + import + + + org.opendaylight.mdsal + mdsal-artifacts + ${project.version} + pom + import + + + + + + + org.opendaylight.yangtools + odl-yangtools-common + xml + features + + + org.opendaylight.yangtools + odl-yangtools-yang-data + xml + features + + + ${project.groupId} + mdsal-eos-common-api + + + ${project.groupId} + mdsal-eos-common-spi + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + \ No newline at end of file diff --git a/common/features/odl-mdsal-eos-dom/pom.xml b/common/features/odl-mdsal-eos-dom/pom.xml new file mode 100644 index 0000000000..32508a0de8 --- /dev/null +++ b/common/features/odl-mdsal-eos-dom/pom.xml @@ -0,0 +1,69 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.mdsal + odl-mdsal-eos-dom + 2.2.0-SNAPSHOT + feature + + OpenDaylight :: MD-SAL :: EOS :: DOM + + + + + org.opendaylight.mdsal + mdsal-artifacts + ${project.version} + import + pom + + + + + + + org.opendaylight.mdsal + odl-mdsal-eos-common + xml + features + + + ${project.groupId} + mdsal-eos-dom-api + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + \ No newline at end of file diff --git a/common/features/odl-mdsal-singleton-common/pom.xml b/common/features/odl-mdsal-singleton-common/pom.xml new file mode 100644 index 0000000000..e2cad998ad --- /dev/null +++ b/common/features/odl-mdsal-singleton-common/pom.xml @@ -0,0 +1,69 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.mdsal + odl-mdsal-singleton-common + 2.2.0-SNAPSHOT + feature + + OpenDaylight :: MD-SAL :: Singleton :: Common + + + + + org.opendaylight.mdsal + mdsal-artifacts + ${project.version} + import + pom + + + + + + + org.opendaylight.mdsal + odl-mdsal-eos-common + xml + features + + + ${project.groupId} + mdsal-singleton-common-api + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + \ No newline at end of file diff --git a/common/features/odl-mdsal-singleton-dom/pom.xml b/common/features/odl-mdsal-singleton-dom/pom.xml new file mode 100644 index 0000000000..bbf8a4710c --- /dev/null +++ b/common/features/odl-mdsal-singleton-dom/pom.xml @@ -0,0 +1,81 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.mdsal + odl-mdsal-singleton-dom + 2.2.0-SNAPSHOT + feature + + OpenDaylight :: MD-SAL :: Singleton :: DOM + + + + + org.opendaylight.mdsal + mdsal-artifacts + ${project.version} + import + pom + + + + + + + org.opendaylight.mdsal + odl-mdsal-singleton-common + xml + features + + + org.opendaylight.mdsal + odl-mdsal-eos-dom + xml + features + + + org.opendaylight.mdsal + odl-mdsal-common + xml + features + + + ${project.groupId} + mdsal-singleton-dom-impl + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + \ No newline at end of file diff --git a/common/features/pom.xml b/common/features/pom.xml index a8c8c0c378..196e8233eb 100644 --- a/common/features/pom.xml +++ b/common/features/pom.xml @@ -7,178 +7,54 @@ 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 org.opendaylight.odlparent - features-parent + odlparent-lite 1.8.0-SNAPSHOT org.opendaylight.mdsal - features-mdsal + features-mdsal-aggregator 2.2.0-SNAPSHOT - jar - - - 1.8.0-SNAPSHOT - 1.1.0-SNAPSHOT - - - - - - org.opendaylight.odlparent - odlparent-artifacts - ${odlparent.version} - import - pom - - - org.opendaylight.yangtools - yangtools-artifacts - ${yangtools.version} - import - pom - - - org.opendaylight.mdsal - - mdsal-parent - ${project.version} - import - pom - - - - - - - - org.opendaylight.odlparent - features-odlparent - features - xml - - - - org.opendaylight.yangtools - features-yangtools - features - xml - - - - - org.eclipse.xtext - org.eclipse.xtext.xbase.lib - - - - ${project.groupId} - mdsal-common-api - - - - ${project.groupId} - mdsal-dom-api - - - ${project.groupId} - mdsal-dom-spi - - - ${project.groupId} - mdsal-dom-broker - - - ${project.groupId} - mdsal-dom-inmemory-datastore - - - ${project.groupId} - mdsal-eos-common-api - - - ${project.groupId} - mdsal-eos-common-spi - - - ${project.groupId} - mdsal-eos-dom-api - - - ${project.groupId} - mdsal-eos-binding-api - - - ${project.groupId} - mdsal-eos-binding-adapter - - - ${project.groupId} - mdsal-singleton-common-api - - - ${project.groupId} - mdsal-singleton-dom-impl - - - - - ${project.groupId} - mdsal-binding-generator-api - - - ${project.groupId} - mdsal-binding-generator-util - - - ${project.groupId} - mdsal-binding-generator-impl - - - ${project.groupId} - yang-binding - - - ${project.groupId} - mdsal-binding-dom-codec - - - - ${project.groupId} - mdsal-binding-api - - - ${project.groupId} - mdsal-binding-dom-adapter - - - ${project.groupId}.model - yang-ext - - - ${project.groupId}.model - general-entity - - - - - ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ - - - - opendaylight-site - ${nexus.site.url}/${project.artifactId}/ - - + pom + + + features-mdsal + features4-mdsal + odl-mdsal-binding + odl-mdsal-binding-api + odl-mdsal-binding-base + odl-mdsal-binding-dom-adapter + odl-mdsal-binding-runtime + odl-mdsal-common + odl-mdsal-dom + odl-mdsal-dom-api + odl-mdsal-dom-broker + odl-mdsal-eos-binding + odl-mdsal-eos-common + odl-mdsal-eos-dom + odl-mdsal-singleton-common + odl-mdsal-singleton-dom + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/model/artifacts/pom.xml b/model/artifacts/pom.xml index dd7ee443af..76846f17c0 100644 --- a/model/artifacts/pom.xml +++ b/model/artifacts/pom.xml @@ -117,6 +117,20 @@ 0.10.0-SNAPSHOT xml + + org.opendaylight.mdsal.model + features4-mdsal-model + features + 0.10.0-SNAPSHOT + xml + + + org.opendaylight.mdsal.model + odl-mdsal-models + 0.10.0-SNAPSHOT + features + xml + org.opendaylight.mdsal.model general-entity diff --git a/model/features/features-mdsal-model/pom.xml b/model/features/features-mdsal-model/pom.xml new file mode 100644 index 0000000000..3ba76ada4c --- /dev/null +++ b/model/features/features-mdsal-model/pom.xml @@ -0,0 +1,156 @@ + + + + + 4.0.0 + + org.opendaylight.odlparent + features-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.mdsal.model + features-mdsal-model + 0.10.0-SNAPSHOT + jar + + + 1.1.0-SNAPSHOT + 2.2.0-SNAPSHOT + + + + + + org.opendaylight.yangtools + yangtools-artifacts + ${yangtools.version} + pom + import + + + org.opendaylight.mdsal + mdsal-artifacts + ${mdsal.version} + pom + import + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + 0.10.0-SNAPSHOT + import + pom + + + + + + + org.opendaylight.mdsal + features-mdsal + features + xml + + + org.opendaylight.mdsal.model + iana-afn-safi + + + org.opendaylight.mdsal.model + iana-if-type-2014-05-08 + + + org.opendaylight.mdsal.model + ietf-inet-types + + + org.opendaylight.mdsal.model + ietf-interfaces + + + org.opendaylight.mdsal.model + ietf-restconf + + + org.opendaylight.mdsal.model + ietf-yang-types + + + org.opendaylight.mdsal.model + ietf-yang-types-20130715 + + + org.opendaylight.mdsal.model + yang-ext + + + org.opendaylight.mdsal.model + opendaylight-l2-types + + + org.opendaylight.mdsal.model + ietf-ted + + + org.opendaylight.mdsal.model + ietf-topology + + + org.opendaylight.mdsal.model + ietf-topology-isis + + + org.opendaylight.mdsal.model + ietf-topology-ospf + + + org.opendaylight.mdsal.model + ietf-topology-l3-unicast-igp + + + org.opendaylight.mdsal.model + ietf-network-2015-06-08 + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + + org.opendaylight.mdsal.model + ietf-type-util + + + org.opendaylight.mdsal.model + ietf-packet-fields + + + org.opendaylight.mdsal.model + ietf-access-control-list + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + diff --git a/model/features/src/main/features/features.xml b/model/features/features-mdsal-model/src/main/features/features.xml similarity index 100% rename from model/features/src/main/features/features.xml rename to model/features/features-mdsal-model/src/main/features/features.xml diff --git a/model/features/features4-mdsal-model/pom.xml b/model/features/features4-mdsal-model/pom.xml new file mode 100644 index 0000000000..b2c2d53fc9 --- /dev/null +++ b/model/features/features4-mdsal-model/pom.xml @@ -0,0 +1,61 @@ + + + + + 4.0.0 + + org.opendaylight.odlparent + feature-repo-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.mdsal.model + features4-mdsal-model + 0.10.0-SNAPSHOT + feature + + + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + ${project.version} + import + pom + + + + + + + org.opendaylight.mdsal.model + odl-mdsal-models + features + xml + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + diff --git a/model/features/odl-mdsal-models/pom.xml b/model/features/odl-mdsal-models/pom.xml new file mode 100644 index 0000000000..73b15a32e4 --- /dev/null +++ b/model/features/odl-mdsal-models/pom.xml @@ -0,0 +1,148 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.mdsal.model + odl-mdsal-models + 0.10.0-SNAPSHOT + feature + + OpenDaylight :: MD-SAL :: Models + + + + + org.opendaylight.mdsal + mdsal-artifacts + 2.2.0-SNAPSHOT + import + pom + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + ${project.version} + import + pom + + + + + + + org.opendaylight.mdsal + odl-mdsal-binding-base + features + xml + + + ${project.groupId} + iana-afn-safi + + + ${project.groupId} + iana-if-type-2014-05-08 + + + ${project.groupId} + ietf-inet-types + + + ${project.groupId} + ietf-interfaces + + + ${project.groupId} + ietf-yang-types + + + ${project.groupId} + ietf-yang-types-20130715 + + + ${project.groupId} + ietf-restconf + + + ${project.groupId} + yang-ext + + + ${project.groupId} + opendaylight-l2-types + + + ${project.groupId} + ietf-ted + + + ${project.groupId} + ietf-topology + + + ${project.groupId} + ietf-topology-isis + + + ${project.groupId} + ietf-topology-ospf + + + ${project.groupId} + ietf-topology-l3-unicast-igp + + + ${project.groupId} + ietf-network-2015-06-08 + + + ${project.groupId} + ietf-inet-types-2013-07-15 + + + ${project.groupId} + ietf-type-util + + + ${project.groupId} + ietf-packet-fields + + + ${project.groupId} + ietf-access-control-list + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + \ No newline at end of file diff --git a/model/features/pom.xml b/model/features/pom.xml index 3ba76ada4c..6541ceba51 100644 --- a/model/features/pom.xml +++ b/model/features/pom.xml @@ -7,150 +7,41 @@ 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 org.opendaylight.odlparent - features-parent + odlparent-lite 1.8.0-SNAPSHOT org.opendaylight.mdsal.model - features-mdsal-model + features-mdsal-model-aggregator 0.10.0-SNAPSHOT - jar - - - 1.1.0-SNAPSHOT - 2.2.0-SNAPSHOT - - - - - - org.opendaylight.yangtools - yangtools-artifacts - ${yangtools.version} - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - ${mdsal.version} - pom - import - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - 0.10.0-SNAPSHOT - import - pom - - - - - - - org.opendaylight.mdsal - features-mdsal - features - xml - - - org.opendaylight.mdsal.model - iana-afn-safi - - - org.opendaylight.mdsal.model - iana-if-type-2014-05-08 - - - org.opendaylight.mdsal.model - ietf-inet-types - - - org.opendaylight.mdsal.model - ietf-interfaces - - - org.opendaylight.mdsal.model - ietf-restconf - - - org.opendaylight.mdsal.model - ietf-yang-types - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 - - - org.opendaylight.mdsal.model - yang-ext - - - org.opendaylight.mdsal.model - opendaylight-l2-types - - - org.opendaylight.mdsal.model - ietf-ted - - - org.opendaylight.mdsal.model - ietf-topology - - - org.opendaylight.mdsal.model - ietf-topology-isis - - - org.opendaylight.mdsal.model - ietf-topology-ospf - - - org.opendaylight.mdsal.model - ietf-topology-l3-unicast-igp - - - org.opendaylight.mdsal.model - ietf-network-2015-06-08 - - - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-type-util - - - org.opendaylight.mdsal.model - ietf-packet-fields - - - org.opendaylight.mdsal.model - ietf-access-control-list - - - - - ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ - - - - opendaylight-site - ${nexus.site.url}/${project.artifactId}/ - - + pom + + + features-mdsal-model + features4-mdsal-model + odl-mdsal-models + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + diff --git a/model/pom.xml b/model/pom.xml index 9b6c25be50..5a62c549c4 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -34,29 +34,6 @@ general-entity - -