Refactored OSGi metadata declaration.

Signed-off-by: Martin Vitez <mvitez@cisco.com>

diff --git a/code-generator/binding-generator-api/pom.xml b/code-generator/binding-generator-api/pom.xml
index b5153b58e7893dc519f463a316a201c52019e9da..3adf8937fe9780ee08340a3ecb68fd070d3c260b 100644 (file)
--- a/code-generator/binding-generator-api/pom.xml
+++ b/code-generator/binding-generator-api/pom.xml
@@ -25,26 +25,11 @@
         <plugins>\r
             <plugin>\r
                 <artifactId>maven-jar-plugin</artifactId>\r
-                <configuration>\r
-                    <archive>\r
-                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>\r
-                    </archive>\r
-                </configuration>\r
             </plugin>\r
             <plugin>\r
                 <groupId>org.apache.felix</groupId>\r
                 <artifactId>maven-bundle-plugin</artifactId>\r
-                <version>${maven.bundle.version}</version>\r
                 <extensions>true</extensions>\r
-                <executions>\r
-                    <execution>\r
-                        <id>bundle-manifest</id>\r
-                        <phase>process-classes</phase>\r
-                        <goals>\r
-                            <goal>manifest</goal>\r
-                        </goals>\r
-                    </execution>\r
-                </executions>\r
                 <configuration>\r
                     <instructions>\r
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
@@ -55,34 +40,6 @@
                 </configuration>\r
             </plugin>\r
         </plugins>\r
-        <pluginManagement>\r
-            <plugins>\r
-                <plugin>\r
-                    <groupId>org.eclipse.m2e</groupId>\r
-                    <artifactId>lifecycle-mapping</artifactId>\r
-                    <version>1.0.0</version>\r
-                    <configuration>\r
-                        <lifecycleMappingMetadata>\r
-                            <pluginExecutions>\r
-                                <pluginExecution>\r
-                                    <pluginExecutionFilter>\r
-                                        <groupId>org.apache.felix</groupId>\r
-                                        <artifactId>maven-bundle-plugin</artifactId>\r
-                                        <versionRange>[1.0,)</versionRange>\r
-                                        <goals>\r
-                                            <goal>manifest</goal>\r
-                                        </goals>\r
-                                    </pluginExecutionFilter>\r
-                                    <action>\r
-                                        <execute></execute>\r
-                                    </action>\r
-                                </pluginExecution>\r
-                            </pluginExecutions>\r
-                        </lifecycleMappingMetadata>\r
-                    </configuration>\r
-                </plugin>\r
-            </plugins>\r
-        </pluginManagement>\r
     </build>\r
 \r
 </project>\r

diff --git a/code-generator/binding-generator-impl/pom.xml b/code-generator/binding-generator-impl/pom.xml
index c304d839f6ce15b881c4972a18713f95b77dc90d..7558ea77eb6ae2adc387dd69e9029d832f4ec9ab 100644 (file)
--- a/code-generator/binding-generator-impl/pom.xml
+++ b/code-generator/binding-generator-impl/pom.xml
@@ -9,14 +9,53 @@
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <artifactId>binding-generator-impl</artifactId>\r
-    <packaging>bundle</packaging>\r
+\r
+    <dependencies>\r
+        <dependency>\r
+            <groupId>org.opendaylight.yangtools</groupId>\r
+            <artifactId>binding-generator-util</artifactId>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.opendaylight.yangtools</groupId>\r
+            <artifactId>yang-parser-impl</artifactId>\r
+            <version>${yang.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.opendaylight.yangtools</groupId>\r
+            <artifactId>binding-generator-api</artifactId>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.opendaylight.yangtools</groupId>\r
+            <artifactId>binding-generator-spi</artifactId>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>junit</groupId>\r
+            <artifactId>junit</artifactId>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>commons-lang</groupId>\r
+            <artifactId>commons-lang</artifactId>\r
+            <version>2.1</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>com.google.guava</groupId>\r
+            <artifactId>guava</artifactId>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.eclipse.xtend</groupId>\r
+            <artifactId>org.eclipse.xtend.lib</artifactId>\r
+            <version>2.4.2</version>\r
+        </dependency>\r
+    </dependencies>\r
 \r
     <build>\r
         <plugins>\r
+            <plugin>\r
+                <artifactId>maven-jar-plugin</artifactId>\r
+            </plugin>\r
             <plugin>\r
                 <groupId>org.apache.felix</groupId>\r
                 <artifactId>maven-bundle-plugin</artifactId>\r
-                <version>${maven.bundle.version}</version>\r
                 <extensions>true</extensions>\r
                 <configuration>\r
                     <instructions>\r
@@ -60,42 +99,4 @@
         </plugins>\r
     </build>\r
 \r
-    <dependencies>\r
-        <dependency>\r
-            <groupId>org.opendaylight.yangtools</groupId>\r
-            <artifactId>binding-generator-util</artifactId>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.opendaylight.yangtools</groupId>\r
-            <artifactId>yang-parser-impl</artifactId>\r
-            <version>${yang.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.opendaylight.yangtools</groupId>\r
-            <artifactId>binding-generator-api</artifactId>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.opendaylight.yangtools</groupId>\r
-            <artifactId>binding-generator-spi</artifactId>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>junit</groupId>\r
-            <artifactId>junit</artifactId>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>commons-lang</groupId>\r
-            <artifactId>commons-lang</artifactId>\r
-            <version>2.1</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>com.google.guava</groupId>\r
-            <artifactId>guava</artifactId>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.eclipse.xtend</groupId>\r
-            <artifactId>org.eclipse.xtend.lib</artifactId>\r
-            <version>2.4.2</version>\r
-        </dependency>\r
-    </dependencies>\r
-\r
 </project>\r

diff --git a/code-generator/binding-generator-spi/pom.xml b/code-generator/binding-generator-spi/pom.xml
index d1954c70008dc55ff0f2d0ba4700c115eab79e8d..d627171b70e321e222922e1bce0899daccddd576 100644 (file)
--- a/code-generator/binding-generator-spi/pom.xml
+++ b/code-generator/binding-generator-spi/pom.xml
@@ -9,7 +9,6 @@
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <artifactId>binding-generator-spi</artifactId>\r
-    <packaging>bundle</packaging>\r
 \r
     <dependencies>\r
         <dependency>\r
@@ -24,10 +23,12 @@
 \r
     <build>\r
         <plugins>\r
+            <plugin>\r
+                <artifactId>maven-jar-plugin</artifactId>\r
+            </plugin>\r
             <plugin>\r
                 <groupId>org.apache.felix</groupId>\r
                 <artifactId>maven-bundle-plugin</artifactId>\r
-                <version>${maven.bundle.version}</version>\r
                 <extensions>true</extensions>\r
                 <configuration>\r
                     <instructions>\r

diff --git a/code-generator/binding-generator-util/pom.xml b/code-generator/binding-generator-util/pom.xml
index 0c5b7b7f3352fe6c08dc05578f36fa6e9042ff8c..bbf3f65236f93fb462829fe36ad0430fd0c796eb 100644 (file)
--- a/code-generator/binding-generator-util/pom.xml
+++ b/code-generator/binding-generator-util/pom.xml
@@ -9,7 +9,6 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>binding-generator-util</artifactId>
-    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
@@ -29,18 +28,20 @@
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
-               <groupId>org.opendaylight.yangtools</groupId>
-               <artifactId>yang-parser-impl</artifactId>
-               <version>${yang.version}</version>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-parser-impl</artifactId>
+            <version>${yang.version}</version>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>${maven.bundle.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>

diff --git a/code-generator/binding-java-api-generator/pom.xml b/code-generator/binding-java-api-generator/pom.xml
index e7c3e4e23c5b104670ad7ab7bb9482434fb942e9..adb87ebfb3a890581a52a946d5ad4ae9417d3b7f 100644 (file)
--- a/code-generator/binding-java-api-generator/pom.xml
+++ b/code-generator/binding-java-api-generator/pom.xml
@@ -9,14 +9,15 @@
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <artifactId>binding-java-api-generator</artifactId>\r
-    <packaging>bundle</packaging>\r
 \r
     <build>\r
         <plugins>\r
+            <plugin>\r
+                <artifactId>maven-jar-plugin</artifactId>\r
+            </plugin>\r
             <plugin>\r
                 <groupId>org.apache.felix</groupId>\r
                 <artifactId>maven-bundle-plugin</artifactId>\r
-                <version>${maven.bundle.version}</version>\r
                 <extensions>true</extensions>\r
                 <configuration>\r
                     <instructions>\r

diff --git a/code-generator/binding-model-api/pom.xml b/code-generator/binding-model-api/pom.xml
index 6546f7bebc7009bc12a8ed31901446b300249046..9dd14571608a7bceb3e994de5a360eecb5a7d107 100644 (file)
--- a/code-generator/binding-model-api/pom.xml
+++ b/code-generator/binding-model-api/pom.xml
@@ -10,7 +10,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>binding-model-api</artifactId>
     <name>${project.artifactId}</name>
-    <packaging>bundle</packaging>
     <description>${project.artifactId}</description>
 
     <dependencies>
@@ -22,10 +21,12 @@
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>${maven.bundle.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>

diff --git a/code-generator/maven-sal-api-gen-plugin/pom.xml b/code-generator/maven-sal-api-gen-plugin/pom.xml
index e4c07ff1b5fcd965daff2aecfecd482ece6c2a41..6f9ea6d196d6d01aad97c237190cb65b3c2a1547 100644 (file)
--- a/code-generator/maven-sal-api-gen-plugin/pom.xml
+++ b/code-generator/maven-sal-api-gen-plugin/pom.xml
@@ -9,7 +9,6 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>maven-sal-api-gen-plugin</artifactId>
-    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
@@ -36,10 +35,17 @@
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                    </archive>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>${maven.bundle.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>

diff --git a/code-generator/pom.xml b/code-generator/pom.xml
index 93663bdae595b281061d7dc8ab87d6cdb8467a51..be40d774918e1ef1d6f9a7e20a83974b696512f2 100644 (file)
--- a/code-generator/pom.xml
+++ b/code-generator/pom.xml
@@ -13,9 +13,9 @@
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
-    
+
     <properties>
-       <yang.version>0.5.8-SNAPSHOT</yang.version>
+        <yang.version>0.5.8-SNAPSHOT</yang.version>
     </properties>
 
     <modules>
@@ -132,6 +132,57 @@
                 </configuration>
             </plugin>
         </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <configuration>
+                        <archive>
+                            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        </archive>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>${maven.bundle.version}</version>
+                    <extensions>true</extensions>
+                    <executions>
+                        <execution>
+                            <id>bundle-manifest</id>
+                            <phase>process-classes</phase>
+                            <goals>
+                                <goal>manifest</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.apache.felix</groupId>
+                                        <artifactId>maven-bundle-plugin</artifactId>
+                                        <versionRange>[1.0,)</versionRange>
+                                        <goals>
+                                            <goal>manifest</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <execute></execute>
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
 </project>

diff --git a/model/iana/iana-afn-safi/pom.xml b/model/iana/iana-afn-safi/pom.xml
index d99ce33e918be878c223233b6881bb08e91e4020..407af961c6d9f8814d2b3cd532f1492d38141f84 100644 (file)
--- a/model/iana/iana-afn-safi/pom.xml
+++ b/model/iana/iana-afn-safi/pom.xml
@@ -10,5 +10,23 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>iana-afn-safi</artifactId>
     <version>2013.07.04-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-</project>
\ No newline at end of file
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

diff --git a/model/iana/iana-if-type/pom.xml b/model/iana/iana-if-type/pom.xml
index 38c11afdb5ebafd4eb18343a865966b1ed1772a4..29d8921d639d088478cace38a5fba8fcfaa9e7d2 100644 (file)
--- a/model/iana/iana-if-type/pom.xml
+++ b/model/iana/iana-if-type/pom.xml
@@ -10,5 +10,23 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>iana-if-type</artifactId>
     <version>2013.07.04-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-</project>
\ No newline at end of file
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

diff --git a/model/ietf/ietf-inet-types/pom.xml b/model/ietf/ietf-inet-types/pom.xml
index 0305d76ff1dae4d504e6469c210bc60f8fdd364f..d206fdbc28f1947055548d70428368589d64b8f0 100644 (file)
--- a/model/ietf/ietf-inet-types/pom.xml
+++ b/model/ietf/ietf-inet-types/pom.xml
@@ -13,5 +13,22 @@
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 
-    <packaging>bundle</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

diff --git a/model/ietf/ietf-ted/pom.xml b/model/ietf/ietf-ted/pom.xml
index aab3808b01a9d4e9198fb6b7abe40288d2102f09..42f9941ea376091a6a2ce0b2cfe46249b71ce462 100644 (file)
--- a/model/ietf/ietf-ted/pom.xml
+++ b/model/ietf/ietf-ted/pom.xml
@@ -13,9 +13,7 @@
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 
-    <packaging>bundle</packaging>
-
-        <dependencies>
+    <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
@@ -27,4 +25,23 @@
             <version>2010.09.24-SNAPSHOT</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

diff --git a/model/ietf/ietf-topology-isis/pom.xml b/model/ietf/ietf-topology-isis/pom.xml
index 835b8f539495ad9632d2d760798a2b00eec0ea3c..8774e63ef5ca95854e8af1e7bd1d792f63174afd 100644 (file)
--- a/model/ietf/ietf-topology-isis/pom.xml
+++ b/model/ietf/ietf-topology-isis/pom.xml
@@ -13,8 +13,6 @@
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 
-    <packaging>bundle</packaging>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
@@ -28,5 +26,22 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

diff --git a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml
index ca298f39e4b14579c37d4586a6cf566baf00a8a7..eac5382eac071ff612eb6abe5df02e9fa6f961d6 100644 (file)
--- a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml
+++ b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml
@@ -13,8 +13,6 @@
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 
-    <packaging>bundle</packaging>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
@@ -22,4 +20,23 @@
             <version>2013.07.12-SNAPSHOT</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

diff --git a/model/ietf/ietf-topology-ospf/pom.xml b/model/ietf/ietf-topology-ospf/pom.xml
index c21599332cb3136cdd8d86f46c796804e5cd6bb0..b81ffe19fe98b1ebc631ceb2081976f6ffd752f0 100644 (file)
--- a/model/ietf/ietf-topology-ospf/pom.xml
+++ b/model/ietf/ietf-topology-ospf/pom.xml
@@ -13,8 +13,6 @@
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 
-    <packaging>bundle</packaging>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
@@ -28,4 +26,22 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

diff --git a/model/ietf/ietf-topology/pom.xml b/model/ietf/ietf-topology/pom.xml
index 8de7d741b93070e95f4dfa9ed0902fb64f6d7097..38f6f02c82d2f6d6cd4e043d0717a97556284e09 100644 (file)
--- a/model/ietf/ietf-topology/pom.xml
+++ b/model/ietf/ietf-topology/pom.xml
@@ -13,8 +13,6 @@
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 
-    <packaging>bundle</packaging>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
@@ -27,4 +25,23 @@
             <version>2010.09.24-SNAPSHOT</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

diff --git a/model/ietf/ietf-yang-types/pom.xml b/model/ietf/ietf-yang-types/pom.xml
index f163743895721cfa8347db34abe9840b5d99febb..7e5656b047f057ff949482bd5e2042720f34381e 100644 (file)
--- a/model/ietf/ietf-yang-types/pom.xml
+++ b/model/ietf/ietf-yang-types/pom.xml
@@ -13,5 +13,22 @@
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 
-    <packaging>bundle</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

diff --git a/model/l2-types/pom.xml b/model/l2-types/pom.xml
index f34e9f27c4406a462e48321b6ecdc2d8f83d1d31..d0e65fbe7eeae5df607cf2aba6f69490cc87dd87 100644 (file)
--- a/model/l2-types/pom.xml
+++ b/model/l2-types/pom.xml
@@ -10,5 +10,23 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>opendaylight-l2-types</artifactId>
     <version>2013.08.27-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-</project>
\ No newline at end of file
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

diff --git a/model/pom.xml b/model/pom.xml
index 5f2b31cd130f4c9fcdfcc1809068aa47f56a8719..192c18efa3a6953d62f15958b1dfcd4d77c6ecd7 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -18,7 +18,6 @@
     <properties>
         <yang.version>0.5.8-SNAPSHOT</yang.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.bundle.version>2.4.0</maven.bundle.version>
     </properties>
 
     <modules>
@@ -30,17 +29,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>${maven.bundle.version}</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                    </instructions>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
@@ -96,6 +84,29 @@
         </plugins>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <configuration>
+                        <archive>
+                            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        </archive>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>${maven.bundle.version}</version>
+                    <extensions>true</extensions>
+                    <executions>
+                        <execution>
+                            <id>bundle-manifest</id>
+                            <phase>process-classes</phase>
+                            <goals>
+                                <goal>manifest</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
                 <!--This plugin's configuration is used to store Eclipse 
                     m2e settings only. It has no influence on the Maven build itself. -->
                 <plugin>
@@ -107,15 +118,9 @@
                             <pluginExecutions>
                                 <pluginExecution>
                                     <pluginExecutionFilter>
-                                        <groupId>
-                                            org.opendaylight.yangtools
-                                        </groupId>
-                                        <artifactId>
-                                            yang-maven-plugin
-                                        </artifactId>
-                                        <versionRange>
-                                            [0.5,)
-                                        </versionRange>
+                                        <groupId>org.opendaylight.yangtools</groupId>
+                                        <artifactId>yang-maven-plugin</artifactId>
+                                        <versionRange>[0.5,)</versionRange>
                                         <goals>
                                             <goal>
                                                 generate-sources
@@ -126,6 +131,19 @@
                                         <ignore></ignore>
                                     </action>
                                 </pluginExecution>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.apache.felix</groupId>
+                                        <artifactId>maven-bundle-plugin</artifactId>
+                                        <versionRange>[1.0,)</versionRange>
+                                        <goals>
+                                            <goal>manifest</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <execute></execute>
+                                    </action>
+                                </pluginExecution>
                             </pluginExecutions>
                         </lifecycleMappingMetadata>
                     </configuration>

diff --git a/yang/yang-binding/pom.xml b/yang/yang-binding/pom.xml
index df120f5fb360e47102592c27ce7ba6b53d6c80fe..fed740112fde82567645b22447bc48e6300ccf52 100644 (file)
--- a/yang/yang-binding/pom.xml
+++ b/yang/yang-binding/pom.xml
@@ -1,32 +1,38 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
 \r
-       <parent>\r
-               <groupId>org.opendaylight.yangtools</groupId>\r
-               <artifactId>yang</artifactId>\r
-               <version>0.5.8-SNAPSHOT</version>\r
-       </parent>\r
-       <packaging>bundle</packaging>\r
-       <modelVersion>4.0.0</modelVersion>\r
-       <artifactId>yang-binding</artifactId>\r
-       <name>${project.artifactId}</name>\r
-       <description>Java binding for YANG</description>\r
+    <parent>\r
+        <groupId>org.opendaylight.yangtools</groupId>\r
+        <artifactId>yang</artifactId>\r
+        <version>0.5.8-SNAPSHOT</version>\r
+    </parent>\r
 \r
+    <modelVersion>4.0.0</modelVersion>\r
+    <artifactId>yang-binding</artifactId>\r
+    <name>${project.artifactId}</name>\r
+    <description>Java binding for YANG</description>\r
+\r
+    <build>\r
+        <plugins>\r
+            <plugin>\r
+                <artifactId>maven-jar-plugin</artifactId>\r
+                <configuration>\r
+                    <archive>\r
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>\r
+                    </archive>\r
+                </configuration>\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>org.apache.felix</groupId>\r
+                <artifactId>maven-bundle-plugin</artifactId>\r
+                <extensions>true</extensions>\r
+                <configuration>\r
+                    <instructions>\r
+                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
+                    </instructions>\r
+                </configuration>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
 \r
-       <build>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.apache.felix</groupId>\r
-                               <artifactId>maven-bundle-plugin</artifactId>\r
-                               <version>${maven.bundle.version}</version>\r
-                               <extensions>true</extensions>\r
-                               <configuration>\r
-                                       <instructions>\r
-                                               <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
-                                       </instructions>\r
-                                       <manifestLocation>${project.basedir}/META-INF</manifestLocation>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
 </project>\r