diff --git a/buck-tools/onos_stage.py b/buck-tools/onos_stage.py index 0ed46a19d1..23002c6006 100755 --- a/buck-tools/onos_stage.py +++ b/buck-tools/onos_stage.py @@ -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) diff --git a/bucklets/onos_app.bucklet b/bucklets/onos_app.bucklet index 6771c0b3a6..64dd9d7e3a 100644 --- a/bucklets/onos_app.bucklet +++ b/bucklets/onos_app.bucklet @@ -64,7 +64,7 @@ FEATURES_HEADER = '''\ - mvn:org.apache.karaf.features/standard/3.0.5/xml/features + mvn:org.apache.karaf.features/standard/3.0.8/xml/features ''' % ONOS_VERSION diff --git a/features/features.xml b/features/features.xml index 5e32db7f49..6eabccb648 100644 --- a/features/features.xml +++ b/features/features.xml @@ -16,7 +16,7 @@ --> - mvn:org.apache.karaf.features/standard/3.0.5/xml/features + mvn:org.apache.karaf.features/standard/3.0.8/xml/features diff --git a/incubator/protobuf-dependencies/pom.xml b/incubator/protobuf-dependencies/pom.xml index a763d7954f..7ab88f254d 100644 --- a/incubator/protobuf-dependencies/pom.xml +++ b/incubator/protobuf-dependencies/pom.xml @@ -57,7 +57,7 @@ org.apache.karaf.tooling karaf-maven-plugin - 3.0.5 + 3.0.8 true diff --git a/incubator/protobuf/pom.xml b/incubator/protobuf/pom.xml index 94bc87a54c..32abcaf65c 100644 --- a/incubator/protobuf/pom.xml +++ b/incubator/protobuf/pom.xml @@ -63,7 +63,7 @@ org.apache.karaf.tooling karaf-maven-plugin - 3.0.5 + 3.0.8 true diff --git a/incubator/rpc-grpc/pom.xml b/incubator/rpc-grpc/pom.xml index f11580cc35..0a5b180019 100644 --- a/incubator/rpc-grpc/pom.xml +++ b/incubator/rpc-grpc/pom.xml @@ -131,7 +131,7 @@ org.apache.karaf.tooling karaf-maven-plugin - 3.0.5 + 3.0.8 true diff --git a/lib/BUCK b/lib/BUCK index f0a52654f0..e3b31a7c74 100644 --- a/lib/BUCK +++ b/lib/BUCK @@ -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' ], ) diff --git a/lib/deps.json b/lib/deps.json index 996e4f6abc..da877947d1 100644 --- a/lib/deps.json +++ b/lib/deps.json @@ -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", diff --git a/lib/pom.xml b/lib/pom.xml index c2643e370e..17e50ab92a 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -45,7 +45,7 @@ 0.9.7.onos 1.10 5.0.0 - 3.0.5 + 3.0.8 2.25 2.7.3 1.7.21 diff --git a/tools/build/build-offline-karaf b/tools/build/build-offline-karaf index ea0f7ed942..76b0fd1e50 100755 --- a/tools/build/build-offline-karaf +++ b/tools/build/build-offline-karaf @@ -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" diff --git a/tools/build/envDefaults b/tools/build/envDefaults index 8a5913f44b..a4a8a0f888 100644 --- a/tools/build/envDefaults +++ b/tools/build/envDefaults @@ -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) diff --git a/tools/dev/bash_profile b/tools/dev/bash_profile index 7b599f46d1..e4c337252e 100644 --- a/tools/dev/bash_profile +++ b/tools/dev/bash_profile @@ -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 diff --git a/tools/dev/bin/onos-setup-ubuntu-devenv b/tools/dev/bin/onos-setup-ubuntu-devenv index 86895c69e7..688850a017 100755 --- a/tools/dev/bin/onos-setup-ubuntu-devenv +++ b/tools/dev/bin/onos-setup-ubuntu-devenv @@ -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/ diff --git a/tools/dev/onos.cshrc b/tools/dev/onos.cshrc index 0fb50aa579..785509dda3 100644 --- a/tools/dev/onos.cshrc +++ b/tools/dev/onos.cshrc @@ -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 diff --git a/tools/dev/vagrant/ansible/vars/global_vars.yml b/tools/dev/vagrant/ansible/vars/global_vars.yml index f189d0d2d1..3e9a018a42 100644 --- a/tools/dev/vagrant/ansible/vars/global_vars.yml +++ b/tools/dev/vagrant/ansible/vars/global_vars.yml @@ -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" \ No newline at end of file + byon_app_version: "starter-{{ onos_version }}.0" diff --git a/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml index 2857299cc5..0641855b98 100644 --- a/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml +++ b/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml @@ -85,7 +85,7 @@ org.apache.karaf.shell org.apache.karaf.shell.console - 3.0.5 + 3.0.8 provided diff --git a/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml index 76081bde4c..785f0434fc 100644 --- a/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml +++ b/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml @@ -133,7 +133,7 @@ org.apache.karaf.shell org.apache.karaf.shell.console - 3.0.5 + 3.0.8 provided diff --git a/tools/package/deb/prerm b/tools/package/deb/prerm index 269ad3d38f..264a26cbec 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-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 diff --git a/tools/package/karaf-assembly/pom.xml b/tools/package/karaf-assembly/pom.xml index b79d2689c9..876d09e964 100644 --- a/tools/package/karaf-assembly/pom.xml +++ b/tools/package/karaf-assembly/pom.xml @@ -65,7 +65,7 @@ org.apache.karaf.tooling karaf-maven-plugin - 3.0.5 + 3.0.8 diff --git a/tools/package/onos-prep-karaf b/tools/package/onos-prep-karaf index 6d3327362c..8e83fdfdf0 100755 --- a/tools/package/onos-prep-karaf +++ b/tools/package/onos-prep-karaf @@ -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" diff --git a/tools/test/bin/onos-check-bits b/tools/test/bin/onos-check-bits index b111992514..0978be90bf 100755 --- a/tools/test/bin/onos-check-bits +++ b/tools/test/bin/onos-check-bits @@ -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