commit 87cd82e912b6bacf77ca130a1758e1a5ba65b9c7
author Matteo Scandolo <matteo.scandolo@gmail.com> Mon Mar 16 18:09:00 2020 -0700
committer Matteo Scandolo <matteo.scandolo@gmail.com> Tue Mar 17 11:30:10 2020 -0700
tree 6aa143d320119376a612bf51d451f74765efa1b6
parent 0a9aec9df32ebc93b4abcc2362efacf6cb0337e8

Alpha version with latest onos apps
Adding mcast and igmpproxy apps

Change-Id: I8af0f41cbfdd0b290d8eccb309abad5f205ba629

Dockerfile.voltha-onos

diff --git a/Dockerfile.voltha-onos b/Dockerfile.voltha-onos
index 82b892d..941226b 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.1 as install
+FROM onosproject/onos:2.2-latest 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.1
+FROM onosproject/onos:2.2-latest
 
 # 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 3485cb2..2a08afa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0.2-dev
+4.0.2-alpha1

dependencies.xml

diff --git a/dependencies.xml b/dependencies.xml
index 61a3cea..b315770 100644
--- a/dependencies.xml
+++ b/dependencies.xml
@@ -24,11 +24,13 @@
     <version>fake</version>
 
     <properties>
-        <olt.version>4.0.1</olt.version>
-        <sadis.version>5.0.0</sadis.version>
-        <aaa.version>2.0.1</aaa.version>
-        <dhcpl2relay.version>2.0.1</dhcpl2relay.version>
-        <kafka.version>2.1.1</kafka.version>
+        <olt.version>4.0.2-SNAPSHOT</olt.version>
+        <sadis.version>5.0.1-SNAPSHOT</sadis.version>
+        <aaa.version>2.0.2-SNAPSHOT</aaa.version>
+        <dhcpl2relay.version>2.0.2-SNAPSHOT</dhcpl2relay.version>
+        <kafka.version>2.1.2-SNAPSHOT</kafka.version>
+        <igmpproxy.version>2.0.0-SNAPSHOT</igmpproxy.version>
+        <mcast.version>2.0.0-SNAPSHOT</mcast.version>
     </properties>
 
     <build>
@@ -74,6 +76,20 @@
                             <type>oar</type>
                             <overWrite>true</overWrite>
                         </artifactItem>
+                        <artifactItem>
+                            <groupId>org.opencord</groupId>
+                            <artifactId>onos-app-igmpproxy</artifactId>
+                            <version>${igmpproxy.version}</version>
+                            <type>oar</type>
+                            <overWrite>true</overWrite>
+                        </artifactItem>
+                        <artifactItem>
+                            <groupId>org.opencord</groupId>
+                            <artifactId>mcast</artifactId>
+                            <version>${mcast.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 70fdc73..ffa4704 100755
--- a/get-local-oars.sh
+++ b/get-local-oars.sh
@@ -22,4 +22,5 @@
 cp ../aaa/app/target/*.oar local_imports/oar/
 cp ../dhcpl2relay/app/target/*.oar local_imports/oar/
 cp ../kafka-onos/target/*.oar local_imports/oar/
-
+cp ../igmpproxy/target/*.oar local_imports/oar/
+cp ../mcast/target/*.oar local_imports/oar/