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
diff --git a/tools/package/bin/onos-backup b/tools/package/bin/onos-backup
index ed4d1fb..65e55d4 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.6
+ONOS_KARAF=$ONOS_HOME/apache-karaf-4.2.8
# 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 9ba23f4..3b1f8bf 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.6
+ONOS_KARAF=$ONOS_HOME/apache-karaf-4.2.8
# 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 ee32a56..7c7106e 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.6/
+rm -rf /opt/onos/apache-karaf-4.2.8/
rm -rf /opt/onos/var/*
rm -rf /opt/onos/config
rm -rf /opt/onos/options
diff --git a/tools/package/dependencies/template.pom b/tools/package/dependencies/template.pom
index 91ce5de..01fc9a5 100644
--- a/tools/package/dependencies/template.pom
+++ b/tools/package/dependencies/template.pom
@@ -33,7 +33,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <karaf.version>4.2.6</karaf.version>
+ <karaf.version>4.2.8</karaf.version>
<maven.version.min>3.3.9</maven.version.min>
<java.version.min><!-- JAVA_VERSION --></java.version.min>
<onos.version><!-- ONOS_VERSION --></onos.version>
diff --git a/tools/package/etc/org.apache.karaf.features.cfg b/tools/package/etc/org.apache.karaf.features.cfg
index c96ef52..fb91f56 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.6/xml/features, \
+featuresRepositories = \ mvn:org.apache.karaf.features/standard/4.2.8/xml/features, \
mvn:org.onosproject/onos-features/$ONOS_VERSION/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
+ mvn:org.apache.karaf.features/enterprise/4.2.8/xml/features, \
+ mvn:org.apache.karaf.features/spring/4.2.8/xml/features, \
+ mvn:org.apache.karaf.features/standard/4.2.8/xml/features, \
+ mvn:org.apache.karaf.features/framework/4.2.8/xml/features
#
# Comma separated list of features to install at startup
#
featuresBoot = \
- (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.6, \
- config/4.2.6, \
- kar/4.2.6, \
- webconsole/4.2.6, \
- scr/4.2.6, \
- war/4.2.6), \
+ (instance/4.2.8, \
+ package/4.2.8, \
+ log/4.2.8, \
+ ssh/4.2.8, \
+ framework/4.2.8, \
+ system/4.2.8, \
+ eventadmin/4.2.8, \
+ feature/4.2.8, \
+ shell/4.2.8, \
+ management/4.2.8, \
+ service/4.2.8, \
+ jaas/4.2.8, \
+ deployer/4.2.8, \
+ diagnostic/4.2.8, \
+ wrap/2.6.2, \
+ bundle/4.2.8, \
+ config/4.2.8, \
+ kar/4.2.8, \
+ webconsole/4.2.8, \
+ scr/4.2.8, \
+ war/4.2.8), \
(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 c1986b3..315aa13 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.6"
+KARAF_VERSION="4.2.8"
ONOS_SECURITY_MODE="false"
PREFIX="onos-$ONOS_VERSION"
diff --git a/tools/package/onos_stage.py b/tools/package/onos_stage.py
index 466c016..e11a3fa 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.6"
+karaf_version = "4.2.8"
karaf_system = "apache-karaf-" + karaf_version + "/system/"
def addFile(tar, dest, file, file_size):