commit 5f5db1fbe30ba625332df69cb195f94d729a2e9b
author Ray Milkey <ray@opennetworking.org> Fri Jan 31 16:25:57 2020 -0800
committer Ray Milkey <ray@onlab.us> Wed Feb 05 04:14:53 2020 +0000
tree afa7777a1d0923fd1f2cf1fadb634fbeb4b7a36a
parent 776ce25b3c7bbfbd84a88e4d7ca32d16aae87ace

Upgrade to Apache Karaf 4.2.8

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