commit cf425012c1639ee4700d71cabbcf177d8a983917
author Daniele Moro <daniele@opennetworking.org> Fri Jan 31 16:25:57 2020 -0800
committer Carmelo Cascone <carmelo@opennetworking.org> Fri Feb 07 21:18:17 2020 +0000
tree 3380ffaa5b4bf9d68fc30e6f7586d31b5e2c75cb
parent 6b055d3a22417221f010382dab1aca5c8b8cb31b

Upgrade to Apache Karaf 4.2.8 to support Kafka log appender

This is required for CORD. Karaf 4.2.6 explicitelly prevents loading of
some of the bundles required to support shipping logs via Karaf.

Change-Id: I8ae525e6c8a04c0381c5e3bac39de1a7b85b4446

tools/test/bin/onos-check-bits

diff --git a/tools/test/bin/onos-check-bits b/tools/test/bin/onos-check-bits
index be1b8da..6ce3ec9 100755
--- a/tools/test/bin/onos-check-bits
+++ b/tools/test/bin/onos-check-bits
@@ -32,7 +32,7 @@
   echo "ONOS archive does not contain the proper version file" && exit 1
 fi
 
-tar tzf ${ONOS_TAR} | grep -q apache-karaf-4.2.6
+tar tzf ${ONOS_TAR} | grep -q apache-karaf-4.2.8
 if [ $? -ne 0 ]; then
   echo "ONOS archive does not contain karaf" && exit 1
 fi

tools/test/bin/onos-check-logs

diff --git a/tools/test/bin/onos-check-logs b/tools/test/bin/onos-check-logs
index 47df150..266a741 100755
--- a/tools/test/bin/onos-check-logs
+++ b/tools/test/bin/onos-check-logs
@@ -113,6 +113,8 @@
             /at org\.apache\.sshd\.server\.SshServer\.start/ { exclusion = 1; }
             /at org\.apache\.felix\.scr\.impl\.ComponentRegistry\.getComponentHolders/ { exclusion = 1; }
             /at org\.apache\.felix\.framework\.Felix/ { exclusion = 1; }
+            /at org\.apache\.karaf\.util\.tracker\.BaseActivator\.getTrackedService/ { exclusion = 1; }
+
 
         END { exit fail; }
         ' > $aux