Converted all artifacts to OSGi jars.
Fixed the split package warnings resulting from inclusion of generated test resources into the production jar by pruning them out prior to packaging.
Change-Id: Ie1669dfbef6198a511c1df38b5771c7a3c647717
diff --git a/compiler/api/pom.xml b/compiler/api/pom.xml
index 66aa777..22e6ed9 100644
--- a/compiler/api/pom.xml
+++ b/compiler/api/pom.xml
@@ -26,14 +26,4 @@
<artifactId>onos-yang-compiler-api</artifactId>
<packaging>bundle</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.2.0</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/compiler/base/datamodel/pom.xml b/compiler/base/datamodel/pom.xml
index 28618a0..adee7c2 100644
--- a/compiler/base/datamodel/pom.xml
+++ b/compiler/base/datamodel/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>onos-yang-compiler-datamodel</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<build>
<plugins>
diff --git a/compiler/base/linker/pom.xml b/compiler/base/linker/pom.xml
index 7cd5222..1e54710 100644
--- a/compiler/base/linker/pom.xml
+++ b/compiler/base/linker/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>onos-yang-compiler-linker</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
diff --git a/compiler/base/parser/pom.xml b/compiler/base/parser/pom.xml
index 4f2ee4f..66b62e3 100644
--- a/compiler/base/parser/pom.xml
+++ b/compiler/base/parser/pom.xml
@@ -26,7 +26,7 @@
<artifactId>onos-yang-compiler-parser</artifactId>
<version>1.12-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
diff --git a/compiler/base/tool/pom.xml b/compiler/base/tool/pom.xml
index e7a5aa0..235bd23 100644
--- a/compiler/base/tool/pom.xml
+++ b/compiler/base/tool/pom.xml
@@ -28,7 +28,7 @@
<artifactId>onos-yang-compiler-tool</artifactId>
<version>1.12-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
diff --git a/compiler/base/translator/pom.xml b/compiler/base/translator/pom.xml
index 907c084..a90ef71 100644
--- a/compiler/base/translator/pom.xml
+++ b/compiler/base/translator/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>onos-yang-compiler-translator</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
diff --git a/compiler/base/utils/pom.xml b/compiler/base/utils/pom.xml
index 7d67558..b75b35e 100644
--- a/compiler/base/utils/pom.xml
+++ b/compiler/base/utils/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>onos-yang-compiler-utils</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
diff --git a/compiler/plugin/buck/pom.xml b/compiler/plugin/buck/pom.xml
index 958a92d..b4942a7 100644
--- a/compiler/plugin/buck/pom.xml
+++ b/compiler/plugin/buck/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>onos-yang-compiler-buck-plugin</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
diff --git a/compiler/plugin/maven/pom.xml b/compiler/plugin/maven/pom.xml
index afc4947..7807b9e 100644
--- a/compiler/plugin/maven/pom.xml
+++ b/compiler/plugin/maven/pom.xml
@@ -139,12 +139,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.4</version>
- <extensions>true</extensions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/model/pom.xml b/model/pom.xml
index 522e686..a1eb884 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -46,15 +46,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.2.0</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/pom.xml b/pom.xml
index 91c9de8..5f2bab7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.4</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
</plugin>
<plugin>
diff --git a/runtime/pom.xml b/runtime/pom.xml
index 661badc..bb90477 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -87,8 +87,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.2.0</version>
- <extensions>true</extensions>
<configuration>
<instructions>
<Export-Package>
diff --git a/serializers/json/pom.xml b/serializers/json/pom.xml
index b73165a..e0df2df 100644
--- a/serializers/json/pom.xml
+++ b/serializers/json/pom.xml
@@ -71,15 +71,4 @@
<version>RELEASE</version>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.2.0</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/serializers/utils/pom.xml b/serializers/utils/pom.xml
index b1866f9..c81ad39 100644
--- a/serializers/utils/pom.xml
+++ b/serializers/utils/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>onos-yang-serializers-utils</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
diff --git a/serializers/xml/pom.xml b/serializers/xml/pom.xml
index 21bc71e..6cecc56 100644
--- a/serializers/xml/pom.xml
+++ b/serializers/xml/pom.xml
@@ -23,7 +23,6 @@
<groupId>org.onosproject</groupId>
<artifactId>onos-yang-serializers</artifactId>
<version>1.12-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>onos-yang-serializers-xml</artifactId>
@@ -75,11 +74,30 @@
</execution>
</executions>
</plugin>
+
+ <!--
+ Cleans up generated test artifacts which get included as a source
+ directory, but which we don't want as part of the bundle.
+ -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.2.0</version>
- <extensions>true</extensions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <delete>
+ <fileset dir="${project.build.outputDirectory}/org/onosproject/yang/gen" includes="**/*"/>
+ </delete>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>