From 81391595dca425ae58e2294898f09f11d9a32dbc Mon Sep 17 00:00:00 2001
From: Ashlee Young <ashlee@onosfw.com>
Date: Tue, 22 Sep 2015 12:49:09 -0700
Subject: bringing src to commit tag 65d551b50e782b0c1ea76c1a9ed1c5a801a5a7e4

Change-Id: Ib2da78962eaef856f418636c31b0f5c84286244f
---
 framework/src/onos/apps/sdnip/pom.xml                             | 8 +-------
 .../src/main/java/org/onosproject/sdnip/IntentSynchronizer.java   | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'framework/src/onos/apps/sdnip')

diff --git a/framework/src/onos/apps/sdnip/pom.xml b/framework/src/onos/apps/sdnip/pom.xml
index 68b500d5..99314aa8 100644
--- a/framework/src/onos/apps/sdnip/pom.xml
+++ b/framework/src/onos/apps/sdnip/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -68,12 +68,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-config</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.console</artifactId>
diff --git a/framework/src/onos/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java b/framework/src/onos/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
index 35ff7054..d8d8f45d 100644
--- a/framework/src/onos/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
+++ b/framework/src/onos/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
@@ -887,7 +887,7 @@ public class IntentSynchronizer implements FibListener, IntentRequestListener {
         checkNotNull(dstMacAddress);
         checkNotNull(srcConnectPoint);
 
-        Set<ConnectPoint> ingressPoints = new HashSet<ConnectPoint>();
+        Set<ConnectPoint> ingressPoints = new HashSet<>();
         ingressPoints.add(srcConnectPoint);
         IpPrefix dstIpPrefix = dstIpAddress.toIpPrefix();
 
-- 
cgit 1.2.3-korg