Bump up Karaf to 3.0.5
This commit bumps up karaf to 3.0.5.
This commit also bumps up the jetty to 8.1.18.v20150929.
Change-Id: I52849c38b535205db8c4e00e799b332f63b7e3f2
diff --git a/tools/build/docker/Dockerfile b/tools/build/docker/Dockerfile
index 3c688fa..ef9533e 100644
--- a/tools/build/docker/Dockerfile
+++ b/tools/build/docker/Dockerfile
@@ -12,9 +12,9 @@
ENV HOME /root
ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
ENV ONOS_ROOT /src/onos
-ENV KARAF_VERSION 3.0.3
-ENV KARAF_ROOT /root/onos/apache-karaf-3.0.3
-ENV KARAF_LOG /root/onos/apache-karaf-3.0.3/data/log/karaf.log
+ENV KARAF_VERSION 3.0.5
+ENV KARAF_ROOT /root/onos/apache-karaf-3.0.5
+ENV KARAF_LOG /root/onos/apache-karaf-3.0.5/data/log/karaf.log
ENV BUILD_NUMBER docker
ENV PATH $PATH:$KARAF_ROOT/bin
diff --git a/tools/build/envDefaults b/tools/build/envDefaults
index 3f81ed5..2da2843 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.3}
+export KARAF_VERSION=${KARAF_VERSION:-3.0.5}
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 69f8c43..3ff2dde 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.3}
+export KARAF_VERSION=${KARAF_VERSION:-3.0.5}
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 20a35b4..87e8cf6 100755
--- a/tools/dev/bin/onos-setup-ubuntu-devenv
+++ b/tools/dev/bin/onos-setup-ubuntu-devenv
@@ -14,8 +14,8 @@
cd; mkdir Downloads Applications
cd Downloads
-wget http://download.nextag.com/apache/karaf/3.0.3/apache-karaf-3.0.3.tar.gz
+wget http://download.nextag.com/apache/karaf/3.0.5/apache-karaf-3.0.5.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-3.0.3.tar.gz -C ../Applications/
+tar -zxvf apache-karaf-3.0.5.tar.gz -C ../Applications/
tar -zxvf apache-maven-3.3.9-bin.tar.gz -C ../Applications/
diff --git a/tools/dev/onos.cshrc b/tools/dev/onos.cshrc
index 2fdf339..0fb50aa 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.3
+ setenv KARAF_VERSION 3.0.5
endif
if ( ! $?KARAF_ROOT ) then
setenv KARAF_ROOT $HOME/Applications/apache-karaf-$KARAF_VERSION
diff --git a/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
index c4f9654..9286927 100644
--- a/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
@@ -112,7 +112,7 @@
<plugin>
<groupId>org.onosproject</groupId>
<artifactId>onos-maven-plugin</artifactId>
- <version>1.5</version>
+ <version>1.7</version>
<executions>
<execution>
<id>cfg</id>
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 74da2e2..01c8561 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
@@ -80,7 +80,7 @@
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
- <version>3.0.3</version>
+ <version>3.0.5</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 7c2ca8e..1694a2f 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
@@ -127,7 +127,7 @@
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
- <version>3.0.3</version>
+ <version>3.0.5</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -205,7 +205,7 @@
<plugin>
<groupId>org.onosproject</groupId>
<artifactId>onos-maven-plugin</artifactId>
- <version>1.5</version>
+ <version>1.7</version>
<executions>
<execution>
<id>cfg</id>
diff --git a/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml
index abb02b6..efc2348 100644
--- a/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml
@@ -112,7 +112,7 @@
<plugin>
<groupId>org.onosproject</groupId>
<artifactId>onos-maven-plugin</artifactId>
- <version>1.5</version>
+ <version>1.7</version>
<executions>
<execution>
<id>cfg</id>
diff --git a/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml
index f5cc166..6e8d23b 100644
--- a/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml
@@ -113,7 +113,7 @@
<plugin>
<groupId>org.onosproject</groupId>
<artifactId>onos-maven-plugin</artifactId>
- <version>1.5</version>
+ <version>1.7</version>
<executions>
<execution>
<id>cfg</id>
diff --git a/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml
index 861750a..7040a1b 100644
--- a/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml
@@ -113,7 +113,7 @@
<plugin>
<groupId>org.onosproject</groupId>
<artifactId>onos-maven-plugin</artifactId>
- <version>1.5</version>
+ <version>1.7</version>
<executions>
<execution>
<id>cfg</id>
diff --git a/tools/package/deb/prerm b/tools/package/deb/prerm
index 2a1633d..269ad3d 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.3/
+rm -rf /opt/onos/apache-karaf-3.0.5/
rm -rf /opt/onos/var/*
rm -rf /opt/onos/config
rm -rf /opt/onos/options
diff --git a/tools/package/init/onos.conf b/tools/package/init/onos.conf
index 779df90..3ba64da 100644
--- a/tools/package/init/onos.conf
+++ b/tools/package/init/onos.conf
@@ -21,7 +21,7 @@
[ -d /opt/onos ] && mkdir /opt/onos/config 2>/dev/null && chown $ONOS_USER.$ONOS_USER /opt/onos/config
# TODO make karaf version configurable
[ -d /opt/onos ] && [ ! -h /opt/onos/log ] \
- && ln -s /opt/onos/apache-karaf-3.0.3/data/log /opt/onos/log || :
+ && ln -s /opt/onos/apache-karaf-3.0.5/data/log /opt/onos/log || :
end script
pre-stop script
diff --git a/tools/package/karaf-assembly/pom.xml b/tools/package/karaf-assembly/pom.xml
index e6be4e6..3ce25da 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.3</version>
+ <version>3.0.5</version>
<executions>
<execution>
diff --git a/tools/test/topos/onos.py b/tools/test/topos/onos.py
index 2a70544..c40f61b 100755
--- a/tools/test/topos/onos.py
+++ b/tools/test/topos/onos.py
@@ -36,7 +36,7 @@
#self.checkListening()
self.onosDir = onosDir
- self.karafDir = onosDir + 'apache-karaf-3.0.3/'
+ self.karafDir = onosDir + 'apache-karaf-3.0.5/'
self.instanceDir = self.karafDir
# add default modules