Added OSGi metadata to yangtools artifacts. 86/1286/2
authorMartin Vitez <mvitez@cisco.com>
Thu, 19 Sep 2013 09:32:08 +0000 (11:32 +0200)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 24 Sep 2013 14:01:04 +0000 (14:01 +0000)
Signed-off-by: Martin Vitez <mvitez@cisco.com>
18 files changed:
code-generator/binding-generator-api/pom.xml
code-generator/binding-generator-impl/pom.xml
code-generator/binding-generator-spi/pom.xml
code-generator/binding-generator-util/pom.xml
code-generator/binding-java-api-generator/pom.xml
code-generator/binding-model-api/pom.xml
code-generator/maven-sal-api-gen-plugin/pom.xml
yang/yang-binding/pom.xml
yang/yang-common/pom.xml
yang/yang-data-api/pom.xml
yang/yang-data-impl/pom.xml
yang/yang-data-util/pom.xml
yang/yang-ext/pom.xml
yang/yang-maven-plugin-spi/pom.xml
yang/yang-model-api/pom.xml
yang/yang-model-util/pom.xml
yang/yang-parser-api/pom.xml
yang/yang-parser-impl/pom.xml

index 9eaba8792e10016cc258ec098b04ca2e76d4e763..3eb37c916f63591e4ab03643f02bedc1e3edead5 100644 (file)
@@ -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
         </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
index 60f6ff573411c764a10d55c7c48dad9bfdb6f626..d4e2310a0f600334c90d2f37e0fb60d02c200b5f 100644 (file)
@@ -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
index 84bc8f855676a841071c71691c49e6560aec153e..97c578e53a9bcf1224e492ac2bd3d41e9f6bfb9d 100644 (file)
@@ -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
         </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
index d28873ec8e1e14236f4024ff3ff30510fc79637a..e48fe997ad85fe971f9c595352df751b1529f4b8 100644 (file)
@@ -9,6 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>binding-generator-util</artifactId>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
         </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>
index eb56ff18267cb4285a9a15b405cf3188b33f1262..75b02f5b05a0fd4f71c7e99cf8d473cc925e4c9b 100644 (file)
@@ -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
index 5c8dc5ba4ebc3c8fb0d0e2dc29a67594630e7e28..f14df407e00cccfcc6b57992b66b60671ce257e9 100644 (file)
     <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>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-api</artifactId>
                <version>0.5.7-SNAPSHOT</version>               
-       </dependency>
+        </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>
index 88cd1ce491b73f51db0117ccc1ed9934a9535418..1ad1a564dd21a9ac91c1bca37922083a8a056146 100644 (file)
@@ -9,6 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>maven-sal-api-gen-plugin</artifactId>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
         </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>
index 28eb9532241f793836b43c9995d80289f9249278..17eb92b04aca23be8e3b986c8aebb040597e7950 100644 (file)
@@ -6,12 +6,12 @@
                <artifactId>yang</artifactId>\r
                <version>0.5.7-SNAPSHOT</version>\r
        </parent>\r
-       <packaging>bundle</packaging>\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
+    <packaging>bundle</packaging>\r
 \r
        <build>\r
                <plugins>\r
@@ -24,7 +24,6 @@
                                        <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
index 0cbdf56482c354e33e3661f3ba11545fd7582e98..bf72cbd79a6f3276febe8929209119c4f04f9df6 100644 (file)
@@ -32,7 +32,6 @@
                                        <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
index e552e353bf087bc3c316558022b0375b330c3ee9..cefc7193d26f93c4a95b80d910db4cfc4eef0e0a 100644 (file)
@@ -10,6 +10,7 @@
     <modelVersion>4.0.0</modelVersion>\r
     <artifactId>yang-data-api</artifactId>\r
     <name>${project.artifactId}</name>\r
+    <packaging>bundle</packaging>\r
     <description>${project.artifactId}</description>\r
 \r
     <dependencies>\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.yang.data.api\r
+                        </Export-Package>\r
+                    </instructions>\r
+                </configuration>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
+\r
 </project>\r
index afa32728c5253740a6f6a1bf13bd18f84a371a36..5f5d41cc341f2c6e62666e0b9917fd62e498540f 100644 (file)
@@ -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
 \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
index d0bc4f601749a36cd194e1dcb8b697fbea226695..e984d0c8a0f1fc4751183963d696361a69c7738c 100644 (file)
@@ -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
         </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
index 47bf7802a267577efb5df6eb1b2f26079954f129..431c444eda3afb22d603ed6ae6edcec36d80f45a 100644 (file)
@@ -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
index 977dadc06c85b98e0ab93c63c0de4be2adabb57b..c2348292559a2c16fd19f06209e3b26b6c5627fa 100644 (file)
                     </execution>
                 </executions>
             </plugin>
+            <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.yang2sources.spi
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
index 038b4b5c523624f7314e97dfc33a9741d3417fd1..b3356344608655840d552621dacd027c0df6b235 100644 (file)
@@ -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
         </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
index 799ac6bac8b1d7cd538eeebd7a206d79642bde38..b69777ee8216d104f0fa4f301e771197eadba7a3 100644 (file)
     <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>
         </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>
index 8d294616a908dd9e8207b73fd720eed703678421..e0343dce584c10d030f012605bf18aa218ab9f7d 100644 (file)
@@ -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>
         </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>
index 88ef7280f91b0e49ea18bb41c832f50274f93d97..64e0711bc35e0bd84be5c4ece1c258e03ab145c3 100644 (file)
@@ -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
 \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
                         </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
                     </execution>\r
                 </executions>\r
             </plugin>\r
-            \r
+\r
             <plugin>\r
                 <groupId>org.apache.maven.plugins</groupId>\r
                 <artifactId>maven-javadoc-plugin</artifactId>\r