commit 3ef821a025ee7025f061a9d01a07b0cf2cbd1de8
author Kim Kempf <kim.kempf@radisys.com> Thu Sep 28 22:39:15 2017 -0700
committer Kim Kempf <kim.kempf@radisys.com> Wed Nov 01 15:00:16 2017 -0700
tree a4de918dae3e214dfa1fc7ee294e432cc8353bb6
parent e45c1946cf4a13b118589a6f0fed6eafa6a5f8e7

VOL-475: Bump ONOS apps version for voltha-1.1 release

aaa         1.4.0
config      1.3.1
dhcpl2relay 1.2.0
igmpproxy   1.1.1
mcast       1.3.1
olt         1.3.1
sadis       1.1.2
ONOS image  1.10.9

Removing unused igmp and vtn apps

Change-Id: Id9bfd79711ad172b745517e5e473ca664c01ad19

docker/Dockerfile.onos

diff --git a/docker/Dockerfile.onos b/docker/Dockerfile.onos
index bdb1623..4e9af3a 100644
--- a/docker/Dockerfile.onos
+++ b/docker/Dockerfile.onos
@@ -12,7 +12,7 @@
 ADD config/dependencies.xml .
 RUN mvn dependency:copy -Dmdep.useBaseVersion=true -DoutputDirectory=${DOWNLOAD_ROOT} -Dsilent=true -f dependencies.xml
 
-FROM onosproject/onos:1.10.6 as install
+FROM onosproject/onos:1.10.9 as install
 MAINTAINER Open Networking Foundation <info@opennetworking.org>
 
 # The ENV settings must be replicated below as they are not shared between stages
@@ -33,7 +33,7 @@
 RUN ./app-install.sh
 
 # Create the final image coping over the installed applications from the build stage
-FROM onosproject/onos:1.10.6
+FROM onosproject/onos:1.10.9
 MAINTAINER Open Networking Foundation <info@opennetworking.org>
 
 # Install Key Store Options

docker/config/dependencies.xml

diff --git a/docker/config/dependencies.xml b/docker/config/dependencies.xml
index 53afdac..5af46d7 100644
--- a/docker/config/dependencies.xml
+++ b/docker/config/dependencies.xml
@@ -24,18 +24,14 @@
     <version>fake</version>
 
     <properties>
-        <aaa.version>1.3.0-SNAPSHOT</aaa.version>
-        <config.version>1.3.0-SNAPSHOT</config.version>
-        <dhcpl2relay.version>1.1.0-SNAPSHOT</dhcpl2relay.version>
-        <igmp.version>1.3.0-SNAPSHOT</igmp.version>
-        <igmpproxy.version>1.1.0-SNAPSHOT</igmpproxy.version>
-        <mcast.version>1.3.0-SNAPSHOT</mcast.version>
-        <olt.version>1.3.0-SNAPSHOT</olt.version>
-        <sadis.version>1.1.0-SNAPSHOT</sadis.version>
-        <vtn.version>1.3.0-SNAPSHOT</vtn.version>
+        <aaa.version>1.4.0</aaa.version>
+        <config.version>1.3.1</config.version>
+        <dhcpl2relay.version>1.2.0</dhcpl2relay.version>
+        <igmpproxy.version>1.1.1</igmpproxy.version>
+        <mcast.version>1.3.1</mcast.version>
+        <olt.version>1.3.1</olt.version>
+        <sadis.version>1.1.2</sadis.version>
 
-        <!-- TODO onos-build-conf.version can be dropped when onos.version > 1.10.3 -->
-        <onos-build-conf.version>1.10.3-onf</onos-build-conf.version>
     </properties>
 
     <build>
@@ -55,13 +51,6 @@
                         </artifactItem>
                         <artifactItem>
                             <groupId>org.opencord</groupId>
-                            <artifactId>igmp</artifactId>
-                            <version>${igmp.version}</version>
-                            <type>oar</type>
-                            <overWrite>true</overWrite>
-                        </artifactItem>
-                        <artifactItem>
-                            <groupId>org.opencord</groupId>
                             <artifactId>mcast</artifactId>
                             <version>${mcast.version}</version>
                             <type>oar</type>
@@ -83,13 +72,6 @@
                         </artifactItem>
                         <artifactItem>
                             <groupId>org.opencord</groupId>
-                            <artifactId>vtn</artifactId>
-                            <version>${vtn.version}</version>
-                            <type>oar</type>
-                            <overWrite>true</overWrite>
-                        </artifactItem>
-                        <artifactItem>
-                            <groupId>org.opencord</groupId>
                             <artifactId>aaa</artifactId>
                             <version>${aaa.version}</version>
                             <type>oar</type>