Upgrade to apache karaf 4.2.9
Change-Id: Id42b0b0893ee81cb54a50bf6c76da024a9a2d2a8
diff --git a/deps/deps.json b/deps/deps.json
index a947571..67b4b99 100644
--- a/deps/deps.json
+++ b/deps/deps.json
@@ -251,13 +251,14 @@
"org.osgi.service.metatype.annotations": "mvn:org.osgi:org.osgi.service.metatype.annotations:1.4.0",
"org.osgi.service.cm": "mvn:org.osgi:org.osgi.service.cm:1.6.0",
"org.apache.felix.scr.bnd": "mvn:org.apache.felix:org.apache.felix.scr.bnd:1.9.0",
- "org.apache.karaf.features.core": "mvn:org.apache.karaf.features:org.apache.karaf.features.core:4.2.8",
- "org.apache.karaf.shell.console": "mvn:org.apache.karaf.shell:org.apache.karaf.shell.console:4.2.8",
- "org.apache.karaf.shell.core": "mvn:org.apache.karaf.shell:org.apache.karaf.shell.core:4.2.8",
+ "org.apache.karaf.bundle.core": "mvn:org.apache.karaf.bundle:org.apache.karaf.bundle.core:4.2.9",
+ "org.apache.karaf.features.core": "mvn:org.apache.karaf.features:org.apache.karaf.features.core:4.2.9",
+ "org.apache.karaf.shell.console": "mvn:org.apache.karaf.shell:org.apache.karaf.shell.console:4.2.9",
+ "org.apache.karaf.shell.core": "mvn:org.apache.karaf.shell:org.apache.karaf.shell.core:4.2.9",
"org.apache.httpcomponents.httpasyncclient-osgi": "mvn:org.apache.httpcomponents:httpasyncclient-osgi:4.1.2",
"org.apache.httpcomponents.httpcore-nio": "mvn:org.apache.httpcomponents:httpcore-nio:4.4.4",
- "org.apache.karaf.jaas": "mvn:org.apache.karaf.jaas:org.apache.karaf.jaas.modules:4.2.8",
- "org.apache.karaf.system.core": "mvn:org.apache.karaf.system:org.apache.karaf.system.core:4.2.8",
+ "org.apache.karaf.jaas": "mvn:org.apache.karaf.jaas:org.apache.karaf.jaas.modules:4.2.9",
+ "org.apache.karaf.system.core": "mvn:org.apache.karaf.system:org.apache.karaf.system.core:4.2.9",
"org.apache.servicemix.bundles.snmp4j": "mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.snmp4j:2.3.4_1",
"org.osgi.cmpn": "mvn:org.osgi:osgi.cmpn:6.0.0",
"osgi-core": "mvn:org.osgi:org.osgi.core:6.0.0",
@@ -274,7 +275,7 @@
"validation-api": "mvn:javax.validation:validation-api:2.0.1.Final",
"checkstyle": "mvn:com.puppycrawl.tools:checkstyle:8.10",
// N.B. WHEN UPDATING KARAF: check the kafka-clients library version. Chain of dependencies: karaf->pax-logging-log4j2->log4j2-core->kafka-clients
- "apache-karaf": "https://repo.maven.apache.org/maven2/org/onosproject/apache-karaf-offline/4.2.8-offline-20200131/apache-karaf-4.2.8-offline-20200131.tar.gz",
+ "apache-karaf": "https://repo1.maven.org/maven2/org/onosproject/apache-karaf-offline/4.2.9-offline-20200706/apache-karaf-4.2.9-offline-20200706.tar.gz",
"bndlib": "mvn:biz.aQute.bnd:biz.aQute.bndlib:jar:4.1.0",
"bndexe": "mvn:biz.aQute.bnd:biz.aQute.bnd:4.1.0",
"libthrift": "mvn:org.apache.thrift:libthrift:0.11.0",
diff --git a/tools/build/bazel/generate_workspace.bzl b/tools/build/bazel/generate_workspace.bzl
index 9579ab7..ec12089 100644
--- a/tools/build/bazel/generate_workspace.bzl
+++ b/tools/build/bazel/generate_workspace.bzl
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Thu, 27 Feb 2020 05:50:58 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Thu, 9 Jul 2020 07:25:03 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
load("//tools/build/bazel:variables.bzl", "ONOS_GROUP_ID", "ONOS_VERSION")
@@ -868,24 +868,30 @@
jar_sha256 = "fee253dd67f87481c1d29f5ba6e6158604f722eac8b35bce868e3693ee00ccac",
licenses = ["notice"],
jar_urls = ["https://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.scr.bnd/1.9.0/org.apache.felix.scr.bnd-1.9.0.jar"], )
+ if "org_apache_karaf_bundle_core" not in native.existing_rules():
+ java_import_external(
+ name = "org_apache_karaf_bundle_core",
+ jar_sha256 = "1b494b5c596e1b5fe81136c69a7b0e3ad8e86134207c46bf4cbb029b5414aaf8",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/org/apache/karaf/bundle/org.apache.karaf.bundle.core/4.2.9/org.apache.karaf.bundle.core-4.2.9.jar"], )
if "org_apache_karaf_features_core" not in native.existing_rules():
java_import_external(
name = "org_apache_karaf_features_core",
- jar_sha256 = "8f0556b7eba43e6de4313a600a179b6d81d42f70dfb4cc187213bf02a1a2589b",
+ jar_sha256 = "0b9baf7a41e95d184f26d59cd923431900699b6bf55e09b883300d43fa97aa18",
licenses = ["notice"],
- jar_urls = ["https://repo1.maven.org/maven2/org/apache/karaf/features/org.apache.karaf.features.core/4.2.8/org.apache.karaf.features.core-4.2.8.jar"], )
+ jar_urls = ["https://repo1.maven.org/maven2/org/apache/karaf/features/org.apache.karaf.features.core/4.2.9/org.apache.karaf.features.core-4.2.9.jar"], )
if "org_apache_karaf_shell_console" not in native.existing_rules():
java_import_external(
name = "org_apache_karaf_shell_console",
- jar_sha256 = "c11d754be2b67255568b62414e35fedd2a15ba2ee50cd749804521cdd0e771e5",
+ jar_sha256 = "8bb60748f6bf6498b8f2c13cf96919e6f8c361af97d9a373eade474841e85196",
licenses = ["notice"],
- jar_urls = ["https://repo1.maven.org/maven2/org/apache/karaf/shell/org.apache.karaf.shell.console/4.2.8/org.apache.karaf.shell.console-4.2.8.jar"], )
+ jar_urls = ["https://repo1.maven.org/maven2/org/apache/karaf/shell/org.apache.karaf.shell.console/4.2.9/org.apache.karaf.shell.console-4.2.9.jar"], )
if "org_apache_karaf_shell_core" not in native.existing_rules():
java_import_external(
name = "org_apache_karaf_shell_core",
- jar_sha256 = "f0232a99f22390a8dd95fa6c346d7c1cb9b7d765ade0e491b8a2864cafb29e19",
+ jar_sha256 = "2b39bfcc5972271f697894364d7937a72317962248b6a6734614f656cb840459",
licenses = ["notice"],
- jar_urls = ["https://repo1.maven.org/maven2/org/apache/karaf/shell/org.apache.karaf.shell.core/4.2.8/org.apache.karaf.shell.core-4.2.8.jar"], )
+ jar_urls = ["https://repo1.maven.org/maven2/org/apache/karaf/shell/org.apache.karaf.shell.core/4.2.9/org.apache.karaf.shell.core-4.2.9.jar"], )
if "org_apache_httpcomponents_httpasyncclient_osgi" not in native.existing_rules():
java_import_external(
name = "org_apache_httpcomponents_httpasyncclient_osgi",
@@ -901,15 +907,15 @@
if "org_apache_karaf_jaas" not in native.existing_rules():
java_import_external(
name = "org_apache_karaf_jaas",
- jar_sha256 = "8c9ef8d7a73c7082208e283e8ec5f523aaf5fd335751d3158dae1d360d635930",
+ jar_sha256 = "a24b744898d9d1bafcd0c094270652896d1e4e4ebaacb35b638dd46b93e5c600",
licenses = ["notice"],
- jar_urls = ["https://repo1.maven.org/maven2/org/apache/karaf/jaas/org.apache.karaf.jaas.modules/4.2.8/org.apache.karaf.jaas.modules-4.2.8.jar"], )
+ jar_urls = ["https://repo1.maven.org/maven2/org/apache/karaf/jaas/org.apache.karaf.jaas.modules/4.2.9/org.apache.karaf.jaas.modules-4.2.9.jar"], )
if "org_apache_karaf_system_core" not in native.existing_rules():
java_import_external(
name = "org_apache_karaf_system_core",
- jar_sha256 = "042e3334dc85f141c592a23ee1822b9473bb0b1640ae69e4fcdd6a42aa810a3e",
+ jar_sha256 = "34d1f8057b7d2226cbd1a5219454d038c1799995e9ac9626baa35e284ddfa238",
licenses = ["notice"],
- jar_urls = ["https://repo1.maven.org/maven2/org/apache/karaf/system/org.apache.karaf.system.core/4.2.8/org.apache.karaf.system.core-4.2.8.jar"], )
+ jar_urls = ["https://repo1.maven.org/maven2/org/apache/karaf/system/org.apache.karaf.system.core/4.2.9/org.apache.karaf.system.core-4.2.9.jar"], )
if "org_apache_servicemix_bundles_snmp4j" not in native.existing_rules():
java_import_external(
name = "org_apache_servicemix_bundles_snmp4j",
@@ -1003,9 +1009,9 @@
if "apache_karaf" not in native.existing_rules():
java_import_external(
name = "apache_karaf",
- jar_sha256 = "9e90c037a16d1736e0c49052758a1a2a1b862b4627362c2f3a6df0335554aefd",
+ jar_sha256 = "ad1c15da75d9112537df09bef1e9fcadb11446619f38a22105592a9273061bf4",
licenses = ["notice"],
- jar_urls = ["https://repo.maven.apache.org/maven2/org/onosproject/apache-karaf-offline/4.2.8-offline-20200131/apache-karaf-4.2.8-offline-20200131.tar.gz"], )
+ jar_urls = ["https://repo1.maven.org/maven2/org/onosproject/apache-karaf-offline/4.2.9-offline-20200706/apache-karaf-4.2.9-offline-20200706.tar.gz"], )
if "bndlib" not in native.existing_rules():
java_import_external(
name = "bndlib",
@@ -1461,13 +1467,14 @@
artifact_map["@org_osgi_service_metatype_annotations//:org_osgi_service_metatype_annotations"] = "mvn:org.osgi:org.osgi.service.metatype.annotations:jar:1.4.0"
artifact_map["@org_osgi_service_cm//:org_osgi_service_cm"] = "mvn:org.osgi:org.osgi.service.cm:jar:1.6.0"
artifact_map["@org_apache_felix_scr_bnd//:org_apache_felix_scr_bnd"] = "mvn:org.apache.felix:org.apache.felix.scr.bnd:jar:NON-OSGI:1.9.0"
-artifact_map["@org_apache_karaf_features_core//:org_apache_karaf_features_core"] = "mvn:org.apache.karaf.features:org.apache.karaf.features.core:jar:4.2.8"
-artifact_map["@org_apache_karaf_shell_console//:org_apache_karaf_shell_console"] = "mvn:org.apache.karaf.shell:org.apache.karaf.shell.console:jar:4.2.8"
-artifact_map["@org_apache_karaf_shell_core//:org_apache_karaf_shell_core"] = "mvn:org.apache.karaf.shell:org.apache.karaf.shell.core:jar:4.2.8"
+artifact_map["@org_apache_karaf_bundle_core//:org_apache_karaf_bundle_core"] = "mvn:org.apache.karaf.bundle:org.apache.karaf.bundle.core:jar:4.2.9"
+artifact_map["@org_apache_karaf_features_core//:org_apache_karaf_features_core"] = "mvn:org.apache.karaf.features:org.apache.karaf.features.core:jar:4.2.9"
+artifact_map["@org_apache_karaf_shell_console//:org_apache_karaf_shell_console"] = "mvn:org.apache.karaf.shell:org.apache.karaf.shell.console:jar:4.2.9"
+artifact_map["@org_apache_karaf_shell_core//:org_apache_karaf_shell_core"] = "mvn:org.apache.karaf.shell:org.apache.karaf.shell.core:jar:4.2.9"
artifact_map["@org_apache_httpcomponents_httpasyncclient_osgi//:org_apache_httpcomponents_httpasyncclient_osgi"] = "mvn:org.apache.httpcomponents:httpasyncclient-osgi:jar:4.1.2"
artifact_map["@org_apache_httpcomponents_httpcore_nio//:org_apache_httpcomponents_httpcore_nio"] = "mvn:org.apache.httpcomponents:httpcore-nio:jar:NON-OSGI:4.4.4"
-artifact_map["@org_apache_karaf_jaas//:org_apache_karaf_jaas"] = "mvn:org.apache.karaf.jaas:org.apache.karaf.jaas.modules:jar:4.2.8"
-artifact_map["@org_apache_karaf_system_core//:org_apache_karaf_system_core"] = "mvn:org.apache.karaf.system:org.apache.karaf.system.core:jar:4.2.8"
+artifact_map["@org_apache_karaf_jaas//:org_apache_karaf_jaas"] = "mvn:org.apache.karaf.jaas:org.apache.karaf.jaas.modules:jar:4.2.9"
+artifact_map["@org_apache_karaf_system_core//:org_apache_karaf_system_core"] = "mvn:org.apache.karaf.system:org.apache.karaf.system.core:jar:4.2.9"
artifact_map["@org_apache_servicemix_bundles_snmp4j//:org_apache_servicemix_bundles_snmp4j"] = "mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.snmp4j:jar:2.3.4_1"
artifact_map["@org_osgi_cmpn//:org_osgi_cmpn"] = "mvn:org.osgi:osgi.cmpn:jar:6.0.0"
artifact_map["@osgi_core//:osgi_core"] = "mvn:org.osgi:org.osgi.core:jar:6.0.0"
@@ -1483,7 +1490,7 @@
artifact_map["@typesafe_config//:typesafe_config"] = "mvn:com.typesafe:config:jar:1.3.2"
artifact_map["@validation_api//:validation_api"] = "mvn:javax.validation:validation-api:jar:2.0.1.Final"
artifact_map["@checkstyle//:checkstyle"] = "mvn:com.puppycrawl.tools:checkstyle:jar:NON-OSGI:8.10"
-artifact_map["@apache_karaf//:apache_karaf"] = "https://repo.maven.apache.org/maven2/org/onosproject/apache-karaf-offline/4.2.8-offline-20200131/apache-karaf-4.2.8-offline-20200131.tar.gz"
+artifact_map["@apache_karaf//:apache_karaf"] = "https://repo1.maven.org/maven2/org/onosproject/apache-karaf-offline/4.2.9-offline-20200706/apache-karaf-4.2.9-offline-20200706.tar.gz"
artifact_map["@bndlib//:bndlib"] = "mvn:biz.aQute.bnd:biz.aQute.bndlib:jar:4.1.0"
artifact_map["@bndexe//:bndexe"] = "mvn:biz.aQute.bnd:biz.aQute.bnd:jar:4.1.0"
artifact_map["@libthrift//:libthrift"] = "mvn:org.apache.thrift:libthrift:jar:0.11.0"
diff --git a/tools/build/bazel/osgi_features.bzl b/tools/build/bazel/osgi_features.bzl
index 90366aa..a156189 100644
--- a/tools/build/bazel/osgi_features.bzl
+++ b/tools/build/bazel/osgi_features.bzl
@@ -102,7 +102,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
name="onos-%s">
- <repository>mvn:org.apache.karaf.features/standard/4.2.8/xml/features</repository>
+ <repository>mvn:org.apache.karaf.features/standard/4.2.9/xml/features</repository>
''' % ONOS_VERSION
FEATURES_FOOTER = "</features>"
diff --git a/tools/build/build-offline-karaf b/tools/build/build-offline-karaf
index 554f532..3563c49 100755
--- a/tools/build/build-offline-karaf
+++ b/tools/build/build-offline-karaf
@@ -1,7 +1,7 @@
#!/bin/bash
-KARAF_RELEASE_VERSION="4.2.8"
-KARAF_BASE_PACKAGE_VERSION="4.2.8"
+KARAF_RELEASE_VERSION="4.2.9"
+KARAF_BASE_PACKAGE_VERSION="4.2.9"
KARAF_TARFILE_NAME="apache-karaf-${KARAF_RELEASE_VERSION}.tar"
ADDED_BOOT_FEATURES="kar/${KARAF_RELEASE_VERSION},webconsole/${KARAF_RELEASE_VERSION},scr/${KARAF_RELEASE_VERSION},war/${KARAF_RELEASE_VERSION}"
diff --git a/tools/build/envDefaults b/tools/build/envDefaults
index 0e80654..bd9cbdb 100644
--- a/tools/build/envDefaults
+++ b/tools/build/envDefaults
@@ -5,7 +5,7 @@
# M2 repository and Karaf gold bits
export M2_REPO=${M2_REPO:-~/.m2/repository}
-export KARAF_VERSION=4.2.8
+export KARAF_VERSION=4.2.9
export KARAF_ZIP=${KARAF_ZIP:-~/Downloads/apache-karaf-$KARAF_VERSION.zip}
export KARAF_TAR=${KARAF_TAR:-~/Downloads/apache-karaf-$KARAF_VERSION.tar.gz}
export KARAF_DIST=$(basename $KARAF_ZIP .zip)
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 01fc9a5..ac1727d 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):
diff --git a/tools/test/bin/onos-check-bits b/tools/test/bin/onos-check-bits
index 6ce3ec9..71f897e 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.8
+tar tzf ${ONOS_TAR} | grep -q apache-karaf-4.2.9
if [ $? -ne 0 ]; then
echo "ONOS archive does not contain karaf" && exit 1
fi