Bump up BND to version 4.0.0 in preparation for Java 10
Change-Id: Ieb4b718d6e0077c3b620afe0d8ec50a5901f868f
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(
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;