Merge remote-tracking branch 'origin/master' into java8
diff --git a/pom.xml b/pom.xml
index 351aaa9..3ef00bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,12 +34,12 @@
<dependency>
<groupId>net.named-data</groupId>
<artifactId>jndn</artifactId>
- <version>0.6</version>
+ <version>0.7</version>
</dependency>
<dependency>
<groupId>com.intel.jndn.utils</groupId>
<artifactId>jndn-utils</artifactId>
- <version>RELEASE</version>
+ <version>1.0.0</version>
</dependency>
<!-- test dependencies -->
<dependency>
diff --git a/src/main/java/com/intel/jndn/management/NFD.java b/src/main/java/com/intel/jndn/management/NFD.java
index 4895034..937d013 100644
--- a/src/main/java/com/intel/jndn/management/NFD.java
+++ b/src/main/java/com/intel/jndn/management/NFD.java
@@ -21,8 +21,8 @@
import com.intel.jndn.management.types.LocalControlHeader;
import com.intel.jndn.management.types.RibEntry;
import com.intel.jndn.management.types.StrategyChoice;
-import com.intel.jndn.utils.SimpleClient;
-import com.intel.jndn.utils.SegmentedClient;
+import com.intel.jndn.utils.client.SegmentedClient;
+import com.intel.jndn.utils.client.SimpleClient;
import java.io.IOException;
import java.util.List;
import net.named_data.jndn.ControlParameters;
diff --git a/src/test/java/com/intel/jndn/management/FaceStatusTest.java b/src/test/java/com/intel/jndn/management/FaceStatusTest.java
index c81d9b2..679976c 100644
--- a/src/test/java/com/intel/jndn/management/FaceStatusTest.java
+++ b/src/test/java/com/intel/jndn/management/FaceStatusTest.java
@@ -15,7 +15,7 @@
import com.intel.jndn.management.types.StatusDataset;
import com.intel.jndn.management.types.FaceStatus;
-import com.intel.jndn.utils.SimpleClient;
+import com.intel.jndn.utils.client.SimpleClient;
import java.io.IOException;
import java.util.List;
import java.util.logging.Logger;
diff --git a/src/test/java/com/intel/jndn/management/FibEntryTest.java b/src/test/java/com/intel/jndn/management/FibEntryTest.java
index 4f25227..28af62f 100644
--- a/src/test/java/com/intel/jndn/management/FibEntryTest.java
+++ b/src/test/java/com/intel/jndn/management/FibEntryTest.java
@@ -16,7 +16,7 @@
import com.intel.jndn.management.types.StatusDataset;
import com.intel.jndn.management.types.NextHopRecord;
import com.intel.jndn.management.types.FibEntry;
-import com.intel.jndn.utils.SimpleClient;
+import com.intel.jndn.utils.client.SimpleClient;
import java.util.List;
import junit.framework.Assert;
import net.named_data.jndn.Data;
diff --git a/src/test/java/com/intel/jndn/management/LocalControlHeaderTest.java b/src/test/java/com/intel/jndn/management/LocalControlHeaderTest.java
index 400d10c..8367c7c 100644
--- a/src/test/java/com/intel/jndn/management/LocalControlHeaderTest.java
+++ b/src/test/java/com/intel/jndn/management/LocalControlHeaderTest.java
@@ -14,7 +14,7 @@
package com.intel.jndn.management;
import com.intel.jndn.management.types.LocalControlHeader;
-import com.intel.jndn.utils.SimpleClient;
+import com.intel.jndn.utils.client.SimpleClient;
import java.util.logging.Logger;
import junit.framework.Assert;
import net.named_data.jndn.Data;
@@ -22,7 +22,6 @@
import net.named_data.jndn.Name;
import net.named_data.jndn.encoding.EncodingException;
import net.named_data.jndn.security.KeyChain;
-import static org.junit.Assert.assertTrue;
/**
* Test functionality for LocalControlHeader
diff --git a/src/test/java/com/intel/jndn/management/RibEntryTest.java b/src/test/java/com/intel/jndn/management/RibEntryTest.java
index b0b757c..c7fe21e 100644
--- a/src/test/java/com/intel/jndn/management/RibEntryTest.java
+++ b/src/test/java/com/intel/jndn/management/RibEntryTest.java
@@ -16,7 +16,7 @@
import com.intel.jndn.management.types.StatusDataset;
import com.intel.jndn.management.types.RibEntry;
import com.intel.jndn.management.types.Route;
-import com.intel.jndn.utils.SimpleClient;
+import com.intel.jndn.utils.client.SimpleClient;
import java.util.List;
import junit.framework.Assert;
import net.named_data.jndn.Data;