Implemented SDN-IP/BgpRouter neighbour handling using NeighbourResolutionService

Change-Id: Ia7e3f18bd69d56cb2f46f815eaa2352533a54ed0
diff --git a/apps/bgprouter/BUCK b/apps/bgprouter/BUCK
index 62ec78e..0e1870f 100644
--- a/apps/bgprouter/BUCK
+++ b/apps/bgprouter/BUCK
@@ -19,6 +19,5 @@
     category = 'Traffic Steering',
     url = 'http://onosproject.org',
     description = 'BGP router application.',
-    required_apps = [ 'org.onosproject.proxyarp' ],
     included_bundles = BUNDLES,
 )
diff --git a/apps/bgprouter/app.xml b/apps/bgprouter/app.xml
index 2b5c117..91e010a 100644
--- a/apps/bgprouter/app.xml
+++ b/apps/bgprouter/app.xml
@@ -22,5 +22,4 @@
     <artifact>mvn:${project.groupId}/${project.artifactId}/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-app-routing-api/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-app-routing/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-proxyarp/${project.version}</artifact>
 </app>
diff --git a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java
index 0ae6fa8..e6941c3 100644
--- a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java
+++ b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java
@@ -95,6 +95,7 @@
     static {
         components.add("org.onosproject.routing.bgp.BgpSessionManager");
         components.add("org.onosproject.routing.impl.Router");
+        components.add("org.onosproject.routing.impl.BgpSpeakerNeighbourHandler");
         components.add("org.onosproject.routing.impl.SingleSwitchFibInstaller");
     }