commit ea6dda9e102c3f3199454be5499a92d5944ab6cf
author Matteo Scandolo <matteo.scandolo@gmail.com> Fri Dec 20 14:01:45 2019 -0800
committer Matteo Scandolo <matteo.scandolo@gmail.com> Wed Jan 15 15:51:07 2020 -0800
tree 35882804696d942e492af9a580f63d7d50639fb2
parent afd79885f8f9da002d1f8570e74e93587ea12246

Using onos-2.2 as base for ONOS VOLTHA

Change-Id: Ief5628793ec5e6693504232b7a1464506b67ce59

.gitreview

diff --git a/.gitreview b/.gitreview
index 473a40c..1339d5f 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,4 +3,4 @@
 port=29418
 project=voltha-onos.git
 defaultremote=origin
-defaultbranch=master
+defaultbranch=onos-2.2

Dockerfile.voltha-onos

diff --git a/Dockerfile.voltha-onos b/Dockerfile.voltha-onos
index 9c7c186..487db44 100644
--- a/Dockerfile.voltha-onos
+++ b/Dockerfile.voltha-onos
@@ -34,11 +34,11 @@
 
 
 # Unpack and install specific apps from download stage
-FROM onosproject/onos:1.13.9 as install
+FROM onosproject/onos:2.2.0 as install
 
 # The ENV settings must be replicated below as they are not shared between stages
 ENV ONOS=/root/onos
-ENV KARAF_VERSION=3.0.8
+ENV KARAF_VERSION=4.2.6
 ENV KARAF_ROOT=${ONOS}/apache-karaf-${KARAF_VERSION}
 ENV APPS_ROOT=${ONOS}/apps
 ENV KARAF_M2=${KARAF_ROOT}/system
@@ -48,6 +48,9 @@
 # Copy the downloaded artifact to the install stage container
 COPY --from=download ${DOWNLOAD_ROOT} ${DOWNLOAD_ROOT}
 
+RUN apt-get update
+RUN apt-get install unzip -y
+
 # Install the applications
 COPY app-install.sh ./app-install.sh
 RUN chmod 755 ./app-install.sh
@@ -55,11 +58,11 @@
 
 
 # Create the final image coping over the installed applications from the install stage
-FROM onosproject/onos:1.13.9
+FROM onosproject/onos:2.2.0
 
 # The ENV settings must be replicated below as they are not shared between stages
 ENV ONOS=/root/onos
-ENV KARAF_VERSION=3.0.8
+ENV KARAF_VERSION=4.2.6
 ENV KARAF_ROOT=${ONOS}/apache-karaf-${KARAF_VERSION}
 ENV KARAF_M2=${KARAF_ROOT}/system
 ENV APPS_ROOT=${ONOS}/apps

VERSION

diff --git a/VERSION b/VERSION
index c043eea..d9b058f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.1
+4.0.0-dev

dependencies.xml

diff --git a/dependencies.xml b/dependencies.xml
index e085b0a..b0e3676 100644
--- a/dependencies.xml
+++ b/dependencies.xml
@@ -24,11 +24,11 @@
     <version>fake</version>
 
     <properties>
-        <olt.version>3.0.1</olt.version>
-        <sadis.version>3.1.0</sadis.version>
-        <aaa.version>1.10.0</aaa.version>
-        <dhcpl2relay.version>1.6.2</dhcpl2relay.version>
-        <kafka.version>1.2.0</kafka.version>
+        <olt.version>4.0.0</olt.version>
+        <sadis.version>4.0.1</sadis.version>
+        <aaa.version>2.0.0</aaa.version>
+        <dhcpl2relay.version>2.0.0</dhcpl2relay.version>
+        <kafka.version>2.0.0</kafka.version>
     </properties>
 
     <build>
@@ -84,7 +84,7 @@
         <repository>
             <id>central</id>
             <name>Central Repository</name>
-            <url>http://repo.maven.apache.org/maven2</url>
+            <url>https://repo.maven.apache.org/maven2</url>
             <layout>default</layout>
             <snapshots>
                 <enabled>false</enabled>