commit 333d6d3d81ed4231a5aca075c3d5ef6f405d4799
author Matteo Scandolo <matteo.scandolo@gmail.com> Mon Sep 28 11:03:09 2020 -0700
committer Matteo Scandolo <matteo.scandolo@gmail.com> Mon Sep 28 11:03:09 2020 -0700
tree 95c32791c1dd6432473b106c15c502f07a0a21c9
parent 57ab0e1be7c2b809bc5a2cd3a4c14fed0166d5f6

Updating to onos:2.2.6-rc1 and using released version of olt and dhcpl2relay apps. Releases voltha-onos:4.1.7

Change-Id: I3ee215bdc123693fbe0fbe957a9b7e4270d05a34

Dockerfile.voltha-onos

diff --git a/Dockerfile.voltha-onos b/Dockerfile.voltha-onos
index ef9bdf2..8a37a79 100644
--- a/Dockerfile.voltha-onos
+++ b/Dockerfile.voltha-onos
@@ -34,7 +34,7 @@
 
 
 # Unpack and install specific apps from download stage
-FROM onosproject/onos:2.2-latest as install
+FROM onosproject/onos:2.2.6-rc1 as install
 
 # The ENV settings must be replicated below as they are not shared between stages
 ENV ONOS=/root/onos
@@ -58,7 +58,7 @@
 
 
 # Create the final image coping over the installed applications from the install stage
-FROM onosproject/onos:2.2-latest
+FROM onosproject/onos:2.2.6-rc1
 
 # The ENV settings must be replicated below as they are not shared between stages
 ENV ONOS=/root/onos

VERSION

diff --git a/VERSION b/VERSION
index 0211f69..9edf2a4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.1.6-dev
+4.1.7

dependencies.xml

diff --git a/dependencies.xml b/dependencies.xml
index 12d519d..2072792 100644
--- a/dependencies.xml
+++ b/dependencies.xml
@@ -24,14 +24,13 @@
     <version>fake</version>
 
     <properties>
-        <olt.version>4.2.1-SNAPSHOT</olt.version>
+        <olt.version>4.2.1</olt.version>
         <sadis.version>5.1.0</sadis.version>
         <aaa.version>2.1.0</aaa.version>
-        <dhcpl2relay.version>2.2.2-SNAPSHOT</dhcpl2relay.version>
+        <dhcpl2relay.version>2.2.2</dhcpl2relay.version>
         <kafka.version>2.4.0</kafka.version>
         <igmpproxy.version>2.1.2</igmpproxy.version>
         <mcast.version>2.1.0</mcast.version>
-        <maclearner.version>1.0.0</maclearner.version>
     </properties>
 
     <build>
@@ -91,13 +90,6 @@
                             <type>oar</type>
                             <overWrite>true</overWrite>
                         </artifactItem>
-                        <artifactItem>
-                            <groupId>org.opencord</groupId>
-                            <artifactId>maclearner-app</artifactId>
-                            <version>${maclearner.version}</version>
-                            <type>oar</type>
-                            <overWrite>true</overWrite>
-                        </artifactItem>
                     </artifactItems>
                 </configuration>
             </plugin>

get-local-oars.sh

diff --git a/get-local-oars.sh b/get-local-oars.sh
index 31329ea..ffa4704 100755
--- a/get-local-oars.sh
+++ b/get-local-oars.sh
@@ -24,4 +24,3 @@
 cp ../kafka-onos/target/*.oar local_imports/oar/
 cp ../igmpproxy/target/*.oar local_imports/oar/
 cp ../mcast/target/*.oar local_imports/oar/
-cp ../mac-learning/target/*.oar local_imports/oar/