commit e9b7a02ff9d5a0e2f62004eccb26ed9280990f97
author Jimmy Jin <jjin95032@gmail.com> Fri Aug 12 16:56:48 2016 -0700
committer Thomas Vachuska <tom@onlab.us> Fri May 19 15:40:12 2017 +0000
tree 4b92fa14b6924ebca5dbe4e9145e00bf279b51f7
parent 239f09e2f920a3ab0f15a90e88fdc6c3701f2403

OpenFlow message processing for new loxi

Depends-On: Id69c8597eb4564653c56cdc90f2dcec50afbdd25

Change-Id: Ib14fbadd3debf98ce1d56343179f8e7929f8ade8

drivers/default/features.xml

diff --git a/drivers/default/features.xml b/drivers/default/features.xml
index 52741e7..4f2efc5 100644
--- a/drivers/default/features.xml
+++ b/drivers/default/features.xml
@@ -20,7 +20,7 @@
         <feature>onos-api</feature>
         <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
 
-        <bundle>mvn:org.onosproject/openflowj/0.9.7.onos</bundle>
+        <bundle>mvn:org.onosproject/openflowj/3.2.0.onos</bundle>
         <bundle>mvn:${project.groupId}/onos-of-api/${project.version}</bundle>
 
     </feature>

drivers/flowspec/pom.xml

diff --git a/drivers/flowspec/pom.xml b/drivers/flowspec/pom.xml
index 187a651..93554a6 100644
--- a/drivers/flowspec/pom.xml
+++ b/drivers/flowspec/pom.xml
@@ -61,7 +61,6 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>19.0</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>

drivers/optical/src/main/java/org/onosproject/driver/optical/handshaker/OplinkHandshakerUtil.java

diff --git a/drivers/optical/src/main/java/org/onosproject/driver/optical/handshaker/OplinkHandshakerUtil.java b/drivers/optical/src/main/java/org/onosproject/driver/optical/handshaker/OplinkHandshakerUtil.java
index d5b18b4..5ea98c8 100644
--- a/drivers/optical/src/main/java/org/onosproject/driver/optical/handshaker/OplinkHandshakerUtil.java
+++ b/drivers/optical/src/main/java/org/onosproject/driver/optical/handshaker/OplinkHandshakerUtil.java
@@ -20,8 +20,8 @@
 import java.util.List;
 import java.util.Set;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
 import org.onosproject.drivers.optical.OpticalAdjacencyLinkService;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.Annotations;
@@ -203,7 +203,7 @@
                 // |---------------------------------------------------------------------------|
                 // | Header (2 bytes) | ID (4 BITS) | MAC (6 bytes) | Port (4 bytes) | Unused  |
                 // |---------------------------------------------------------------------------|
-                ChannelBuffer buffer = ChannelBuffers.buffer(OPSPEC_BYTES);
+                ByteBuf buffer = Unpooled.buffer(OPSPEC_BYTES);
                 otn.getOpspec().write32Bytes(buffer);
                 long mac = buffer.getLong(OPSPEC_MAC_POS) << OPSPEC_ID_BITS >>> OPSPEC_MAC_BIT_OFF;
                 int port = (int) (buffer.getLong(OPSPEC_PORT_POS) << OPSPEC_ID_BITS >>> OPSPEC_PORT_BIT_OFF);