Added OSGi metadata to yangtools artifacts.

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 1f5ef17b429f0312959c4f316d6ed5aea2eb0e9f..b61cf961b0b5a62da8f8b073c5a003a5a2452db1 100644 (file)
--- a/code-generator/binding-generator-api/pom.xml
+++ b/code-generator/binding-generator-api/pom.xml
@@ -9,6 +9,7 @@
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <artifactId>binding-generator-api</artifactId>\r
+    <packaging>bundle</packaging>\r
 \r
     <dependencies>\r
         <dependency>\r
@@ -21,4 +22,23 @@
         </dependency>\r
     </dependencies>\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
+                        <Export-Package>\r
+                            org.opendaylight.yangtools.sal.binding.generator.api\r
+                        </Export-Package>\r
+                    </instructions>\r
+                </configuration>\r
+            </plugin>\r
+        </plugins>\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 aa75bd2e284ee883209190a6784308d5f8a8d3c2..c304d839f6ce15b881c4972a18713f95b77dc90d 100644 (file)
--- a/code-generator/binding-generator-impl/pom.xml
+++ b/code-generator/binding-generator-impl/pom.xml
@@ -9,9 +9,25 @@
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <artifactId>binding-generator-impl</artifactId>\r
+    <packaging>bundle</packaging>\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
+                        <Export-Package>\r
+                            org.opendaylight.yangtools.sal.binding.generator.impl,\r
+                            org.opendaylight.yangtools.sal.binding.yang.types\r
+                        </Export-Package>\r
+                    </instructions>\r
+                </configuration>\r
+            </plugin>\r
             <plugin>\r
                 <groupId>org.eclipse.xtend</groupId>\r
                 <artifactId>xtend-maven-plugin</artifactId>\r
@@ -75,7 +91,7 @@
             <groupId>com.google.guava</groupId>\r
             <artifactId>guava</artifactId>\r
         </dependency>\r
-                <dependency>\r
+        <dependency>\r
             <groupId>org.eclipse.xtend</groupId>\r
             <artifactId>org.eclipse.xtend.lib</artifactId>\r
             <version>2.4.2</version>\r

diff --git a/code-generator/binding-generator-spi/pom.xml b/code-generator/binding-generator-spi/pom.xml
index 14677b467d2c30ef65d96ba30361434f412a5d35..d1954c70008dc55ff0f2d0ba4700c115eab79e8d 100644 (file)
--- a/code-generator/binding-generator-spi/pom.xml
+++ b/code-generator/binding-generator-spi/pom.xml
@@ -9,6 +9,7 @@
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <artifactId>binding-generator-spi</artifactId>\r
+    <packaging>bundle</packaging>\r
 \r
     <dependencies>\r
         <dependency>\r
@@ -21,4 +22,23 @@
         </dependency>\r
     </dependencies>\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
+                        <Export-Package>\r
+                            org.opendaylight.yangtools.sal.binding.generator.spi\r
+                        </Export-Package>\r
+                    </instructions>\r
+                </configuration>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
+\r
 </project>\r

diff --git a/code-generator/binding-generator-util/pom.xml b/code-generator/binding-generator-util/pom.xml
index d8b3e20f7848df18e367e4acc614a5fecc59d6bd..0c5b7b7f3352fe6c08dc05578f36fa6e9042ff8c 100644 (file)
--- a/code-generator/binding-generator-util/pom.xml
+++ b/code-generator/binding-generator-util/pom.xml
@@ -9,6 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>binding-generator-util</artifactId>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
@@ -34,4 +35,24 @@
         </dependency>
     </dependencies>
 
+    <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>
+                        <Export-Package>
+                            org.opendaylight.yangtools.binding.generator.util,
+                            org.opendaylight.yangtools.binding.generator.util.generated.type.builder
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

diff --git a/code-generator/binding-java-api-generator/pom.xml b/code-generator/binding-java-api-generator/pom.xml
index 76b9223dbdb6a12adbb79238ede99e2679e2f3b8..e7c3e4e23c5b104670ad7ab7bb9482434fb942e9 100644 (file)
--- a/code-generator/binding-java-api-generator/pom.xml
+++ b/code-generator/binding-java-api-generator/pom.xml
@@ -9,9 +9,24 @@
 \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
+                <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
+                        <Export-Package>\r
+                            org.opendaylight.yangtools.sal.java.api.generator\r
+                        </Export-Package>\r
+                    </instructions>\r
+                </configuration>\r
+            </plugin>\r
             <plugin>\r
                 <groupId>org.eclipse.xtend</groupId>\r
                 <artifactId>xtend-maven-plugin</artifactId>\r

diff --git a/code-generator/binding-model-api/pom.xml b/code-generator/binding-model-api/pom.xml
index 01786ddc540872856ed349cb5030169ca851cad9..6546f7bebc7009bc12a8ed31901446b300249046 100644 (file)
--- a/code-generator/binding-model-api/pom.xml
+++ b/code-generator/binding-model-api/pom.xml
@@ -10,12 +10,34 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>binding-model-api</artifactId>
     <name>${project.artifactId}</name>
+    <packaging>bundle</packaging>
     <description>${project.artifactId}</description>
 
     <dependencies>
-       <dependency>
-               <groupId>org.opendaylight.yangtools</groupId>           
-               <artifactId>yang-model-api</artifactId>
-       </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-api</artifactId>
+        </dependency>
     </dependencies>
+
+    <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>
+                        <Export-Package>
+                            org.opendaylight.yangtools.sal.binding.model.api,
+                            org.opendaylight.yangtools.sal.binding.model.api.type.builder
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

diff --git a/code-generator/maven-sal-api-gen-plugin/pom.xml b/code-generator/maven-sal-api-gen-plugin/pom.xml
index 24e1a6f313ed519f0347a7ee5a241d46e913fd1a..e4c07ff1b5fcd965daff2aecfecd482ece6c2a41 100644 (file)
--- a/code-generator/maven-sal-api-gen-plugin/pom.xml
+++ b/code-generator/maven-sal-api-gen-plugin/pom.xml
@@ -9,6 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>maven-sal-api-gen-plugin</artifactId>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
@@ -33,4 +34,23 @@
         </dependency>
     </dependencies>
 
+    <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>
+                        <Export-Package>
+                            org.opendaylight.yangtools.maven.sal.api.gen.plugin
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml
index c7125cfbef4022c60edede39de564571c5a34f4d..1efb709f0fd7139a84df495dfa23a17495499a59 100644 (file)
--- a/yang/yang-data-impl/pom.xml
+++ b/yang/yang-data-impl/pom.xml
@@ -10,6 +10,7 @@
     <modelVersion>4.0.0</modelVersion>\r
     <artifactId>yang-data-impl</artifactId>\r
     <name>${project.artifactId}</name>\r
+    <packaging>bundle</packaging>\r
     <description>${project.artifactId}</description>\r
 \r
     <properties>\r
@@ -18,6 +19,20 @@
 \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
+                        <Export-Package>\r
+                            org.opendaylight.yangtools.yang.data.impl\r
+                        </Export-Package>\r
+                    </instructions>\r
+                </configuration>\r
+            </plugin>\r
             <plugin>\r
                 <groupId>org.apache.maven.plugins</groupId>\r
                 <artifactId>maven-surefire-plugin</artifactId>\r

diff --git a/yang/yang-data-util/pom.xml b/yang/yang-data-util/pom.xml
index 91d5839b2737aeab87377fcd9144ea892f52dd6c..a3a261c487bd5a88b7f0214b0dec85e176db1755 100644 (file)
--- a/yang/yang-data-util/pom.xml
+++ b/yang/yang-data-util/pom.xml
@@ -10,6 +10,7 @@
     <modelVersion>4.0.0</modelVersion>\r
     <artifactId>yang-data-util</artifactId>\r
     <name>${project.artifactId}</name>\r
+    <packaging>bundle</packaging>\r
     <description>${project.artifactId}</description>\r
 \r
     <dependencies>\r
@@ -19,4 +20,23 @@
         </dependency>\r
     </dependencies>\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
+                        <Export-Package>\r
+                            org.opendaylight.yangtools.yang.data.util\r
+                        </Export-Package>\r
+                    </instructions>\r
+                </configuration>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
+\r
 </project>\r

diff --git a/yang/yang-ext/pom.xml b/yang/yang-ext/pom.xml
index 564b975cf974f48600dacb87583bc11b8b44d75a..3e0e6c4875176749ecf9145ab9ec99f7b22c591e 100644 (file)
--- a/yang/yang-ext/pom.xml
+++ b/yang/yang-ext/pom.xml
@@ -11,6 +11,7 @@
     <artifactId>yang-ext</artifactId>\r
     <version>2013.09.07-SNAPSHOT</version>\r
     <name>${project.artifactId}</name>\r
+    <packaging>bundle</packaging>\r
     <description>${project.artifactId}</description>\r
 \r
     <build>\r

diff --git a/yang/yang-model-api/pom.xml b/yang/yang-model-api/pom.xml
index 60f3d22ce80205c77874d079ddf63451006fd868..fb0dbca582a70c9f078b765ad18abe3f5138309a 100644 (file)
--- a/yang/yang-model-api/pom.xml
+++ b/yang/yang-model-api/pom.xml
@@ -10,6 +10,7 @@
     <modelVersion>4.0.0</modelVersion>\r
     <artifactId>yang-model-api</artifactId>\r
     <name>${project.artifactId}</name>\r
+    <packaging>bundle</packaging>\r
     <description>${project.artifactId}</description>\r
 \r
     <dependencies>\r
@@ -19,4 +20,24 @@
         </dependency>\r
     </dependencies>\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
+                        <Export-Package>\r
+                            org.opendaylight.yangtools.yang.model.api,\r
+                            org.opendaylight.yangtools.yang.model.api.type\r
+                        </Export-Package>\r
+                    </instructions>\r
+                </configuration>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
+\r
 </project>\r

diff --git a/yang/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml
index 1df6557080531c2f8c017321699051f73b5eba61..862e9d040155e40703faf51448198ccc186b8478 100644 (file)
--- a/yang/yang-model-util/pom.xml
+++ b/yang/yang-model-util/pom.xml
@@ -10,11 +10,41 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>yang-model-util</artifactId>
     <name>${project.artifactId}</name>
+    <packaging>bundle</packaging>
     <description>${project.artifactId}</description>
 
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>yang-model-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.xtend</groupId>
+            <artifactId>org.eclipse.xtend.lib</artifactId>
+            <version>2.4.2</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+    </dependencies>
 
     <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>
+                        <Export-Package>
+                            org.opendaylight.yangtools.yang.model.util
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.eclipse.xtend</groupId>
                 <artifactId>xtend-maven-plugin</artifactId>
@@ -47,19 +77,4 @@
         </plugins>
     </build>
 
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>yang-model-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.xtend</groupId>
-            <artifactId>org.eclipse.xtend.lib</artifactId>
-            <version>2.4.2</version>
-        </dependency>
-        <dependency>
-               <groupId>junit</groupId>
-               <artifactId>junit</artifactId>
-        </dependency>
-    </dependencies>
 </project>

diff --git a/yang/yang-parser-api/pom.xml b/yang/yang-parser-api/pom.xml
index 9c0235835142baadde28efb574483e51d610c211..4bfc3b5a64a7b867ff2602de1f1a44d76888cde9 100644 (file)
--- a/yang/yang-parser-api/pom.xml
+++ b/yang/yang-parser-api/pom.xml
@@ -10,6 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>yang-parser-api</artifactId>
     <name>${project.artifactId}</name>
+    <packaging>bundle</packaging>
     <description>YANG parser API</description>
 
     <dependencies>
@@ -19,4 +20,23 @@
         </dependency>
     </dependencies>
 
+    <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>
+                        <Export-Package>
+                            org.opendaylight.yangtools.yang.parser.api
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

diff --git a/yang/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml
index c15ee822549e4879e062fda1ca09c228da10b2de..13e1408b2a7bf88a282ff2940eec268b6e14c2b1 100644 (file)
--- a/yang/yang-parser-impl/pom.xml
+++ b/yang/yang-parser-impl/pom.xml
@@ -10,6 +10,7 @@
     <modelVersion>4.0.0</modelVersion>\r
     <artifactId>yang-parser-impl</artifactId>\r
     <name>${project.artifactId}</name>\r
+    <packaging>bundle</packaging>\r
     <description>YANG parser</description>\r
 \r
     <dependencies>\r
@@ -64,6 +65,20 @@
 \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
+                        <Export-Package>\r
+                            org.opendaylight.yangtools.yang.parser.impl\r
+                        </Export-Package>\r
+                    </instructions>\r
+                </configuration>\r
+            </plugin>\r
             <plugin>\r
                 <artifactId>maven-clean-plugin</artifactId>\r
                 <version>2.4.1</version>\r
@@ -110,7 +125,8 @@
                         </configuration>\r
                     </execution>\r
                 </executions>\r
-            </plugin><plugin>\r
+            </plugin>\r
+            <plugin>\r
                 <groupId>org.codehaus.mojo</groupId>\r
                 <artifactId>build-helper-maven-plugin</artifactId>\r
                 <version>1.7</version>\r
@@ -128,7 +144,7 @@
                     </execution>\r
                 </executions>\r
             </plugin>\r
-            \r
+\r
             <plugin>\r
                 <groupId>org.apache.maven.plugins</groupId>\r
                 <artifactId>maven-javadoc-plugin</artifactId>\r