홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
alshabib
Committed by Gerrit Code Review
e4344332 1 parent 9ca0f9cb

pulled in upstream loxi changes 

Change-Id: I6b8bd5c3f7cd24a5d4f9d5da378bd7f606efdd8e
Inline Side-by-side
Showing 1 changed file with 12 additions and 1 deletions
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
70 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 70 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
71 <netty4.version>4.0.23.Final</netty4.version> 71 <netty4.version>4.0.23.Final</netty4.version>
72 <copycat.version>0.3.0.onos</copycat.version> 72 <copycat.version>0.3.0.onos</copycat.version>
73 - <openflowj.version>0.3.8.oe</openflowj.version> 73 + <openflowj.version>0.3.9.oe</openflowj.version>
74 </properties> 74 </properties>
75 75
76 <distributionManagement> 76 <distributionManagement>
...@@ -454,6 +454,17 @@ ...@@ -454,6 +454,17 @@
454 <artifactId>maven-bundle-plugin</artifactId> 454 <artifactId>maven-bundle-plugin</artifactId>
455 <version>2.5.3</version> 455 <version>2.5.3</version>
456 <extensions>true</extensions> 456 <extensions>true</extensions>
457 + <!--
458 + Drop following dependency when the below bug fix is published
459 + https://issues.apache.org/jira/browse/FELIX-4556
460 + -->
461 + <dependencies>
462 + <dependency>
463 + <groupId>biz.aQute.bnd</groupId>
464 + <artifactId>bndlib</artifactId>
465 + <version>2.4.0</version>
466 + </dependency>
467 + </dependencies>
457 </plugin> 468 </plugin>
458 469
459 <plugin> 470 <plugin>
......