commit 488e11467902c30dd75ab67f9bf61b50d71b38e6
author Jonathan Hart <jono@opennetworking.org> Wed May 02 17:30:05 2018 -0700
committer Jonathan Hart <jono@opennetworking.org> Wed May 16 11:40:44 2018 -0700
tree 525f24db0dc6045c31c01862a031573ba5513263
parent a994f63b2b1eb6aee66a36d91e4f62200d6a9732

Upgrading app to ONOS 1.13

Change-Id: I2f94b769e738a4d12122cc34da306d01e70252d4

pom.xml

diff --git a/pom.xml b/pom.xml
index 344a7e3..8555924 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-dependencies</artifactId>
-        <version>1.10.9</version>
+        <version>1.13.1</version>
         <relativePath></relativePath>
     </parent>
 
@@ -31,17 +31,19 @@
     <version>1.2.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
-    <description>IGMP PROXY APP</description>
+    <description>IGMP proxy app</description>
 
     <properties>
         <onos.app.name>org.opencord.igmpproxy</onos.app.name>
-        <onos.version>1.10.9</onos.version>
+        <onos.version>1.13.1</onos.version>
         <onos.app.category>Traffic Steering</onos.app.category>
-        <onos.app.title>IGMP proxy App</onos.app.title>
+        <onos.app.title>IGMP proxy app</onos.app.title>
         <onos.app.url>http://opencord.org</onos.app.url>
         <onos.app.readme>IGMP implementation.</onos.app.readme>
-        <onos.app.requires>org.opencord.config</onos.app.requires>
-	<onos.app.requires>org.opencord.mcast</onos.app.requires>
+        <onos.app.requires>
+            org.opencord.config,
+            org.opencord.mcast
+        </onos.app.requires>
         <cord.config.version>1.4.0-SNAPSHOT</cord.config.version>
     </properties>
 
@@ -136,7 +138,7 @@
             <plugin>
                 <groupId>org.onosproject</groupId>
                 <artifactId>onos-maven-plugin</artifactId>
-                <version>1.7</version>
+                <version>1.11</version>
                 <executions>
                     <execution>
                         <id>cfg</id>

src/main/java/org/opencord/igmpproxy/IgmpManager.java

diff --git a/src/main/java/org/opencord/igmpproxy/IgmpManager.java b/src/main/java/org/opencord/igmpproxy/IgmpManager.java
index 99a4773..0507ec1 100644
--- a/src/main/java/org/opencord/igmpproxy/IgmpManager.java
+++ b/src/main/java/org/opencord/igmpproxy/IgmpManager.java
@@ -33,7 +33,6 @@
 import org.onlab.packet.VlanId;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
-import org.onosproject.incubator.net.config.basics.McastConfig;
 import org.onosproject.mastership.MastershipService;
 import org.onosproject.net.AnnotationKeys;
 import org.onosproject.net.ConnectPoint;
@@ -44,6 +43,7 @@
 import org.onosproject.net.config.NetworkConfigEvent;
 import org.onosproject.net.config.NetworkConfigListener;
 import org.onosproject.net.config.NetworkConfigRegistry;
+import org.onosproject.net.config.basics.McastConfig;
 import org.onosproject.net.config.basics.SubjectFactories;
 import org.onosproject.net.device.DeviceEvent;
 import org.onosproject.net.device.DeviceListener;