commit 28e0563a641069df21260b0e647f1b13cad32559
author Brian O'Connor <bocon@onlab.us> Mon Apr 04 17:22:44 2016 -0700
committer Brian O'Connor <bocon@onlab.us> Mon Apr 04 17:22:44 2016 -0700
tree 624767ab3d46913d9e883b5fa38460a683a51eb8
parent 27ea6811d5279d840bcfcdd64d909670d1e8ba91

Updating java pom.xml to generate OSGi-ready bundle

Also, bumping versions for netty and guava, and removing unneeded dependency on logback

Change-Id: Ie56048552deee40a1acbb115a03ade0c87e48153

java_gen/pre-written/pom.xml

diff --git a/java_gen/pre-written/pom.xml b/java_gen/pre-written/pom.xml
index e89779a..a0f5383 100644
--- a/java_gen/pre-written/pom.xml
+++ b/java_gen/pre-written/pom.xml
@@ -11,7 +11,7 @@
     <groupId>org.onosproject</groupId>
     <artifactId>openflowj</artifactId>
     <version>0.9.3.onos-SNAPSHOT</version>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
     <name>OpenFlowJ-Loxi</name>
     <description>OpenFlowJ API supporting OpenFlow versions 1.0 through 1.3.1, generated by LoxiGen</description>
@@ -41,10 +41,12 @@
     </distributionManagement>
 
     <dependencies>
+        <!-- This is only needed for compile-time annotations -->
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>annotations</artifactId>
             <version>3.0.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -61,27 +63,17 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty</artifactId>
-            <version>3.10.4.Final</version>
+            <version>3.10.5.Final</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>18.0</version>
+            <version>19.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.12</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>1.1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.1.3</version>
+            <version>1.7.13</version>
         </dependency>
     </dependencies>
     <build>
@@ -245,6 +237,13 @@
                     </archive>
                 </configuration>
             </plugin>
+            <!-- include OSGi headers in MANIFEST -->
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.0.1</version>
+                <extensions>true</extensions>
+            </plugin>
         </plugins>
         <resources>
             <resource>