Merge "Used onlab.packet.Ethernet:VOL-391"
diff --git a/pom.xml b/pom.xml
index c1b3326..0b99ca1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -20,13 +20,13 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-dependencies</artifactId>
- <version>1.10.3</version>
+ <version>1.10.6</version>
<relativePath></relativePath>
</parent>
<groupId>org.opencord</groupId>
<artifactId>dhcpl2relay</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<description>DHCP L2 Relay Agent</description>
@@ -40,8 +40,11 @@
<onos.app.category>default</onos.app.category>
<onos.app.url>http://opencord.org</onos.app.url>
<onos.app.readme>DHCP L2 Relay Agent Application.</onos.app.readme>
- <onos.version>1.10.3</onos.version>
- <sadis.api.version>1.1.0-SNAPSHOT</sadis.api.version>
+ <onos.app.requires>
+ org.opencord.sadis
+ </onos.app.requires>
+ <onos.version>1.10.6</onos.version>
+ <sadis.api.version>1.2.0-SNAPSHOT</sadis.api.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>
diff --git a/src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java b/src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java
index 209a5da..4f801cf 100755
--- a/src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java
+++ b/src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java
@@ -185,7 +185,8 @@
cancelDhcpPackets();
componentConfigService.unregisterProperties(getClass(), false);
-
+ deviceService.removeListener(deviceListener);
+ mastershipService.removeListener(changeListener);
log.info("DHCP-L2-RELAY Stopped");
}