commit d41fe5328d0edc5ebf7d2fe7f7a0f797bb75dc61
author Andrea Campanella <andrea@opennetworking.org> Fri Jan 14 11:11:29 2022 +0100
committer Andrea Campanella <andrea@opennetworking.org> Wed Jan 26 13:37:04 2022 +0100
tree 9dd309cf1da0277afae22b8494657b736537a022
parent 01b0274c21e7f8288c0f00dc512a794ca77fca75

Moving to onos 2.5.6 with karaf 4.2.14 and flow rule store fix

Change-Id: Ia310b19c099f57859099d4f4e4cacb4d4af36662

Dockerfile.voltha-onos

diff --git a/Dockerfile.voltha-onos b/Dockerfile.voltha-onos
index 94d8c1f..dfc5456 100644
--- a/Dockerfile.voltha-onos
+++ b/Dockerfile.voltha-onos
@@ -34,11 +34,11 @@
 
 
 # Unpack and install specific apps from download stage
-FROM onosproject/onos:2.5.5 as install
+FROM onosproject/onos:2.5.6 as install
 
 # The ENV settings must be replicated below as they are not shared between stages
 ENV ONOS=/root/onos
-ENV KARAF_VERSION=4.2.9
+ENV KARAF_VERSION=4.2.14
 ENV KARAF_ROOT=${ONOS}/apache-karaf-${KARAF_VERSION}
 ENV APPS_ROOT=${ONOS}/apps
 ENV KARAF_M2=${KARAF_ROOT}/system
@@ -58,11 +58,11 @@
 
 
 # Create the final image coping over the installed applications from the install stage
-FROM onosproject/onos:2.5.5
+FROM onosproject/onos:2.5.6
 
 # The ENV settings must be replicated below as they are not shared between stages
 ENV ONOS=/root/onos
-ENV KARAF_VERSION=4.2.9
+ENV KARAF_VERSION=4.2.14
 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 ab0fa33..f8ee15f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.0.5
+5.1.0-dev

dependencies.xml

diff --git a/dependencies.xml b/dependencies.xml
index 7bf63c4..73471ce 100644
--- a/dependencies.xml
+++ b/dependencies.xml
@@ -24,13 +24,14 @@
     <version>fake</version>
 
     <properties>
-        <olt.version>5.0.1</olt.version>
-        <sadis.version>5.5.1</sadis.version>
-        <aaa.version>2.5.0</aaa.version>
-        <dhcpl2relay.version>2.6.0</dhcpl2relay.version>
-        <kafka.version>2.8.0</kafka.version>
-        <igmpproxy.version>2.4.0</igmpproxy.version>
-        <mcast.version>2.5.0</mcast.version>
+        <olt.version>5.1.0-SNAPSHOT</olt.version>
+        <sadis.version>5.6.0-SNAPSHOT</sadis.version>
+        <aaa.version>2.6.0-SNAPSHOT</aaa.version>
+        <dhcpl2relay.version>2.7.0-SNAPSHOT</dhcpl2relay.version>
+        <kafka.version>2.9.0-SNAPSHOT</kafka.version>
+        <igmpproxy.version>2.5.0-SNAPSHOT</igmpproxy.version>
+        <mcast.version>2.6.0-SNAPSHOT</mcast.version>
+        <maclearner.version>1.2.1-SNAPSHOT</maclearner.version>
         <segmentrouting.version>3.0.0</segmentrouting.version>
     </properties>