ONOS-1323 Upgrading environment to use Apache Karaf 3.0.3
Requires restart of any dev shell sessions that may have KARAF_VERSION=3.0.2 already set.
Developers that have their own local Karaf will have to run 'onos-setup-karaf <ip-address>' command
Change-Id: Iba234b3cd5af89de6dd249c97cac97525364cc34
diff --git a/tools/dev/bash_profile b/tools/dev/bash_profile
index 057e7d3..2b05f1b 100644
--- a/tools/dev/bash_profile
+++ b/tools/dev/bash_profile
@@ -18,7 +18,7 @@
export MAVEN=${MAVEN:-~/Applications/apache-maven-3.3.1}
-export KARAF_VERSION=${KARAF_VERSION:-3.0.2}
+export KARAF_VERSION=${KARAF_VERSION:-3.0.3}
export KARAF_ROOT=${KARAF_ROOT:-~/Applications/apache-karaf-$KARAF_VERSION}
export KARAF_LOG=$KARAF_ROOT/data/log/karaf.log
diff --git a/tools/dev/bin/onos-local-log b/tools/dev/bin/onos-local-log
index ea93d7f..a17d3b9 100755
--- a/tools/dev/bin/onos-local-log
+++ b/tools/dev/bin/onos-local-log
@@ -2,7 +2,7 @@
# ----------------------------------------------------------------------------
# Continuously watches the Apache Karaf log; survives 'karaf clean'
# ----------------------------------------------------------------------------
-KARAF_LOG=${KARAF_LOG:-~/apache-karaf-3.0.2/data/log/karaf.log}
+KARAF_LOG=${KARAF_LOG:-~/apache-karaf-$KARAF_VERSION/data/log/karaf.log}
while true; do
[ ! -f $KARAF_LOG ] && sleep 2 && continue
diff --git a/tools/dev/onos.cshrc b/tools/dev/onos.cshrc
index 5dc3298..e5d8e62 100644
--- a/tools/dev/onos.cshrc
+++ b/tools/dev/onos.cshrc
@@ -27,7 +27,7 @@
setenv MAVEN $HOME/Applications/apache-maven-3.3.1
endif
if ( ! $?KARAF_VERSION ) then
- setenv KARAF_VERSION 3.0.2
+ setenv KARAF_VERSION 3.0.3
endif
if ( ! $?KARAF_ROOT ) then
setenv KARAF_ROOT $HOME/Applications/apache-karaf-$KARAF_VERSION