mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-17 10:46:14 +02:00
Code Issues Projects Releases Wiki Activity

Updating Apache Karaf to 4.2.2.

Browse Source 
Change-Id: I346f21b8da7583c77e7b0612c7f2931aa63a67e0
This commit is contained in:
Thomas Vachuska 2019-01-02 16:38:37 -08:00 committed by Ray Milkey
parent 8c0c2cfe1e
commit 3770b08157
13 changed files with 59 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/deps.json
View File

@ -267,13 +267,13 @@
"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.1",
"org.apache.karaf.shell.console": "mvn:org.apache.karaf.shell:org.apache.karaf.shell.console:4.2.1",
"org.apache.karaf.shell.core": "mvn:org.apache.karaf.shell:org.apache.karaf.shell.core:4.2.1",
"org.apache.karaf.features.core": "mvn:org.apache.karaf.features:org.apache.karaf.features.core:4.2.2",
"org.apache.karaf.shell.console": "mvn:org.apache.karaf.shell:org.apache.karaf.shell.console:4.2.2",
"org.apache.karaf.shell.core": "mvn:org.apache.karaf.shell:org.apache.karaf.shell.core:4.2.2",
"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.1",
"org.apache.karaf.system.core": "mvn:org.apache.karaf.system:org.apache.karaf.system.core:4.2.1",
"org.apache.karaf.jaas": "mvn:org.apache.karaf.jaas:org.apache.karaf.jaas.modules:4.2.2",
"org.apache.karaf.system.core": "mvn:org.apache.karaf.system:org.apache.karaf.system.core:4.2.2",
"org.apache.servicemix.bundles.snmp4j": "mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.snmp4j:2.3.4_1",
"org.osgi.compendium": "mvn:org.osgi:org.osgi.compendium:5.0.0",
"org.osgi.cmpn": "mvn:org.osgi:osgi.cmpn:7.0.0",

32
tools/build/bazel/generate_workspace.bzl
View File

@ -1,4 +1,4 @@
# ***** This file was auto-generated at Fri, 4 Jan 2019 20:03:34 GMT. Do not edit this file manually. *****
# ***** This file was auto-generated at Fri, 4 Jan 2019 21:19:00 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
load("//tools/build/bazel:variables.bzl", "ONOS_GROUP_ID", "ONOS_VERSION")
@ -870,21 +870,21 @@ def generated_maven_jars():
if "org_apache_karaf_features_core" not in native.existing_rules():
java_import_external(
name = "org_apache_karaf_features_core",
jar_sha256 = "c659659cd095c6c7026d4f99ebbc5fa946f0177f750e33fca0410cf83d657137",
jar_sha256 = "103e6e390ad1bb90557cb7e4ffa78252af2e06c1d5efb197131c620327026079",
licenses = ["notice"],
jar_urls = ["http://repo1.maven.org/maven2/org/apache/karaf/features/org.apache.karaf.features.core/4.2.1/org.apache.karaf.features.core-4.2.1.jar"], )
jar_urls = ["http://repo1.maven.org/maven2/org/apache/karaf/features/org.apache.karaf.features.core/4.2.2/org.apache.karaf.features.core-4.2.2.jar"], )
if "org_apache_karaf_shell_console" not in native.existing_rules():
java_import_external(
name = "org_apache_karaf_shell_console",
jar_sha256 = "c87ef5c61745456ded1b2c7652071c83f45de6f3af95b7e290eebafb10870aa3",
jar_sha256 = "ef7dd8991ec51300be40c0c73cdace8e45ad13f1b9c534ac77e8f4d00a5aee9b",
licenses = ["notice"],
jar_urls = ["http://repo1.maven.org/maven2/org/apache/karaf/shell/org.apache.karaf.shell.console/4.2.1/org.apache.karaf.shell.console-4.2.1.jar"], )
jar_urls = ["http://repo1.maven.org/maven2/org/apache/karaf/shell/org.apache.karaf.shell.console/4.2.2/org.apache.karaf.shell.console-4.2.2.jar"], )
if "org_apache_karaf_shell_core" not in native.existing_rules():
java_import_external(
name = "org_apache_karaf_shell_core",
jar_sha256 = "7da0d63b450c24c221280be764eae9d117f296c1b5a7e10d424ba14c32f733c8",
jar_sha256 = "cef7bebec1db3221321a6d6788bdaefa6a8d06d34755e466163ce17b08f0a139",
licenses = ["notice"],
jar_urls = ["http://repo1.maven.org/maven2/org/apache/karaf/shell/org.apache.karaf.shell.core/4.2.1/org.apache.karaf.shell.core-4.2.1.jar"], )
jar_urls = ["http://repo1.maven.org/maven2/org/apache/karaf/shell/org.apache.karaf.shell.core/4.2.2/org.apache.karaf.shell.core-4.2.2.jar"], )
if "org_apache_httpcomponents_httpasyncclient_osgi" not in native.existing_rules():
java_import_external(
name = "org_apache_httpcomponents_httpasyncclient_osgi",
@ -900,15 +900,15 @@ def generated_maven_jars():
if "org_apache_karaf_jaas" not in native.existing_rules():
java_import_external(
name = "org_apache_karaf_jaas",
jar_sha256 = "86da483352205879822cc014884cf29a54dccc7f9eb19d9c4513b43e1ed7cf25",
jar_sha256 = "0ea8d27ecf8f7a2c167923ceaa015001fa7d27e741f554da49667af838b92c07",
licenses = ["notice"],
jar_urls = ["http://repo1.maven.org/maven2/org/apache/karaf/jaas/org.apache.karaf.jaas.modules/4.2.1/org.apache.karaf.jaas.modules-4.2.1.jar"], )
jar_urls = ["http://repo1.maven.org/maven2/org/apache/karaf/jaas/org.apache.karaf.jaas.modules/4.2.2/org.apache.karaf.jaas.modules-4.2.2.jar"], )
if "org_apache_karaf_system_core" not in native.existing_rules():
java_import_external(
name = "org_apache_karaf_system_core",
jar_sha256 = "13a1eafe91f5fd731f0f691b2a9557b7246d5f39d5cfe1ad0913199295efcefe",
jar_sha256 = "fa840eb87c32114e796f168b1ffe8f41bae990161df054958c9518d1703a2ac1",
licenses = ["notice"],
jar_urls = ["http://repo1.maven.org/maven2/org/apache/karaf/system/org.apache.karaf.system.core/4.2.1/org.apache.karaf.system.core-4.2.1.jar"], )
jar_urls = ["http://repo1.maven.org/maven2/org/apache/karaf/system/org.apache.karaf.system.core/4.2.2/org.apache.karaf.system.core-4.2.2.jar"], )
if "org_apache_servicemix_bundles_snmp4j" not in native.existing_rules():
java_import_external(
name = "org_apache_servicemix_bundles_snmp4j",
@ -1535,13 +1535,13 @@ artifact_map["@org_osgi_service_component_annotations//:org_osgi_service_compone
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.1"
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.1"
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.1"
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.2"
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.2"
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.2"
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.1"
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.1"
artifact_map["@org_apache_karaf_jaas//:org_apache_karaf_jaas"] = "mvn:org.apache.karaf.jaas:org.apache.karaf.jaas.modules:jar:4.2.2"
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.2"
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_compendium//:org_osgi_compendium"] = "mvn:org.osgi:org.osgi.compendium:jar:5.0.0"
artifact_map["@org_osgi_cmpn//:org_osgi_cmpn"] = "mvn:org.osgi:osgi.cmpn:jar:7.0.0"

2
tools/build/bazel/osgi_features.bzl
View File

@ -102,7 +102,7 @@ FEATURES_HEADER = '''\
<?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.1/xml/features</repository>
<repository>mvn:org.apache.karaf.features/standard/4.2.2/xml/features</repository>
''' % ONOS_VERSION
FEATURES_FOOTER = "</features>"

4
tools/build/build-offline-karaf
View File

@ -1,7 +1,7 @@
#!/bin/bash
KARAF_VERSION="4.2.1"
KARAF_BASE_PACKAGE_VERSION="4.2.1-20181024"
KARAF_VERSION="4.2.2"
KARAF_BASE_PACKAGE_VERSION="4.2.2"
KARAF_TARFILE_NAME="apache-karaf-${KARAF_VERSION}.tar"
ADDED_BOOT_FEATURES="kar/${KARAF_VERSION},webconsole/${KARAF_VERSION},scr/${KARAF_VERSION},war/${KARAF_VERSION}"

2
tools/build/envDefaults
View File

@ -5,7 +5,7 @@ export ONOS_ROOT=${ONOS_ROOT:-~/onos}
# M2 repository and Karaf gold bits
export M2_REPO=${M2_REPO:-~/.m2/repository}
export KARAF_VERSION=4.2.1
export KARAF_VERSION=4.2.2
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)

8
tools/dev/bash_profile
View File

@ -22,17 +22,13 @@ fi
export MAVEN=${MAVEN:-~/Applications/apache-maven-3.3.9}
export KARAF_VERSION=4.2.1
export KARAF_ROOT=${KARAF_ROOT:-~/Applications/apache-karaf-$KARAF_VERSION}
export KARAF_LOG=$KARAF_ROOT/data/log/karaf.log
# Setup a path
export PATH="$PATH:$ONOS_ROOT/tools/dev/bin"
export PATH="$PATH:$ONOS_ROOT/tools/test/bin:$ONOS_ROOT/tools/test/scenarios/bin"
export RUN_PACK_PATH=${RUN_PACK_PATH:-$ONOS_ROOT/tools/package/runtime/bin}
export PATH="$RUN_PACK_PATH:$PATH"
export PATH="$PATH:$ONOS_ROOT/tools/build"
export PATH="$PATH:$MAVEN/bin:$KARAF_ROOT/bin"
export PATH="$PATH:$MAVEN/bin"
# Setup cell enviroment
export ONOS_CELL=${ONOS_CELL:-local}
@ -74,7 +70,7 @@ alias oi='setPrimaryInstance'
# Short-hand for tailing and searching the ONOS (karaf) log
alias tl='$ONOS_ROOT/tools/dev/bin/onos-local-log'
alias gl='grep $KARAF_LOG --colour=auto -E -e '
# alias gl='grep $KARAF_LOG --colour=auto -E -e '
function filterLocalLog {
tl | grep --colour=always -E -e "${1-org.onlab|org.onosproject}"

2
tools/package/bin/onos-backup
View File

@ -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.1
ONOS_KARAF=$ONOS_HOME/apache-karaf-4.2.2
# Fetch the name of the archive or use a default if none is specified
archive=${1:-$ONOS_DEFAULT_ARCHIVE}

2
tools/package/bin/onos-restore
View File

@ -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.1
ONOS_KARAF=$ONOS_HOME/apache-karaf-4.2.2
# Fetch the name of the archive or use a default if none is specified
archive=${1:-$ONOS_DEFAULT_ARCHIVE}

2
tools/package/deb/prerm
View File

@ -14,7 +14,7 @@
# Clean up onos runtime directories
# TODO don't hardcode karaf version
rm -rf /opt/onos/apache-karaf-4.2.1/
rm -rf /opt/onos/apache-karaf-4.2.2/
rm -rf /opt/onos/var/*
rm -rf /opt/onos/config
rm -rf /opt/onos/options

52
tools/package/etc/org.apache.karaf.features.cfg
View File

@ -21,45 +21,45 @@
# Comma separated list of features repositories to register by default
#
featuresRepositories = \
mvn:org.apache.karaf.features/standard/4.2.1/xml/features, \
mvn:org.apache.karaf.features/standard/4.2.2/xml/features, \
mvn:org.onosproject/onos-features/$ONOS_VERSION/xml/features, \
mvn:org.apache.karaf.features/enterprise/4.2.1/xml/features, \
mvn:org.apache.karaf.features/spring/4.2.1/xml/features, \
mvn:org.apache.karaf.features/standard/4.2.1/xml/features, \
mvn:org.apache.karaf.features/framework/4.2.1/xml/features
mvn:org.apache.karaf.features/enterprise/4.2.2/xml/features, \
mvn:org.apache.karaf.features/spring/4.2.2/xml/features, \
mvn:org.apache.karaf.features/standard/4.2.2/xml/features, \
mvn:org.apache.karaf.features/framework/4.2.2/xml/features
#
# Comma separated list of features to install at startup
#
featuresBoot = \
instance/4.2.1, \
package/4.2.1, \
log/4.2.1, \
ssh/4.2.1, \
framework/4.2.1, \
system/4.2.1, \
eventadmin/4.2.1, \
feature/4.2.1, \
shell/4.2.1, \
management/4.2.1, \
service/4.2.1, \
jaas/4.2.1, \
deployer/4.2.1, \
diagnostic/4.2.1, \
instance/4.2.2, \
package/4.2.2, \
log/4.2.2, \
ssh/4.2.2, \
framework/4.2.2, \
system/4.2.2, \
eventadmin/4.2.2, \
feature/4.2.2, \
shell/4.2.2, \
management/4.2.2, \
service/4.2.2, \
jaas/4.2.2, \
deployer/4.2.2, \
diagnostic/4.2.2, \
(wrap/2.5.4), \
(bundle/4.2.1, \
config/4.2.1, \
kar/4.2.1, \
webconsole/4.2.1, \
scr/4.2.1, \
war/4.2.1), \
(bundle/4.2.2, \
config/4.2.2, \
kar/4.2.2, \
webconsole/4.2.2, \
scr/4.2.2, \
war/4.2.2), \
(onos-netty/$ONOS_VERSION), \
(onos-api/$ONOS_VERSION, \
onos-core/$ONOS_VERSION, \
onos-cli/$ONOS_VERSION, \
onos-rest/$ONOS_VERSION, \
onos-gui/$ONOS_VERSION), \
(ssh/4.2.1)
(ssh/4.2.2)
#

2
tools/package/onos-prep-karaf
View File

@ -12,7 +12,7 @@ BRANDING=$4
KARAF_PATCHES=$5
SANDBOX=${6:-.}
KARAF_VERSION="4.2.1"
KARAF_VERSION="4.2.2"
ONOS_SECURITY_MODE="false"
PREFIX="onos-$ONOS_VERSION"

2
tools/package/onos_stage.py
View File

@ -27,7 +27,7 @@ import subprocess
written_files = set()
now = time.time()
karaf_version = "4.2.1"
karaf_version = "4.2.2"
karaf_system = "apache-karaf-" + karaf_version + "/system/"
def addFile(tar, dest, file, file_size):

2
tools/test/bin/onos-check-bits
View File

@ -32,7 +32,7 @@ if [ $? -ne 0 ]; then
echo "ONOS archive does not contain the proper version file" && exit 1
fi
tar tzf ${ONOS_TAR} | grep -q apache-karaf-4.2.1
tar tzf ${ONOS_TAR} | grep -q apache-karaf-4.2.2
if [ $? -ne 0 ]; then
echo "ONOS archive does not contain karaf" && exit 1
fi