Upgrade to apache karaf 4.2.9
Change-Id: Id42b0b0893ee81cb54a50bf6c76da024a9a2d2a8
diff --git a/tools/package/bin/onos-backup b/tools/package/bin/onos-backup
index 65e55d4..6a1af04 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.8
+ONOS_KARAF=$ONOS_HOME/apache-karaf-4.2.9
# 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 3b1f8bf..7900327 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.8
+ONOS_KARAF=$ONOS_HOME/apache-karaf-4.2.9
# 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 7c7106e..c688faa 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.8/
+rm -rf /opt/onos/apache-karaf-4.2.9/
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 129b893..8a67b3b 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.8</karaf.version>
+ <karaf.version>4.2.9</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 fb91f56..863bdc5 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.8/xml/features, \
+featuresRepositories = \ mvn:org.apache.karaf.features/standard/4.2.9/xml/features, \
mvn:org.onosproject/onos-features/$ONOS_VERSION/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
+ mvn:org.apache.karaf.features/enterprise/4.2.9/xml/features, \
+ mvn:org.apache.karaf.features/spring/4.2.9/xml/features, \
+ mvn:org.apache.karaf.features/standard/4.2.9/xml/features, \
+ mvn:org.apache.karaf.features/framework/4.2.9/xml/features
#
# Comma separated list of features to install at startup
#
featuresBoot = \
- (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, \
+ (instance/4.2.9, \
+ package/4.2.9, \
+ log/4.2.9, \
+ ssh/4.2.9, \
+ framework/4.2.9, \
+ system/4.2.9, \
+ eventadmin/4.2.9, \
+ feature/4.2.9, \
+ shell/4.2.9, \
+ management/4.2.9, \
+ service/4.2.9, \
+ jaas/4.2.9, \
+ deployer/4.2.9, \
+ diagnostic/4.2.9, \
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), \
+ bundle/4.2.9, \
+ config/4.2.9, \
+ kar/4.2.9, \
+ webconsole/4.2.9, \
+ scr/4.2.9, \
+ war/4.2.9), \
(onos-thirdparty-base/$ONOS_VERSION), \
(onos-api/$ONOS_VERSION, \
onos-core/$ONOS_VERSION, \
diff --git a/tools/package/etc/startup.properties b/tools/package/etc/startup.properties
index 086936d..996b47b 100644
--- a/tools/package/etc/startup.properties
+++ b/tools/package/etc/startup.properties
@@ -1,20 +1,21 @@
-# Valid for Karaf 4.2.8. If updating Karaf version in ONOS, make sure to
+# Valid for Karaf 4.2.9. If updating Karaf version in ONOS, make sure to
# copy-paste here the content of apache-karaf-*/etc/startup.properties in, and
# update the Kafka and log4j2 additions at the end if needed
# Standard startup.properties file
# Bundles to be started on startup, with startlevel
-mvn\:org.apache.karaf.features/org.apache.karaf.features.extension/4.2.8 = 1
-mvn\:org.apache.karaf.services/org.apache.karaf.services.eventadmin/4.2.8 = 5
+mvn\:org.apache.karaf.features/org.apache.karaf.features.extension/4.2.9 = 1
mvn\:org.ops4j.pax.url/pax-url-aether/2.6.2 = 5
+mvn\:org.apache.karaf.services/org.apache.karaf.services.eventadmin/4.2.9 = 5
mvn\:org.apache.felix/org.apache.felix.metatype/1.2.2 = 5
-mvn\:org.ops4j.pax.logging/pax-logging-api/1.11.4 = 8
+mvn\:org.ops4j.pax.logging/pax-logging-api/1.11.6 = 8
+mvn\:org.ops4j.pax.logging/pax-logging-log4j2/1.11.6 = 8
mvn\:org.fusesource.jansi/jansi/1.18 = 8
-mvn\:org.ops4j.pax.logging/pax-logging-log4j2/1.11.4 = 8
mvn\:org.apache.felix/org.apache.felix.coordinator/1.0.2 = 9
mvn\:org.apache.felix/org.apache.felix.configadmin/1.9.16 = 10
-mvn\:org.apache.felix/org.apache.felix.fileinstall/3.6.4 = 11
-mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.2.8 = 15
+mvn\:org.apache.felix/org.apache.felix.fileinstall/3.6.6 = 11
+mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.2.9 = 15
+
# Added part to enable Kafka log4j2 appender
# N.B.: kafka-clients should have startlevel lower than onos-tools-package-log4j2-extra
diff --git a/tools/package/onos-prep-karaf b/tools/package/onos-prep-karaf
index 5660358..2653e20 100755
--- a/tools/package/onos-prep-karaf
+++ b/tools/package/onos-prep-karaf
@@ -13,7 +13,7 @@
LOG4J2_EXTRA=$6
SANDBOX=${7:-.}
-KARAF_VERSION="4.2.8"
+KARAF_VERSION="4.2.9"
ONOS_SECURITY_MODE="false"
PREFIX="onos-$ONOS_VERSION"
diff --git a/tools/package/onos_stage.py b/tools/package/onos_stage.py
index e11a3fa..9dc1973 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.8"
+karaf_version = "4.2.9"
karaf_system = "apache-karaf-" + karaf_version + "/system/"
def addFile(tar, dest, file, file_size):