Mirroring changes from mainline repo:
Change-Id: Ic027f97f8fce6c673c9f2c02a92abaeedfedeb97
Change-Id: I5366a05d657ceaad18c03b95cd71f5d1107200e2
# this patchset's changeid
Change-Id: I446e6afcb561669f95edb7de7974ac9899644168
diff --git a/calendar/pom.xml b/calendar/pom.xml
index e4e1f5a..b4579fc 100644
--- a/calendar/pom.xml
+++ b/calendar/pom.xml
@@ -47,18 +47,6 @@
<artifactId>jersey-servlet</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-core</artifactId>
- <version>1.18.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-grizzly2</artifactId>
- <version>1.18.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
diff --git a/demo/pom.xml b/demo/pom.xml
index 3c26d64..5b5fdc5 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -57,19 +57,6 @@
<artifactId>jersey-servlet</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-core</artifactId>
- <version>1.18.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-grizzly2</artifactId>
- <version>1.18.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
diff --git a/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfInstaller.java b/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfInstaller.java
index 794d223..02aa1b3 100644
--- a/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfInstaller.java
+++ b/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfInstaller.java
@@ -324,11 +324,14 @@
ConnectPoint ingress = new ConnectPoint(device.id(), PortNumber.portNumber(1));
ConnectPoint egress = new ConnectPoint(device.id(), PortNumber.portNumber(2));
- return new PointToPointIntent(appId, key,
- selector, treatment,
- ingress, egress,
- Collections.emptyList(),
- Intent.DEFAULT_INTENT_PRIORITY);
+ return PointToPointIntent.builder()
+ .appId(appId)
+ .key(key)
+ .selector(selector)
+ .treatment(treatment)
+ .ingressPoint(ingress)
+ .egressPoint(egress)
+ .build();
}
/**
diff --git a/tvue/pom.xml b/tvue/pom.xml
index d41c5bf..bbd03a7 100644
--- a/tvue/pom.xml
+++ b/tvue/pom.xml
@@ -47,19 +47,6 @@
<artifactId>jersey-servlet</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-core</artifactId>
- <version>1.18.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-grizzly2</artifactId>
- <version>1.18.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>