From 47704af447846a88bc7579a8151af247b7433f9b Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Wed, 14 Dec 2016 18:28:35 +0100 Subject: [PATCH] BUG-7474: produce Karaf 4 features This is a simplified version of https://git.opendaylight.org/gerrit/38638 without any changes to bundles; it just delegates the actual features.xml generation to the plugin. This requires a current snapshot of Karaf 4.0.9 to reduce the resulting dependencies. The new features are generated for Karaf 4 only. (The existing features.xml is preserved for Karaf 3.) Change-Id: I4cc4692459f637e06e64a1a2e432448f57c32e4c Signed-off-by: Stephen Kitt --- common/artifacts/pom.xml | 22 +++ common/features/features-yangtools/pom.xml | 133 ++++++++++++++++ .../src/main/features/features.xml | 0 common/features/features4-yangtools/pom.xml | 74 +++++++++ common/features/odl-yangtools-common/pom.xml | 89 +++++++++++ .../features/odl-yangtools-yang-data/pom.xml | 77 +++++++++ .../odl-yangtools-yang-parser/pom.xml | 69 ++++++++ common/features/pom.xml | 149 ++++-------------- 8 files changed, 498 insertions(+), 115 deletions(-) create mode 100644 common/features/features-yangtools/pom.xml rename common/features/{ => features-yangtools}/src/main/features/features.xml (100%) create mode 100644 common/features/features4-yangtools/pom.xml create mode 100644 common/features/odl-yangtools-common/pom.xml create mode 100644 common/features/odl-yangtools-yang-data/pom.xml create mode 100644 common/features/odl-yangtools-yang-parser/pom.xml diff --git a/common/artifacts/pom.xml b/common/artifacts/pom.xml index 289c44e494..3a68665e31 100644 --- a/common/artifacts/pom.xml +++ b/common/artifacts/pom.xml @@ -168,6 +168,28 @@ ${project.version} test + + + ${project.groupId} + odl-yangtools-yang-data + ${project.version} + xml + features + + + ${project.groupId} + odl-yangtools-common + ${project.version} + xml + features + + + ${project.groupId} + odl-yangtools-yang-parser + ${project.version} + xml + features + diff --git a/common/features/features-yangtools/pom.xml b/common/features/features-yangtools/pom.xml new file mode 100644 index 0000000000..ca72d8c7b5 --- /dev/null +++ b/common/features/features-yangtools/pom.xml @@ -0,0 +1,133 @@ + + + + + 4.0.0 + + org.opendaylight.odlparent + features-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.yangtools + features-yangtools + 1.1.0-SNAPSHOT + jar + + + + + org.opendaylight.yangtools + yangtools-artifacts + ${project.version} + import + pom + + + + + + + org.opendaylight.odlparent + features-odlparent + features + xml + + + + org.opendaylight.yangtools + yang-data-api + + + org.opendaylight.yangtools + yang-data-impl + + + org.opendaylight.yangtools + yang-data-util + + + org.opendaylight.yangtools + yang-data-codec-gson + + + org.opendaylight.yangtools + yang-data-codec-xml + + + org.opendaylight.yangtools + yang-model-api + + + org.opendaylight.yangtools + yang-model-util + + + org.opendaylight.yangtools + yang-parser-impl + + + org.opendaylight.yangtools + yang-parser-api + + + org.opendaylight.yangtools + util + + + org.opendaylight.yangtools + concepts + + + org.opendaylight.yangtools + yang-common + + + org.opendaylight.yangtools + object-cache-api + + + org.opendaylight.yangtools + object-cache-guava + + + org.opendaylight.yangtools + object-cache-noop + + + org.opendaylight.yangtools + xsd-regex + + + com.google.code.gson + gson + + + com.google.guava + guava + + + + + ${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-yangtools/src/main/features/features.xml similarity index 100% rename from common/features/src/main/features/features.xml rename to common/features/features-yangtools/src/main/features/features.xml diff --git a/common/features/features4-yangtools/pom.xml b/common/features/features4-yangtools/pom.xml new file mode 100644 index 0000000000..256cc384e7 --- /dev/null +++ b/common/features/features4-yangtools/pom.xml @@ -0,0 +1,74 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + feature-repo-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.yangtools + features4-yangtools + 1.1.0-SNAPSHOT + feature + + + + org.opendaylight.odlparent + features4-odlparent + 1.8.0-SNAPSHOT + features + xml + provided + + + org.opendaylight.yangtools + odl-yangtools-common + ${project.version} + features + xml + + + org.opendaylight.yangtools + odl-yangtools-yang-data + ${project.version} + features + xml + + + org.opendaylight.yangtools + odl-yangtools-yang-parser + ${project.version} + features + xml + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + diff --git a/common/features/odl-yangtools-common/pom.xml b/common/features/odl-yangtools-common/pom.xml new file mode 100644 index 0000000000..f3d72419d0 --- /dev/null +++ b/common/features/odl-yangtools-common/pom.xml @@ -0,0 +1,89 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.yangtools + odl-yangtools-common + 1.1.0-SNAPSHOT + feature + + OpenDaylight :: Yangtools :: Common + + + + + org.opendaylight.yangtools + yangtools-artifacts + ${project.version} + import + pom + + + + + + + org.opendaylight.odlparent + odl4-guava-18 + [1.7.0,2.0.0) + xml + features + + + org.opendaylight.odlparent + odl4-triemap-0.2 + [1.7.0,2.0.0) + xml + features + + + org.opendaylight.yangtools + util + + + org.opendaylight.yangtools + object-cache-guava + + + org.opendaylight.yangtools + object-cache-noop + + + org.opendaylight.yangtools + yang-common + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + diff --git a/common/features/odl-yangtools-yang-data/pom.xml b/common/features/odl-yangtools-yang-data/pom.xml new file mode 100644 index 0000000000..5c51c1b00b --- /dev/null +++ b/common/features/odl-yangtools-yang-data/pom.xml @@ -0,0 +1,77 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.yangtools + odl-yangtools-yang-data + 1.1.0-SNAPSHOT + feature + + OpenDaylight :: Yangtools :: Data Binding + + + + + org.opendaylight.yangtools + yangtools-artifacts + ${project.version} + import + pom + + + + + + + org.opendaylight.yangtools + odl-yangtools-yang-parser + xml + features + + + org.opendaylight.yangtools + xsd-regex + + + org.opendaylight.yangtools + yang-data-codec-gson + + + org.opendaylight.yangtools + yang-data-codec-xml + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + diff --git a/common/features/odl-yangtools-yang-parser/pom.xml b/common/features/odl-yangtools-yang-parser/pom.xml new file mode 100644 index 0000000000..1190cce978 --- /dev/null +++ b/common/features/odl-yangtools-yang-parser/pom.xml @@ -0,0 +1,69 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.yangtools + odl-yangtools-yang-parser + 1.1.0-SNAPSHOT + feature + + OpenDaylight :: Yangtools :: YANG Parser + + + + + org.opendaylight.yangtools + yangtools-artifacts + ${project.version} + pom + import + + + + + + + org.opendaylight.yangtools + odl-yangtools-common + xml + features + + + org.opendaylight.yangtools + yang-parser-impl + + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + diff --git a/common/features/pom.xml b/common/features/pom.xml index 47992a433b..ab36fc74f0 100644 --- a/common/features/pom.xml +++ b/common/features/pom.xml @@ -1,133 +1,52 @@ - + 4.0.0 + org.opendaylight.odlparent - features-parent + odlparent-lite 1.8.0-SNAPSHOT org.opendaylight.yangtools - features-yangtools + features 1.1.0-SNAPSHOT - jar - - - - - org.opendaylight.yangtools - yangtools-artifacts - ${project.version} - import - pom - - - - - - - org.opendaylight.odlparent - features-odlparent - features - xml - - - - org.opendaylight.yangtools - yang-data-api - - - org.opendaylight.yangtools - yang-data-impl - - - org.opendaylight.yangtools - yang-data-util - - - org.opendaylight.yangtools - yang-data-codec-gson - - - org.opendaylight.yangtools - yang-data-codec-xml - - - org.opendaylight.yangtools - yang-model-api - - - org.opendaylight.yangtools - yang-model-util - - - org.opendaylight.yangtools - yang-parser-impl - - - org.opendaylight.yangtools - yang-parser-api - - - org.opendaylight.yangtools - util - - - org.opendaylight.yangtools - concepts - - - org.opendaylight.yangtools - yang-common - - - org.opendaylight.yangtools - object-cache-api - - - org.opendaylight.yangtools - object-cache-guava - - - org.opendaylight.yangtools - object-cache-noop - - - org.opendaylight.yangtools - xsd-regex - - - com.google.code.gson - gson - - - com.google.guava - guava - - - - - ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ - - - - opendaylight-site - ${nexus.site.url}/${project.artifactId}/ - - + pom + + + + features-yangtools + + + odl-yangtools-common + odl-yangtools-yang-data + odl-yangtools-yang-parser + features4-yangtools + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + -- 2.36.6