Patching Apache Karaf with a shell console fix to avoid thread leak.
Change-Id: I27e8fbaf443391a51b40c35639a39a5f38aecf31
diff --git a/lib/BUCK b/lib/BUCK
index 9431c45..7c448a5 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Tue, 3 Apr 2018 17:03:35 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Sat, 21 Apr 2018 05:59:03 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
pass_thru_pom(
@@ -1140,6 +1140,14 @@
visibility = [ 'PUBLIC' ],
)
+remote_file (
+ name = 'apache-karaf-patches',
+ out = 'onos-apache-karaf-patches-3.0.8.tar.gz',
+ url = 'http://repo1.maven.org/maven2/org/onosproject/onos-apache-karaf-patches/3.0.8/onos-apache-karaf-patches-3.0.8.tar.gz',
+ sha1 = 'be5d620a2c4f4c5faa520d2c1b949ad0cc29c84f',
+ visibility = [ 'PUBLIC' ],
+)
+
remote_jar (
name = 'bndlib',
out = 'biz.aQute.bndlib-3.1.0.jar',
diff --git a/lib/deps.json b/lib/deps.json
index ff0fe09..7d8e8d0 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -221,6 +221,7 @@
"validation-api": "mvn:javax.validation:validation-api:1.1.0.Final",
"checkstyle": "mvn:com.puppycrawl.tools:checkstyle:6.19",
"apache-karaf": "http://repo1.maven.org/maven2/org/onosproject/apache-karaf-offline-1.10/3.0.8/apache-karaf-offline-3.0.8.tgz",
+ "apache-karaf-patches": "http://repo1.maven.org/maven2/org/onosproject/onos-apache-karaf-patches/3.0.8/onos-apache-karaf-patches-3.0.8.tar.gz",
"bndlib": "mvn:biz.aQute.bnd:biz.aQute.bndlib:jar:3.1.0",
"bndexe": "http://onlab.vicci.org/onos/third-party/biz.aQute.bnd-3.1.0.jar",
"libthrift": "mvn:org.apache.thrift:libthrift:0.9.3",
diff --git a/tools/package/BUCK b/tools/package/BUCK
index 05fefcb..a317983 100644
--- a/tools/package/BUCK
+++ b/tools/package/BUCK
@@ -1,5 +1,6 @@
KARAF = '//lib:apache-karaf'
BRANDING = '//tools/package/branding:onos-tools-package-branding'
+PATCHES = '//lib:apache-karaf-patches'
FEATURES = [
'//features:onos-thirdparty-base',
@@ -21,8 +22,8 @@
genrule(
name = 'onos-karaf',
srcs = glob(['bin/*', 'etc/*', 'init/*', 'runtime/bin/*']),
- bash = '$(location :onos-prep-karaf) $OUT $(location %s) %s $(location %s)'\
- % (KARAF, ONOS_VERSION, BRANDING),
+ bash = '$(location :onos-prep-karaf) $OUT $(location %s) %s $(location %s) $(location %s)'\
+ % (KARAF, ONOS_VERSION, BRANDING, PATCHES),
out = 'karaf.zip',
)
diff --git a/tools/package/onos-prep-karaf b/tools/package/onos-prep-karaf
index ed89fb2..49488b0 100755
--- a/tools/package/onos-prep-karaf
+++ b/tools/package/onos-prep-karaf
@@ -9,6 +9,7 @@
KARAF_TAR=$2
ONOS_VERSION=$3
BRANDING=$4
+KARAF_PATCHES=$5
#FIXME karaf version
KARAF_VERSION="3.0.8"
ONOS_SECURITY_MODE="false"
@@ -17,6 +18,7 @@
# Unroll the Apache Karaf bits, prune them and make ONOS top-level directories.
tar xf $KARAF_TAR
+tar xf $KARAF_PATCHES
# Unroll the Apache Karaf bits, prune them and make ONOS top-level directories.
KARAF_DIR=$(ls -d apache*)