홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
tom
2ab8e42b 1 parent d0fe246e

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

Inline Side-by-side
Showing 2 changed files with 18 additions and 1 deletions
...@@ -22,6 +22,11 @@ ...@@ -22,6 +22,11 @@
22 <artifactId>openflowj</artifactId> 22 <artifactId>openflowj</artifactId>
23 <version>0.3.8-SNAPSHOT</version> 23 <version>0.3.8-SNAPSHOT</version>
24 </dependency> 24 </dependency>
25 + <dependency>
26 + <groupId>io.netty</groupId>
27 + <artifactId>netty</artifactId>
28 + <version>3.9.0.Final</version>
29 + </dependency>
25 </dependencies> 30 </dependencies>
26 31
27 <build> 32 <build>
...@@ -51,6 +56,18 @@ ...@@ -51,6 +56,18 @@
51 </execution> 56 </execution>
52 </executions> 57 </executions>
53 </plugin> 58 </plugin>
59 +
60 + <plugin>
61 + <groupId>org.apache.felix</groupId>
62 + <artifactId>maven-bundle-plugin</artifactId>
63 + <configuration>
64 + <instructions>
65 + <Export-Package>
66 + org.projectfloodlight.openflow.*
67 + </Export-Package>
68 + </instructions>
69 + </configuration>
70 + </plugin>
54 </plugins> 71 </plugins>
55 </build> 72 </build>
56 73
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
59 <dependency> 59 <dependency>
60 <groupId>com.google.guava</groupId> 60 <groupId>com.google.guava</groupId>
61 <artifactId>guava</artifactId> 61 <artifactId>guava</artifactId>
62 - <version>17.0</version> 62 + <version>15.0</version>
63 </dependency> 63 </dependency>
64 <dependency> 64 <dependency>
65 <groupId>org.slf4j</groupId> 65 <groupId>org.slf4j</groupId>
......