commit f4b27c63a4f9287f71e5a12fb741ef7a76176071
author Jonathan Hart <jono@opennetworking.org> Wed May 02 17:30:05 2018 -0700
committer Jonathan Hart <jono@opennetworking.org> Thu May 17 20:38:46 2018 +0000
tree 8f8c1808f6b24a667cf4bf2dcfd38fd3fc2c31c1
parent 05a8732b55c2b817ebb3c067a6ad797205352ef4

Upgrading app to ONOS 1.13

Change-Id: I8f00ff12df6a17c8d32d20e26671185d4e29fd44

pom.xml

diff --git a/pom.xml b/pom.xml
index cb24eee..1543d3d 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>
 
@@ -35,12 +35,12 @@
 
     <properties>
         <onos.app.name>org.opencord.mcast</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>CORD Multicast App</onos.app.title>
         <onos.app.url>http://opencord.org</onos.app.url>
-	<onos.app.requires>org.opencord.config</onos.app.requires>
-	<cord.config.version>1.4.0-SNAPSHOT</cord.config.version>
+        <onos.app.requires>org.opencord.config</onos.app.requires>
+        <cord.config.version>1.4.0-SNAPSHOT</cord.config.version>
         <olt.api.version>1.4.0-SNAPSHOT</olt.api.version>
     </properties>
 
@@ -98,6 +98,11 @@
             <artifactId>olt-api</artifactId>
             <version>${olt.api.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-client</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -139,7 +144,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/cordmcast/CordMcast.java

diff --git a/src/main/java/org/opencord/cordmcast/CordMcast.java b/src/main/java/org/opencord/cordmcast/CordMcast.java
index 1bf6718..99dea51 100644
--- a/src/main/java/org/opencord/cordmcast/CordMcast.java
+++ b/src/main/java/org/opencord/cordmcast/CordMcast.java
@@ -71,7 +71,7 @@
 import org.opencord.cordconfig.CordConfigService;
 import org.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;
-import org.onosproject.incubator.net.config.basics.McastConfig;
+import org.onosproject.net.config.basics.McastConfig;
 
 import javax.ws.rs.ProcessingException;
 import javax.ws.rs.client.Client;