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
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <artifactId>binding-generator-api</artifactId>\r

+    <packaging>bundle</packaging>\r

 \r
     <dependencies>\r
         <dependency>\r
 \r
     <dependencies>\r
         <dependency>\r


@@ -21,4 +22,23 @@
         </dependency>\r
     </dependencies>\r
 \r
         </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
 </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
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <artifactId>binding-generator-impl</artifactId>\r

+    <packaging>bundle</packaging>\r

 \r
     <build>\r
         <plugins>\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
             <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
             <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
             <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
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <artifactId>binding-generator-spi</artifactId>\r

+    <packaging>bundle</packaging>\r

 \r
     <dependencies>\r
         <dependency>\r
 \r
     <dependencies>\r
         <dependency>\r


@@ -21,4 +22,23 @@
         </dependency>\r
     </dependencies>\r
 \r
         </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
 </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>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>binding-generator-util</artifactId>

+    <packaging>bundle</packaging>

 
     <dependencies>
         <dependency>
 
     <dependencies>
         <dependency>


@@ -34,4 +35,24 @@
         </dependency>
     </dependencies>
 
         </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>
 </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
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <artifactId>binding-java-api-generator</artifactId>\r

+    <packaging>bundle</packaging>\r

 \r
     <build>\r
         <plugins>\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
             <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>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>binding-model-api</artifactId>
     <name>${project.artifactId}</name>

+    <packaging>bundle</packaging>

     <description>${project.artifactId}</description>
 
     <dependencies>
     <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>
     </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>
 </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>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>maven-sal-api-gen-plugin</artifactId>

+    <packaging>bundle</packaging>

 
     <dependencies>
         <dependency>
 
     <dependencies>
         <dependency>


@@ -33,4 +34,23 @@
         </dependency>
     </dependencies>
 
         </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>
 </project>