commit 083027d2872525bec4079bf63f742087ac55d077
author Jonathan Hart <jono@opennetworking.org> Mon May 21 17:07:35 2018 -0700
committer Jonathan Hart <jono@opennetworking.org> Thu May 24 16:19:54 2018 +0000
tree 56233b319fd46615d6a386e7c5421398fa95d0b8
parent 3ef9fc3c0f2c0210d41db1abb3ae4120fef298cf

VOL-741: Update ONOS and apps to ONOS 1.13.1

Change-Id: I26903e7654e669c6f4a1044005e5af5c6f47524b

docker/Dockerfile.onos

diff --git a/docker/Dockerfile.onos b/docker/Dockerfile.onos
index 6d8ce41..7cd51e3 100644
--- a/docker/Dockerfile.onos
+++ b/docker/Dockerfile.onos
@@ -28,7 +28,7 @@
 ADD config/dependencies.xml .
 RUN mvn dependency:copy -Dmdep.useBaseVersion=true -DoutputDirectory=${DOWNLOAD_ROOT} -Dsilent=true -f dependencies.xml -s mvn_settings.xml
 
-FROM onosproject/onos:1.10.9 as install
+FROM onosproject/onos:1.13.1 as install
 MAINTAINER Open Networking Foundation <info@opennetworking.org>
 
 # The ENV settings must be replicated below as they are not shared between stages
@@ -49,7 +49,7 @@
 RUN ./app-install.sh
 
 # Create the final image coping over the installed applications from the build stage
-FROM onosproject/onos:1.10.9
+FROM onosproject/onos:1.13.1
 MAINTAINER Open Networking Foundation <info@opennetworking.org>
 
 # Install Key Store Options
@@ -73,4 +73,3 @@
 # Create ONOS Key Directory
 RUN mkdir -p /home/sdn/wiki
 COPY onos_cfg/ /home/sdn/wiki
-

docker/config/dependencies.xml

diff --git a/docker/config/dependencies.xml b/docker/config/dependencies.xml
index fec8db5..ee518c1 100644
--- a/docker/config/dependencies.xml
+++ b/docker/config/dependencies.xml
@@ -24,13 +24,13 @@
     <version>fake</version>
 
     <properties>
-        <aaa.version>1.5.0</aaa.version>
-        <config.version>1.3.1</config.version>
-        <dhcpl2relay.version>1.3.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>2.0.0</sadis.version>
+        <aaa.version>1.6.0-SNAPSHOT</aaa.version>
+        <config.version>1.4.0-SNAPSHOT</config.version>
+        <dhcpl2relay.version>1.4.0-SNAPSHOT</dhcpl2relay.version>
+        <igmpproxy.version>1.2.0-SNAPSHOT</igmpproxy.version>
+        <mcast.version>1.4.0-SNAPSHOT</mcast.version>
+        <olt.version>1.4.0-SNAPSHOT</olt.version>
+        <sadis.version>2.1.0-SNAPSHOT</sadis.version>
     </properties>
 
     <build>