commit 2ab8e42b7a01ace35c5c229572c2257e36a1ede7
author tom <tom@onlab.us> Tue Aug 26 15:10:01 2014 -0700
committer tom <tom@onlab.us> Tue Aug 26 15:10:01 2014 -0700
tree 913ee7336693bbeeeeefb5cd445b78fe5ac954da
parent d0fe246e0fc8ec4321277bac99b5dd110a164533

Fixed onos-of-api bundling to properly subsume the openflow stuff.

of/api/pom.xml

diff --git a/of/api/pom.xml b/of/api/pom.xml
index 7e41d76..8f123e1 100644
--- a/of/api/pom.xml
+++ b/of/api/pom.xml
@@ -22,6 +22,11 @@
             <artifactId>openflowj</artifactId>
             <version>0.3.8-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty</artifactId>
+            <version>3.9.0.Final</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -51,6 +56,18 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.projectfloodlight.openflow.*
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

of/openflowj/pom.xml

diff --git a/of/openflowj/pom.xml b/of/openflowj/pom.xml
index 474672e..bc7563a 100644
--- a/of/openflowj/pom.xml
+++ b/of/openflowj/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>17.0</version>
+            <version>15.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>