[VOL-3080] Introducing Mac Learning application in voltha-onos image
Aso moving to 2.2-latest to get all the recent changes introduced in olt pipeliner.
Change-Id: I3ac6984f0be0b8660afbcf9c721e3db575b2a6ad
diff --git a/Dockerfile.voltha-onos b/Dockerfile.voltha-onos
index 9403491..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.2 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.2
+FROM onosproject/onos:2.2-latest
# The ENV settings must be replicated below as they are not shared between stages
ENV ONOS=/root/onos
diff --git a/VERSION b/VERSION
index a11f6ae..988a683 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.1.0-dev6
+4.1.0-dev7
diff --git a/dependencies.xml b/dependencies.xml
index 36e6aa5..662d161 100644
--- a/dependencies.xml
+++ b/dependencies.xml
@@ -31,6 +31,7 @@
<kafka.version>2.3.0-SNAPSHOT</kafka.version>
<igmpproxy.version>2.1.0-SNAPSHOT</igmpproxy.version>
<mcast.version>2.1.0-SNAPSHOT</mcast.version>
+ <maclearner.version>1.0.0-SNAPSHOT</maclearner.version>
</properties>
<build>
@@ -90,6 +91,13 @@
<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>
diff --git a/get-local-oars.sh b/get-local-oars.sh
index ffa4704..31329ea 100755
--- a/get-local-oars.sh
+++ b/get-local-oars.sh
@@ -24,3 +24,4 @@
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/