mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-04 11:51:43 +02:00
Code Issues Projects Releases Wiki Activity

Bump karaf from 3.0.5 to 3.0.8

Browse Source 
Change-Id: Ic5bc130f5110f4ff9da6ec22d066a5dd3069288d
This commit is contained in:
Jon Hall 2017-01-31 11:19:48 -08:00 committed by Ray Milkey
parent b5132faa4c
commit b84df5deb9
21 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buck-tools/onos_stage.py
View File

@ -45,7 +45,7 @@ def stageOnos(output, version, files=[]):
for f in zip_part.infolist():
dest = f.filename
if base not in dest:
dest = base + 'apache-karaf-3.0.5/system/' + f.filename
dest = base + 'apache-karaf-3.0.8/system/' + f.filename
addFile(output, dest, zip_part.open(f), f.file_size)
elif '.oar' in file:
with ZipFile(file, 'r') as oar:
@ -58,12 +58,12 @@ def stageOnos(output, version, files=[]):
for f in oar.infolist():
filename = f.filename
if 'm2' in filename:
dest = base + 'apache-karaf-3.0.5/system/' + filename[3:]
dest = base + 'apache-karaf-3.0.8/system/' + filename[3:]
if dest not in written_files:
addFile(output, dest, oar.open(f), f.file_size)
written_files.add(dest)
elif 'features.xml' in file:
dest = base + 'apache-karaf-3.0.5/system/org/onosproject/onos-features/%s/' % version
dest = base + 'apache-karaf-3.0.8/system/org/onosproject/onos-features/%s/' % version
dest += 'onos-features-%s-features.xml' % version
with open(file) as f:
addFile(output, dest, f, os.stat(file).st_size)

2
bucklets/onos_app.bucklet
View File

@ -64,7 +64,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/3.0.5/xml/features</repository>
<repository>mvn:org.apache.karaf.features/standard/3.0.8/xml/features</repository>
''' % ONOS_VERSION

2
features/features.xml
View File

@ -16,7 +16,7 @@
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
name="onos-@FEATURE-VERSION">
<repository>mvn:org.apache.karaf.features/standard/3.0.5/xml/features</repository>
<repository>mvn:org.apache.karaf.features/standard/3.0.8/xml/features</repository>
<feature name="onos-thirdparty-base" version="@FEATURE-VERSION"
description="ONOS 3rd party dependencies">

2
incubator/protobuf-dependencies/pom.xml
View File

@ -57,7 +57,7 @@
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<version>3.0.5</version>
<version>3.0.8</version>
<extensions>true</extensions>
</plugin>

2
incubator/protobuf/pom.xml
View File

@ -63,7 +63,7 @@
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<version>3.0.5</version>
<version>3.0.8</version>
<extensions>true</extensions>
</plugin>
</plugins>

2
incubator/rpc-grpc/pom.xml
View File

@ -131,7 +131,7 @@
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<version>3.0.5</version>
<version>3.0.8</version>
<extensions>true</extensions>
</plugin>
</plugins>

32
lib/BUCK
View File

@ -1,4 +1,4 @@
# ***** This file was auto-generated at Tue Jan 31 00:45:05 KST 2017. Do not edit this file manually. *****
# ***** This file was auto-generated at Thu Feb 02 13:19:29 PST 2017. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
pass_thru_pom(
@ -875,28 +875,28 @@ remote_jar (
remote_jar (
name = 'org.apache.karaf.features.core',
out = 'org.apache.karaf.features.core-3.0.5.jar',
url = 'mvn:org.apache.karaf.features:org.apache.karaf.features.core:jar:3.0.5',
sha1 = '595b5ddfc4eccad090cb2a1eb14e2ba3cebcb5de',
maven_coords = 'org.apache.karaf.features:org.apache.karaf.features.core:3.0.5',
out = 'org.apache.karaf.features.core-3.0.8.jar',
url = 'mvn:org.apache.karaf.features:org.apache.karaf.features.core:jar:3.0.8',
sha1 = '4a8bf5dbe10e120158cb69295388274f834ae37a',
maven_coords = 'org.apache.karaf.features:org.apache.karaf.features.core:3.0.8',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'org.apache.karaf.shell.console',
out = 'org.apache.karaf.shell.console-3.0.5.jar',
url = 'mvn:org.apache.karaf.shell:org.apache.karaf.shell.console:jar:3.0.5',
sha1 = 'bf60152b180919152f532ddbd96c7563c11bb048',
maven_coords = 'org.apache.karaf.shell:org.apache.karaf.shell.console:3.0.5',
out = 'org.apache.karaf.shell.console-3.0.8.jar',
url = 'mvn:org.apache.karaf.shell:org.apache.karaf.shell.console:jar:3.0.8',
sha1 = '5bf3e409d2e73bef560face9740b8c1234909b83',
maven_coords = 'org.apache.karaf.shell:org.apache.karaf.shell.console:3.0.8',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'org.apache.karaf.system.core',
out = 'org.apache.karaf.system.core-3.0.5.jar',
url = 'mvn:org.apache.karaf.system:org.apache.karaf.system.core:jar:3.0.5',
sha1 = '9740da22ad1c07b2651d837277f0e910a2fc2300',
maven_coords = 'org.apache.karaf.system:org.apache.karaf.system.core:3.0.5',
out = 'org.apache.karaf.system.core-3.0.8.jar',
url = 'mvn:org.apache.karaf.system:org.apache.karaf.system.core:jar:3.0.8',
sha1 = '80378de4aeae603889d3408489ff5b9918e6064c',
maven_coords = 'org.apache.karaf.system:org.apache.karaf.system.core:3.0.8',
visibility = [ 'PUBLIC' ],
)
@ -1028,9 +1028,9 @@ remote_jar (
remote_file (
name = 'apache-karaf',
out = 'apache-karaf-3.0.5-offline-20161115.tar.gz',
url = 'http://onlab.vicci.org/onos/third-party/apache-karaf-3.0.5-offline-20161115.tar.gz',
sha1 = 'b47ddf4bc2812e9bddf9dfb4f10cb2fd31ebf430',
out = 'apache-karaf-3.0.8-offline-20170202.tar.gz',
url = 'http://onlab.vicci.org/onos/third-party/apache-karaf-3.0.8-offline-20170202.tar.gz',
sha1 = 'c58cc34825669b9061de45286310ff2d37a6a829',
visibility = [ 'PUBLIC' ],
)

8
lib/deps.json
View File

@ -171,9 +171,9 @@
"openflowj": "mvn:org.onosproject:openflowj:0.9.7.onos",
"org.apache.felix.scr": "mvn:org.apache.felix:org.apache.felix.scr:1.8.2",
"org.apache.felix.scr.annotations": "mvn:org.apache.felix:org.apache.felix.scr.annotations:1.9.12",
"org.apache.karaf.features.core": "mvn:org.apache.karaf.features:org.apache.karaf.features.core:3.0.5",
"org.apache.karaf.shell.console": "mvn:org.apache.karaf.shell:org.apache.karaf.shell.console:3.0.5",
"org.apache.karaf.system.core": "mvn:org.apache.karaf.system:org.apache.karaf.system.core:3.0.5",
"org.apache.karaf.features.core": "mvn:org.apache.karaf.features:org.apache.karaf.features.core:3.0.8",
"org.apache.karaf.shell.console": "mvn:org.apache.karaf.shell:org.apache.karaf.shell.console:3.0.8",
"org.apache.karaf.system.core": "mvn:org.apache.karaf.system:org.apache.karaf.system.core:3.0.8",
"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",
"osgi-core": "mvn:org.osgi:org.osgi.core:5.0.0",
@ -188,7 +188,7 @@
"typesafe-config": "mvn:com.typesafe:config:1.2.1",
"validation-api": "mvn:javax.validation:validation-api:1.1.0.Final",
"checkstyle": "mvn:com.puppycrawl.tools:checkstyle:6.11.2",
"apache-karaf": "http://onlab.vicci.org/onos/third-party/apache-karaf-3.0.5-offline-20161115.tar.gz",
"apache-karaf": "http://onlab.vicci.org/onos/third-party/apache-karaf-3.0.8-offline-20170202.tar.gz",
"bndlib": "mvn:biz.aQute.bnd:biz.aQute.bndlib:jar:3.1.0",
"bndexe": "http://onlab.vicci.org/onos/third-party/biz.aQute.bnd-3.1.0.jar",
"cord-config": "mvn:org.onosproject:cord-config:1.0-b1",

2
lib/pom.xml
View File

@ -45,7 +45,7 @@
<openflowj.version>0.9.7.onos</openflowj.version>
<onos-maven-plugin.version>1.10</onos-maven-plugin.version>
<osgi.version>5.0.0</osgi.version>
<karaf.version>3.0.5</karaf.version>
<karaf.version>3.0.8</karaf.version>
<jersey.version>2.25</jersey.version>
<jackson.version>2.7.3</jackson.version>
<slf4j.version>1.7.21</slf4j.version>

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

@ -1,6 +1,6 @@
#!/bin/bash
KARAF_VERSION="3.0.5"
KARAF_VERSION="3.0.8"
KARAF_TARFILE_NAME="apache-karaf-${KARAF_VERSION}.tar"
BOOT_FEATURES="standard,ssh,scr,war,webconsole"

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=${KARAF_VERSION:-3.0.5}
export KARAF_VERSION=${KARAF_VERSION:-3.0.8}
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)

2
tools/dev/bash_profile
View File

@ -18,7 +18,7 @@ fi
export MAVEN=${MAVEN:-~/Applications/apache-maven-3.3.9}
export KARAF_VERSION=${KARAF_VERSION:-3.0.5}
export KARAF_VERSION=${KARAF_VERSION:-3.0.8}
export KARAF_ROOT=${KARAF_ROOT:-~/Applications/apache-karaf-$KARAF_VERSION}
export KARAF_LOG=$KARAF_ROOT/data/log/karaf.log

2
tools/dev/bin/onos-setup-ubuntu-devenv
View File

@ -14,7 +14,7 @@ export JAVA_HOME=/usr/lib/jvm/java-8-oracle
cd; mkdir Downloads Applications
cd Downloads
KARAF_VERSION=${KARAF_VERSION:-3.0.5}
KARAF_VERSION=${KARAF_VERSION:-3.0.8}
wget https://downloads.onosproject.org/third-party/apache-karaf-$KARAF_VERSION.tar.gz
wget http://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
tar -zxvf apache-karaf-$KARAF_VERSION.tar.gz -C ../Applications/

2
tools/dev/onos.cshrc
View File

@ -27,7 +27,7 @@ if ( ! $?MAVEN ) then
setenv MAVEN $HOME/Applications/apache-maven-3.3.9
endif
if ( ! $?KARAF_VERSION ) then
setenv KARAF_VERSION 3.0.5
setenv KARAF_VERSION 3.0.8
endif
if ( ! $?KARAF_ROOT ) then
setenv KARAF_ROOT $HOME/Applications/apache-karaf-$KARAF_VERSION

4
tools/dev/vagrant/ansible/vars/global_vars.yml
View File

@ -54,7 +54,7 @@ onos_variables:
- "source $ONOS_ROOT/tools/dev/bash_profile"
# Karaf
karaf_version: "3.0.5"
karaf_version: "3.0.8"
# Tutorial reset files
reset_files:
@ -130,4 +130,4 @@ tutorials:
reset_exec: /home/ubuntu/reset-to-3.sh
url: "https://wiki.onosproject.org/display/ONOS/Distributed+ONOS+Tutorial"
byon_app_repo_url: "https://github.com/bocon13/onos-byon.git"
byon_app_version: "starter-{{ onos_version }}.0"
byon_app_version: "starter-{{ onos_version }}.0"

2
tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml
View File

@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
<version>3.0.5</version>
<version>3.0.8</version>
<scope>provided</scope>
</dependency>
</dependencies>

2
tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
View File

@ -133,7 +133,7 @@
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
<version>3.0.5</version>
<version>3.0.8</version>
<scope>provided</scope>
</dependency>
</dependencies>

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-3.0.5/
rm -rf /opt/onos/apache-karaf-3.0.8/
rm -rf /opt/onos/var/*
rm -rf /opt/onos/config
rm -rf /opt/onos/options

2
tools/package/karaf-assembly/pom.xml
View File

@ -65,7 +65,7 @@
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<version>3.0.5</version>
<version>3.0.8</version>
<executions>
<execution>

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

@ -10,7 +10,7 @@ KARAF_TAR=$2
ONOS_VERSION=$3
BRANDING=$4
#FIXME karaf version
KARAF_VERSION="3.0.5"
KARAF_VERSION="3.0.8"
PREFIX="onos-$ONOS_VERSION"

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

@ -27,7 +27,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-3.0.5
tar tzf ${ONOS_TAR} | grep -q apache-karaf-3.0.8
if [ $? -ne 0 ]; then
echo "ONOS archive does not contain karaf" && exit 1
fi