From: Martin Vitez Date: Thu, 19 Sep 2013 15:26:42 +0000 (+0200) Subject: Refactored OSGi metadata declaration. X-Git-Tag: release/beryllium~778 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=8f5b783f894adad29d7354c8a8a07d459dc61fc4;p=mdsal.git Refactored OSGi metadata declaration. Signed-off-by: Martin Vitez --- diff --git a/code-generator/binding-generator-api/pom.xml b/code-generator/binding-generator-api/pom.xml index b5153b58e7..3adf8937fe 100644 --- a/code-generator/binding-generator-api/pom.xml +++ b/code-generator/binding-generator-api/pom.xml @@ -25,26 +25,11 @@ maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - org.apache.felix maven-bundle-plugin - ${maven.bundle.version} true - - - bundle-manifest - process-classes - - manifest - - - ${project.groupId}.${project.artifactId} @@ -55,34 +40,6 @@ - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.felix - maven-bundle-plugin - [1.0,) - - manifest - - - - - - - - - - - - diff --git a/code-generator/binding-generator-impl/pom.xml b/code-generator/binding-generator-impl/pom.xml index c304d839f6..7558ea77eb 100644 --- a/code-generator/binding-generator-impl/pom.xml +++ b/code-generator/binding-generator-impl/pom.xml @@ -9,14 +9,53 @@ 4.0.0 binding-generator-impl - bundle + + + + org.opendaylight.yangtools + binding-generator-util + + + org.opendaylight.yangtools + yang-parser-impl + ${yang.version} + + + org.opendaylight.yangtools + binding-generator-api + + + org.opendaylight.yangtools + binding-generator-spi + + + junit + junit + + + commons-lang + commons-lang + 2.1 + + + com.google.guava + guava + + + org.eclipse.xtend + org.eclipse.xtend.lib + 2.4.2 + + + + maven-jar-plugin + org.apache.felix maven-bundle-plugin - ${maven.bundle.version} true @@ -60,42 +99,4 @@ - - - org.opendaylight.yangtools - binding-generator-util - - - org.opendaylight.yangtools - yang-parser-impl - ${yang.version} - - - org.opendaylight.yangtools - binding-generator-api - - - org.opendaylight.yangtools - binding-generator-spi - - - junit - junit - - - commons-lang - commons-lang - 2.1 - - - 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 d1954c7000..d627171b70 100644 --- a/code-generator/binding-generator-spi/pom.xml +++ b/code-generator/binding-generator-spi/pom.xml @@ -9,7 +9,6 @@ 4.0.0 binding-generator-spi - bundle @@ -24,10 +23,12 @@ + + maven-jar-plugin + org.apache.felix maven-bundle-plugin - ${maven.bundle.version} true diff --git a/code-generator/binding-generator-util/pom.xml b/code-generator/binding-generator-util/pom.xml index 0c5b7b7f33..bbf3f65236 100644 --- a/code-generator/binding-generator-util/pom.xml +++ b/code-generator/binding-generator-util/pom.xml @@ -9,7 +9,6 @@ 4.0.0 binding-generator-util - bundle @@ -29,18 +28,20 @@ yang-binding - org.opendaylight.yangtools - yang-parser-impl - ${yang.version} + org.opendaylight.yangtools + yang-parser-impl + ${yang.version} + + maven-jar-plugin + org.apache.felix maven-bundle-plugin - ${maven.bundle.version} true diff --git a/code-generator/binding-java-api-generator/pom.xml b/code-generator/binding-java-api-generator/pom.xml index e7c3e4e23c..adb87ebfb3 100644 --- a/code-generator/binding-java-api-generator/pom.xml +++ b/code-generator/binding-java-api-generator/pom.xml @@ -9,14 +9,15 @@ 4.0.0 binding-java-api-generator - bundle + + maven-jar-plugin + org.apache.felix maven-bundle-plugin - ${maven.bundle.version} true diff --git a/code-generator/binding-model-api/pom.xml b/code-generator/binding-model-api/pom.xml index 6546f7bebc..9dd1457160 100644 --- a/code-generator/binding-model-api/pom.xml +++ b/code-generator/binding-model-api/pom.xml @@ -10,7 +10,6 @@ 4.0.0 binding-model-api ${project.artifactId} - bundle ${project.artifactId} @@ -22,10 +21,12 @@ + + maven-jar-plugin + org.apache.felix maven-bundle-plugin - ${maven.bundle.version} true diff --git a/code-generator/maven-sal-api-gen-plugin/pom.xml b/code-generator/maven-sal-api-gen-plugin/pom.xml index e4c07ff1b5..6f9ea6d196 100644 --- a/code-generator/maven-sal-api-gen-plugin/pom.xml +++ b/code-generator/maven-sal-api-gen-plugin/pom.xml @@ -9,7 +9,6 @@ 4.0.0 maven-sal-api-gen-plugin - bundle @@ -36,10 +35,17 @@ + + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + org.apache.felix maven-bundle-plugin - ${maven.bundle.version} true diff --git a/code-generator/pom.xml b/code-generator/pom.xml index 93663bdae5..be40d77491 100644 --- a/code-generator/pom.xml +++ b/code-generator/pom.xml @@ -13,9 +13,9 @@ pom ${project.artifactId} ${project.artifactId} - + - 0.5.8-SNAPSHOT + 0.5.8-SNAPSHOT @@ -132,6 +132,57 @@ + + + + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + bundle-manifest + process-classes + + manifest + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.felix + maven-bundle-plugin + [1.0,) + + manifest + + + + + + + + + + + + diff --git a/model/iana/iana-afn-safi/pom.xml b/model/iana/iana-afn-safi/pom.xml index d99ce33e91..407af961c6 100644 --- a/model/iana/iana-afn-safi/pom.xml +++ b/model/iana/iana-afn-safi/pom.xml @@ -10,5 +10,23 @@ 4.0.0 iana-afn-safi 2013.07.04-SNAPSHOT - bundle - \ No newline at end of file + + + + + maven-jar-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + ${project.groupId}.${project.artifactId} + + + + + + + diff --git a/model/iana/iana-if-type/pom.xml b/model/iana/iana-if-type/pom.xml index 38c11afdb5..29d8921d63 100644 --- a/model/iana/iana-if-type/pom.xml +++ b/model/iana/iana-if-type/pom.xml @@ -10,5 +10,23 @@ 4.0.0 iana-if-type 2013.07.04-SNAPSHOT - bundle - \ No newline at end of file + + + + + maven-jar-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + ${project.groupId}.${project.artifactId} + + + + + + + diff --git a/model/ietf/ietf-inet-types/pom.xml b/model/ietf/ietf-inet-types/pom.xml index 0305d76ff1..d206fdbc28 100644 --- a/model/ietf/ietf-inet-types/pom.xml +++ b/model/ietf/ietf-inet-types/pom.xml @@ -13,5 +13,22 @@ ${project.artifactId} ${project.artifactId} - bundle + + + + maven-jar-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + ${project.groupId}.${project.artifactId} + + + + + + diff --git a/model/ietf/ietf-ted/pom.xml b/model/ietf/ietf-ted/pom.xml index aab3808b01..42f9941ea3 100644 --- a/model/ietf/ietf-ted/pom.xml +++ b/model/ietf/ietf-ted/pom.xml @@ -13,9 +13,7 @@ ${project.artifactId} ${project.artifactId} - bundle - - + org.opendaylight.yangtools.model ietf-inet-types @@ -27,4 +25,23 @@ 2010.09.24-SNAPSHOT + + + + + maven-jar-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + ${project.groupId}.${project.artifactId} + + + + + + diff --git a/model/ietf/ietf-topology-isis/pom.xml b/model/ietf/ietf-topology-isis/pom.xml index 835b8f5394..8774e63ef5 100644 --- a/model/ietf/ietf-topology-isis/pom.xml +++ b/model/ietf/ietf-topology-isis/pom.xml @@ -13,8 +13,6 @@ ${project.artifactId} ${project.artifactId} - bundle - org.opendaylight.yangtools.model @@ -28,5 +26,22 @@ + + + + maven-jar-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + ${project.groupId}.${project.artifactId} + + + + + diff --git a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml index ca298f39e4..eac5382eac 100644 --- a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml +++ b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml @@ -13,8 +13,6 @@ ${project.artifactId} ${project.artifactId} - bundle - org.opendaylight.yangtools.model @@ -22,4 +20,23 @@ 2013.07.12-SNAPSHOT + + + + + maven-jar-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + ${project.groupId}.${project.artifactId} + + + + + + diff --git a/model/ietf/ietf-topology-ospf/pom.xml b/model/ietf/ietf-topology-ospf/pom.xml index c21599332c..b81ffe19fe 100644 --- a/model/ietf/ietf-topology-ospf/pom.xml +++ b/model/ietf/ietf-topology-ospf/pom.xml @@ -13,8 +13,6 @@ ${project.artifactId} ${project.artifactId} - bundle - org.opendaylight.yangtools.model @@ -28,4 +26,22 @@ + + + + maven-jar-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + ${project.groupId}.${project.artifactId} + + + + + + diff --git a/model/ietf/ietf-topology/pom.xml b/model/ietf/ietf-topology/pom.xml index 8de7d741b9..38f6f02c82 100644 --- a/model/ietf/ietf-topology/pom.xml +++ b/model/ietf/ietf-topology/pom.xml @@ -13,8 +13,6 @@ ${project.artifactId} ${project.artifactId} - bundle - org.opendaylight.yangtools.model @@ -27,4 +25,23 @@ 2010.09.24-SNAPSHOT + + + + + maven-jar-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + ${project.groupId}.${project.artifactId} + + + + + + diff --git a/model/ietf/ietf-yang-types/pom.xml b/model/ietf/ietf-yang-types/pom.xml index f163743895..7e5656b047 100644 --- a/model/ietf/ietf-yang-types/pom.xml +++ b/model/ietf/ietf-yang-types/pom.xml @@ -13,5 +13,22 @@ ${project.artifactId} ${project.artifactId} - bundle + + + + maven-jar-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + ${project.groupId}.${project.artifactId} + + + + + + diff --git a/model/l2-types/pom.xml b/model/l2-types/pom.xml index f34e9f27c4..d0e65fbe7e 100644 --- a/model/l2-types/pom.xml +++ b/model/l2-types/pom.xml @@ -10,5 +10,23 @@ 4.0.0 opendaylight-l2-types 2013.08.27-SNAPSHOT - bundle - \ No newline at end of file + + + + + maven-jar-plugin + + + org.apache.felix + maven-bundle-plugin + true + + + ${project.groupId}.${project.artifactId} + + + + + + + diff --git a/model/pom.xml b/model/pom.xml index 5f2b31cd13..192c18efa3 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -18,7 +18,6 @@ 0.5.8-SNAPSHOT UTF-8 - 2.4.0 @@ -30,17 +29,6 @@ - - org.apache.felix - maven-bundle-plugin - ${maven.bundle.version} - true - - - ${project.groupId}.${project.artifactId} - - - org.opendaylight.yangtools yang-maven-plugin @@ -96,6 +84,29 @@ + + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + bundle-manifest + process-classes + + manifest + + + + @@ -107,15 +118,9 @@ - - org.opendaylight.yangtools - - - yang-maven-plugin - - - [0.5,) - + org.opendaylight.yangtools + yang-maven-plugin + [0.5,) generate-sources @@ -126,6 +131,19 @@ + + + org.apache.felix + maven-bundle-plugin + [1.0,) + + manifest + + + + + + diff --git a/yang/yang-binding/pom.xml b/yang/yang-binding/pom.xml index df120f5fb3..fed740112f 100644 --- a/yang/yang-binding/pom.xml +++ b/yang/yang-binding/pom.xml @@ -1,32 +1,38 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - org.opendaylight.yangtools - yang - 0.5.8-SNAPSHOT - - bundle - 4.0.0 - yang-binding - ${project.artifactId} - Java binding for YANG + + org.opendaylight.yangtools + yang + 0.5.8-SNAPSHOT + + 4.0.0 + yang-binding + ${project.artifactId} + Java binding for YANG + + + + + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${project.groupId}.${project.artifactId} + + + + + - - - - org.apache.felix - maven-bundle-plugin - ${maven.bundle.version} - true - - - ${project.groupId}.${project.artifactId} - - ${project.basedir}/META-INF - - - -