Upgrade ONOS to karaf version 4.2.6
Change-Id: I9d4086378ee42c65e8865bd1172107767bdc028d
diff --git a/tools/package/bin/onos-backup b/tools/package/bin/onos-backup
index 8c2bd56..ed4d1fb 100755
--- a/tools/package/bin/onos-backup
+++ b/tools/package/bin/onos-backup
@@ -5,7 +5,7 @@
ONOS_HOME=${ONOS_HOME:-$(cd $(dirname $0)/.. >/dev/null 2>&1 && pwd)}
ONOS_DEFAULT_ARCHIVE=$(dirname $ONOS_HOME)/onos-data.tar.gz
-ONOS_KARAF=$ONOS_HOME/apache-karaf-4.2.5
+ONOS_KARAF=$ONOS_HOME/apache-karaf-4.2.6
# Fetch the name of the archive or use a default if none is specified
archive=${1:-$ONOS_DEFAULT_ARCHIVE}
diff --git a/tools/package/bin/onos-restore b/tools/package/bin/onos-restore
index df608fa..9ba23f4 100755
--- a/tools/package/bin/onos-restore
+++ b/tools/package/bin/onos-restore
@@ -5,7 +5,7 @@
ONOS_HOME=${ONOS_HOME:-$(cd $(dirname $0)/.. >/dev/null 2>&1 && pwd)}
ONOS_DEFAULT_ARCHIVE=$(dirname $ONOS_HOME)/onos-data.tar.gz
-ONOS_KARAF=$ONOS_HOME/apache-karaf-4.2.5
+ONOS_KARAF=$ONOS_HOME/apache-karaf-4.2.6
# Fetch the name of the archive or use a default if none is specified
archive=${1:-$ONOS_DEFAULT_ARCHIVE}
diff --git a/tools/package/deb/prerm b/tools/package/deb/prerm
index f98e133..ee32a56 100755
--- a/tools/package/deb/prerm
+++ b/tools/package/deb/prerm
@@ -14,7 +14,7 @@
# Clean up onos runtime directories
# TODO don't hardcode karaf version
-rm -rf /opt/onos/apache-karaf-4.2.5/
+rm -rf /opt/onos/apache-karaf-4.2.6/
rm -rf /opt/onos/var/*
rm -rf /opt/onos/config
rm -rf /opt/onos/options
diff --git a/tools/package/etc/org.apache.karaf.features.cfg b/tools/package/etc/org.apache.karaf.features.cfg
index 98b6948..c96ef52 100644
--- a/tools/package/etc/org.apache.karaf.features.cfg
+++ b/tools/package/etc/org.apache.karaf.features.cfg
@@ -20,38 +20,38 @@
#
# Comma separated list of features repositories to register by default
#
-featuresRepositories = \ mvn:org.apache.karaf.features/standard/4.2.5/xml/features, \
+featuresRepositories = \ mvn:org.apache.karaf.features/standard/4.2.6/xml/features, \
mvn:org.onosproject/onos-features/$ONOS_VERSION/xml/features, \
- mvn:org.apache.karaf.features/enterprise/4.2.5/xml/features, \
- mvn:org.apache.karaf.features/spring/4.2.5/xml/features, \
- mvn:org.apache.karaf.features/standard/4.2.5/xml/features, \
- mvn:org.apache.karaf.features/framework/4.2.5/xml/features
+ mvn:org.apache.karaf.features/enterprise/4.2.6/xml/features, \
+ mvn:org.apache.karaf.features/spring/4.2.6/xml/features, \
+ mvn:org.apache.karaf.features/standard/4.2.6/xml/features, \
+ mvn:org.apache.karaf.features/framework/4.2.6/xml/features
#
# Comma separated list of features to install at startup
#
featuresBoot = \
- (instance/4.2.5, \
- package/4.2.5, \
- log/4.2.5, \
- ssh/4.2.5, \
- framework/4.2.5, \
- system/4.2.5, \
- eventadmin/4.2.5, \
- feature/4.2.5, \
- shell/4.2.5, \
- management/4.2.5, \
- service/4.2.5, \
- jaas/4.2.5, \
- deployer/4.2.5, \
- diagnostic/4.2.5, \
+ (instance/4.2.6, \
+ package/4.2.6, \
+ log/4.2.6, \
+ ssh/4.2.6, \
+ framework/4.2.6, \
+ system/4.2.6, \
+ eventadmin/4.2.6, \
+ feature/4.2.6, \
+ shell/4.2.6, \
+ management/4.2.6, \
+ service/4.2.6, \
+ jaas/4.2.6, \
+ deployer/4.2.6, \
+ diagnostic/4.2.6, \
wrap/2.6.1, \
- bundle/4.2.5, \
- config/4.2.5, \
- kar/4.2.5, \
- webconsole/4.2.5, \
- scr/4.2.5, \
- war/4.2.5), \
+ bundle/4.2.6, \
+ config/4.2.6, \
+ kar/4.2.6, \
+ webconsole/4.2.6, \
+ scr/4.2.6, \
+ war/4.2.6), \
(onos-thirdparty-base/$ONOS_VERSION), \
(onos-api/$ONOS_VERSION, \
onos-core/$ONOS_VERSION, \
diff --git a/tools/package/onos-prep-karaf b/tools/package/onos-prep-karaf
index 1fb51a3..c1986b3 100755
--- a/tools/package/onos-prep-karaf
+++ b/tools/package/onos-prep-karaf
@@ -12,7 +12,7 @@
KARAF_PATCHES=$5
SANDBOX=${6:-.}
-KARAF_VERSION="4.2.5"
+KARAF_VERSION="4.2.6"
ONOS_SECURITY_MODE="false"
PREFIX="onos-$ONOS_VERSION"
diff --git a/tools/package/onos_stage.py b/tools/package/onos_stage.py
index 2d9afda..466c016 100755
--- a/tools/package/onos_stage.py
+++ b/tools/package/onos_stage.py
@@ -27,7 +27,7 @@
written_files = set()
now = time.time()
-karaf_version = "4.2.5"
+karaf_version = "4.2.6"
karaf_system = "apache-karaf-" + karaf_version + "/system/"
def addFile(tar, dest, file, file_size):