commit 51bee8df4b43b3af694a3e409f989310c7095c3a
author Ray Milkey <ray@opennetworking.org> Mon Sep 10 10:01:35 2018 -0700
committer Thomas Vachuska <tom@opennetworking.org> Tue Sep 11 16:45:21 2018 +0000
tree 873ba18ee7ce5f5126eb97a78c3ae70075d3d5e2
parent 6b1acfcb91bd18797866d47fd6564030e1b724b3

Bump up BND to version 4.0.0 in preparation for Java 10

Change-Id: Ieb4b718d6e0077c3b620afe0d8ec50a5901f868f

utils/osgiwrap/BUILD

diff --git a/utils/osgiwrap/BUILD b/utils/osgiwrap/BUILD
index 9193c04..6175961 100644
--- a/utils/osgiwrap/BUILD
+++ b/utils/osgiwrap/BUILD
@@ -4,6 +4,8 @@
     "@com_google_guava_guava//jar",
     "@bndlib//jar",
     "@org_apache_felix_scr_bnd//jar",
+    "@slf4j_api//jar",
+    "@slf4j_nop//jar",
 ]
 
 java_binary(

utils/osgiwrap/src/main/java/org/onlab/osgiwrap/OSGiWrapper.java

diff --git a/utils/osgiwrap/src/main/java/org/onlab/osgiwrap/OSGiWrapper.java b/utils/osgiwrap/src/main/java/org/onlab/osgiwrap/OSGiWrapper.java
index 8a8d16f..821bf40 100644
--- a/utils/osgiwrap/src/main/java/org/onlab/osgiwrap/OSGiWrapper.java
+++ b/utils/osgiwrap/src/main/java/org/onlab/osgiwrap/OSGiWrapper.java
@@ -383,7 +383,7 @@
         }
     }
 
-    private boolean addFileToJar(Jar jar, String destination, String sourceAbsPath) {
+    private boolean addFileToJar(Jar jar, String destination, String sourceAbsPath) throws IOException {
         if (includedResources.contains(sourceAbsPath)) {
             log("Skipping already included resource: %s\n", sourceAbsPath);
             return false;