Upgrade karaf to version 4.2.14
Change-Id: Ibfa72941a01fb8026513d39f5b3d5f2bb3dcc9d2
diff --git a/tools/package/etc/org.apache.karaf.features.cfg b/tools/package/etc/org.apache.karaf.features.cfg
index 863bdc5..beab9a1 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.9/xml/features, \
+featuresRepositories = \ mvn:org.apache.karaf.features/standard/4.2.14/xml/features, \
mvn:org.onosproject/onos-features/$ONOS_VERSION/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
+ mvn:org.apache.karaf.features/enterprise/4.2.14/xml/features, \
+ mvn:org.apache.karaf.features/spring/4.2.14/xml/features, \
+ mvn:org.apache.karaf.features/standard/4.2.14/xml/features, \
+ mvn:org.apache.karaf.features/framework/4.2.14/xml/features
#
# Comma separated list of features to install at startup
#
featuresBoot = \
- (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.9, \
- config/4.2.9, \
- kar/4.2.9, \
- webconsole/4.2.9, \
- scr/4.2.9, \
- war/4.2.9), \
+ (instance/4.2.14, \
+ package/4.2.14, \
+ log/4.2.14, \
+ ssh/4.2.14, \
+ framework/4.2.14, \
+ system/4.2.14, \
+ eventadmin/4.2.14, \
+ feature/4.2.14, \
+ shell/4.2.14, \
+ management/4.2.14, \
+ service/4.2.14, \
+ jaas/4.2.14, \
+ deployer/4.2.14, \
+ diagnostic/4.2.14, \
+ wrap/2.6.7, \
+ bundle/4.2.14, \
+ config/4.2.14, \
+ kar/4.2.14, \
+ webconsole/4.2.14, \
+ scr/4.2.14, \
+ war/4.2.14), \
(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 996b47b..ddcfcbf 100644
--- a/tools/package/etc/startup.properties
+++ b/tools/package/etc/startup.properties
@@ -1,21 +1,17 @@
-# 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.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.6 = 8
-mvn\:org.ops4j.pax.logging/pax-logging-log4j2/1.11.6 = 8
+mvn\:org.apache.karaf.features/org.apache.karaf.features.extension/4.2.14 = 1
+mvn\:org.apache.karaf.services/org.apache.karaf.services.eventadmin/4.2.14 = 5
+mvn\:org.apache.felix/org.apache.felix.metatype/1.2.4 = 5
+mvn\:org.ops4j.pax.url/pax-url-aether/2.6.7 = 5
+mvn\:org.ops4j.pax.logging/pax-logging-log4j2/1.11.12 = 8
+mvn\:org.ops4j.pax.logging/pax-logging-api/1.11.12 = 8
mvn\:org.fusesource.jansi/jansi/1.18 = 8
+mvn\:org.osgi/org.osgi.util.promise/1.1.1 = 9
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.6 = 11
-mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.2.9 = 15
-
+mvn\:org.osgi/org.osgi.util.function/1.1.0 = 9
+mvn\:org.apache.felix/org.apache.felix.configadmin/1.9.22 = 10
+mvn\:org.apache.felix/org.apache.felix.fileinstall/3.7.2 = 11
+mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.2.14 = 15
# Added part to enable Kafka log4j2 appender
# N.B.: kafka-clients should have startlevel lower than onos-tools-package-log4j2-extra