From a0d3006e4df7a0bea192cb01e5377b269cdaccc0 Mon Sep 17 00:00:00 2001 From: Martin Vitez Date: Thu, 19 Sep 2013 11:32:08 +0200 Subject: [PATCH 1/1] Added OSGi metadata to yangtools artifacts. Signed-off-by: Martin Vitez --- code-generator/binding-generator-api/pom.xml | 20 +++++++++ code-generator/binding-generator-impl/pom.xml | 18 +++++++- code-generator/binding-generator-spi/pom.xml | 20 +++++++++ code-generator/binding-generator-util/pom.xml | 21 +++++++++ .../binding-java-api-generator/pom.xml | 15 +++++++ code-generator/binding-model-api/pom.xml | 30 +++++++++++-- .../maven-sal-api-gen-plugin/pom.xml | 20 +++++++++ yang/yang-binding/pom.xml | 5 +-- yang/yang-common/pom.xml | 1 - yang/yang-data-api/pom.xml | 20 +++++++++ yang/yang-data-impl/pom.xml | 15 +++++++ yang/yang-data-util/pom.xml | 20 +++++++++ yang/yang-ext/pom.xml | 1 + yang/yang-maven-plugin-spi/pom.xml | 14 ++++++ yang/yang-model-api/pom.xml | 21 +++++++++ yang/yang-model-util/pom.xml | 45 ++++++++++++------- yang/yang-parser-api/pom.xml | 20 +++++++++ yang/yang-parser-impl/pom.xml | 20 ++++++++- 18 files changed, 300 insertions(+), 26 deletions(-) diff --git a/code-generator/binding-generator-api/pom.xml b/code-generator/binding-generator-api/pom.xml index 9eaba8792e..3eb37c916f 100644 --- a/code-generator/binding-generator-api/pom.xml +++ b/code-generator/binding-generator-api/pom.xml @@ -9,6 +9,7 @@ 4.0.0 binding-generator-api + bundle @@ -21,4 +22,23 @@ + + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + ${project.groupId}.${project.artifactId} + + org.opendaylight.yangtools.sal.binding.generator.api + + + + + + + diff --git a/code-generator/binding-generator-impl/pom.xml b/code-generator/binding-generator-impl/pom.xml index 60f6ff5734..d4e2310a0f 100644 --- a/code-generator/binding-generator-impl/pom.xml +++ b/code-generator/binding-generator-impl/pom.xml @@ -9,9 +9,25 @@ 4.0.0 binding-generator-impl + bundle + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + ${project.groupId}.${project.artifactId} + + org.opendaylight.yangtools.sal.binding.generator.impl, + org.opendaylight.yangtools.sal.binding.yang.types + + + + org.eclipse.xtend xtend-maven-plugin @@ -75,7 +91,7 @@ com.google.guava guava - + org.eclipse.xtend org.eclipse.xtend.lib 2.4.2 diff --git a/code-generator/binding-generator-spi/pom.xml b/code-generator/binding-generator-spi/pom.xml index 84bc8f8556..97c578e53a 100644 --- a/code-generator/binding-generator-spi/pom.xml +++ b/code-generator/binding-generator-spi/pom.xml @@ -9,6 +9,7 @@ 4.0.0 binding-generator-spi + bundle @@ -21,4 +22,23 @@ + + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + ${project.groupId}.${project.artifactId} + + org.opendaylight.yangtools.sal.binding.generator.spi + + + + + + + diff --git a/code-generator/binding-generator-util/pom.xml b/code-generator/binding-generator-util/pom.xml index d28873ec8e..e48fe997ad 100644 --- a/code-generator/binding-generator-util/pom.xml +++ b/code-generator/binding-generator-util/pom.xml @@ -9,6 +9,7 @@ 4.0.0 binding-generator-util + bundle @@ -34,4 +35,24 @@ + + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + ${project.groupId}.${project.artifactId} + + org.opendaylight.yangtools.binding.generator.util, + org.opendaylight.yangtools.binding.generator.util.generated.type.builder + + + + + + + diff --git a/code-generator/binding-java-api-generator/pom.xml b/code-generator/binding-java-api-generator/pom.xml index eb56ff1826..75b02f5b05 100644 --- a/code-generator/binding-java-api-generator/pom.xml +++ b/code-generator/binding-java-api-generator/pom.xml @@ -9,9 +9,24 @@ 4.0.0 binding-java-api-generator + bundle + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + ${project.groupId}.${project.artifactId} + + org.opendaylight.yangtools.sal.java.api.generator + + + + org.eclipse.xtend xtend-maven-plugin diff --git a/code-generator/binding-model-api/pom.xml b/code-generator/binding-model-api/pom.xml index 5c8dc5ba4e..f14df407e0 100644 --- a/code-generator/binding-model-api/pom.xml +++ b/code-generator/binding-model-api/pom.xml @@ -10,13 +10,35 @@ 4.0.0 binding-model-api ${project.artifactId} + bundle ${project.artifactId} - - org.opendaylight.yangtools - yang-model-api + + org.opendaylight.yangtools + yang-model-api 0.5.7-SNAPSHOT - + + + + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + ${project.groupId}.${project.artifactId} + + org.opendaylight.yangtools.sal.binding.model.api, + org.opendaylight.yangtools.sal.binding.model.api.type.builder + + + + + + + diff --git a/code-generator/maven-sal-api-gen-plugin/pom.xml b/code-generator/maven-sal-api-gen-plugin/pom.xml index 88cd1ce491..1ad1a564dd 100644 --- a/code-generator/maven-sal-api-gen-plugin/pom.xml +++ b/code-generator/maven-sal-api-gen-plugin/pom.xml @@ -9,6 +9,7 @@ 4.0.0 maven-sal-api-gen-plugin + bundle @@ -33,4 +34,23 @@ + + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + ${project.groupId}.${project.artifactId} + + org.opendaylight.yangtools.maven.sal.api.gen.plugin + + + + + + + diff --git a/yang/yang-binding/pom.xml b/yang/yang-binding/pom.xml index 28eb953224..17eb92b04a 100644 --- a/yang/yang-binding/pom.xml +++ b/yang/yang-binding/pom.xml @@ -6,12 +6,12 @@ yang 0.5.7-SNAPSHOT - bundle + 4.0.0 yang-binding ${project.artifactId} Java binding for YANG - + bundle @@ -24,7 +24,6 @@ ${project.groupId}.${project.artifactId} - ${project.basedir}/META-INF diff --git a/yang/yang-common/pom.xml b/yang/yang-common/pom.xml index 0cbdf56482..bf72cbd79a 100644 --- a/yang/yang-common/pom.xml +++ b/yang/yang-common/pom.xml @@ -32,7 +32,6 @@ ${project.groupId}.${project.artifactId} - ${project.basedir}/META-INF diff --git a/yang/yang-data-api/pom.xml b/yang/yang-data-api/pom.xml index e552e353bf..cefc7193d2 100644 --- a/yang/yang-data-api/pom.xml +++ b/yang/yang-data-api/pom.xml @@ -10,6 +10,7 @@ 4.0.0 yang-data-api ${project.artifactId} + bundle ${project.artifactId} @@ -19,4 +20,23 @@ + + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + ${project.groupId}.${project.artifactId} + + org.opendaylight.yangtools.yang.data.api + + + + + + + diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml index afa32728c5..5f5d41cc34 100644 --- a/yang/yang-data-impl/pom.xml +++ b/yang/yang-data-impl/pom.xml @@ -10,6 +10,7 @@ 4.0.0 yang-data-impl ${project.artifactId} + bundle ${project.artifactId} @@ -18,6 +19,20 @@ + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + ${project.groupId}.${project.artifactId} + + org.opendaylight.yangtools.yang.data.impl + + + + org.apache.maven.plugins maven-surefire-plugin diff --git a/yang/yang-data-util/pom.xml b/yang/yang-data-util/pom.xml index d0bc4f6017..e984d0c8a0 100644 --- a/yang/yang-data-util/pom.xml +++ b/yang/yang-data-util/pom.xml @@ -10,6 +10,7 @@ 4.0.0 yang-data-util ${project.artifactId} + bundle ${project.artifactId} @@ -19,4 +20,23 @@ + + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + ${project.groupId}.${project.artifactId} + + org.opendaylight.yangtools.yang.data.util + + + + + + + diff --git a/yang/yang-ext/pom.xml b/yang/yang-ext/pom.xml index 47bf7802a2..431c444eda 100644 --- a/yang/yang-ext/pom.xml +++ b/yang/yang-ext/pom.xml @@ -11,6 +11,7 @@ yang-ext 2013.09.07-SNAPSHOT ${project.artifactId} + bundle ${project.artifactId} diff --git a/yang/yang-maven-plugin-spi/pom.xml b/yang/yang-maven-plugin-spi/pom.xml index 977dadc06c..c234829255 100644 --- a/yang/yang-maven-plugin-spi/pom.xml +++ b/yang/yang-maven-plugin-spi/pom.xml @@ -45,6 +45,20 @@ + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + ${project.groupId}.${project.artifactId} + + org.opendaylight.yangtools.yang2sources.spi + + + + diff --git a/yang/yang-model-api/pom.xml b/yang/yang-model-api/pom.xml index 038b4b5c52..b335634460 100644 --- a/yang/yang-model-api/pom.xml +++ b/yang/yang-model-api/pom.xml @@ -10,6 +10,7 @@ 4.0.0 yang-model-api ${project.artifactId} + bundle ${project.artifactId} @@ -19,4 +20,24 @@ + + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + ${project.groupId}.${project.artifactId} + + org.opendaylight.yangtools.yang.model.api, + org.opendaylight.yangtools.yang.model.api.type + + + + + + + diff --git a/yang/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml index 799ac6bac8..b69777ee82 100644 --- a/yang/yang-model-util/pom.xml +++ b/yang/yang-model-util/pom.xml @@ -10,11 +10,41 @@ 4.0.0 yang-model-util ${project.artifactId} + bundle ${project.artifactId} + + + ${project.groupId} + yang-model-api + + + org.eclipse.xtend + org.eclipse.xtend.lib + 2.4.2 + + + junit + junit + + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + ${project.groupId}.${project.artifactId} + + org.opendaylight.yangtools.yang.model.util + + + + org.eclipse.xtend xtend-maven-plugin @@ -47,19 +77,4 @@ - - - ${project.groupId} - yang-model-api - - - org.eclipse.xtend - org.eclipse.xtend.lib - 2.4.2 - - - junit - junit - - diff --git a/yang/yang-parser-api/pom.xml b/yang/yang-parser-api/pom.xml index 8d294616a9..e0343dce58 100644 --- a/yang/yang-parser-api/pom.xml +++ b/yang/yang-parser-api/pom.xml @@ -10,6 +10,7 @@ 4.0.0 yang-parser-api ${project.artifactId} + bundle YANG parser API @@ -19,4 +20,23 @@ + + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + ${project.groupId}.${project.artifactId} + + org.opendaylight.yangtools.yang.parser.api + + + + + + + diff --git a/yang/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml index 88ef7280f9..64e0711bc3 100644 --- a/yang/yang-parser-impl/pom.xml +++ b/yang/yang-parser-impl/pom.xml @@ -10,6 +10,7 @@ 4.0.0 yang-parser-impl ${project.artifactId} + bundle YANG parser @@ -64,6 +65,20 @@ + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + ${project.groupId}.${project.artifactId} + + org.opendaylight.yangtools.yang.parser.impl + + + + maven-clean-plugin 2.4.1 @@ -110,7 +125,8 @@ - + + org.codehaus.mojo build-helper-maven-plugin 1.7 @@ -128,7 +144,7 @@ - + org.apache.maven.plugins maven-javadoc-plugin -- 2.36.6