Bump karaf from 3.0.5 to 3.0.8
Change-Id: Ic5bc130f5110f4ff9da6ec22d066a5dd3069288d
diff --git a/tools/build/build-offline-karaf b/tools/build/build-offline-karaf
index ea0f7ed..76b0fd1 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 8a5913f..a4a8a0f 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=${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 7b599f4..e4c3372 100644
--- a/tools/dev/bash_profile
+++ b/tools/dev/bash_profile
@@ -18,7 +18,7 @@
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 86895c6..688850a 100755
--- a/tools/dev/bin/onos-setup-ubuntu-devenv
+++ b/tools/dev/bin/onos-setup-ubuntu-devenv
@@ -14,7 +14,7 @@
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 0fb50aa..785509d 100644
--- a/tools/dev/onos.cshrc
+++ b/tools/dev/onos.cshrc
@@ -27,7 +27,7 @@
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 f189d0d..3e9a018 100644
--- a/tools/dev/vagrant/ansible/vars/global_vars.yml
+++ b/tools/dev/vagrant/ansible/vars/global_vars.yml
@@ -54,7 +54,7 @@
- "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 @@
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 2857299..0641855 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 @@
<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>
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 76081bd..785f043 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 @@
<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>
diff --git a/tools/package/deb/prerm b/tools/package/deb/prerm
index 269ad3d..264a26c 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 b79d268..876d09e 100644
--- a/tools/package/karaf-assembly/pom.xml
+++ b/tools/package/karaf-assembly/pom.xml
@@ -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>
diff --git a/tools/package/onos-prep-karaf b/tools/package/onos-prep-karaf
index 6d33273..8e83fdf 100755
--- a/tools/package/onos-prep-karaf
+++ b/tools/package/onos-prep-karaf
@@ -10,7 +10,7 @@
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 b111992..0978be9 100755
--- a/tools/test/bin/onos-check-bits
+++ b/tools/test/bin/onos-check-bits
@@ -27,7 +27,7 @@
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