Merge branch '1.7' into 1.8
diff --git a/src/main/java/org/apache/accumulo/proxy/Proxy.java b/src/main/java/org/apache/accumulo/proxy/Proxy.java
index 54fd03b..b53861c 100644
--- a/src/main/java/org/apache/accumulo/proxy/Proxy.java
+++ b/src/main/java/org/apache/accumulo/proxy/Proxy.java
@@ -20,6 +20,7 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.file.Files;
import java.util.Properties;
import org.apache.accumulo.core.cli.Help;
@@ -53,7 +54,6 @@
import com.beust.jcommander.IStringConverter;
import com.beust.jcommander.Parameter;
import com.google.auto.service.AutoService;
-import com.google.common.io.Files;
@AutoService(KeywordExecutable.class)
public class Proxy implements KeywordExecutable {
@@ -139,7 +139,7 @@
if (useMini) {
log.info("Creating mini cluster");
- final File folder = Files.createTempDir();
+ final File folder = Files.createTempDirectory(System.currentTimeMillis() + "", null).toFile();
final MiniAccumuloCluster accumulo = new MiniAccumuloCluster(folder, "secret");
accumulo.start();
opts.prop.setProperty("instance", accumulo.getConfig().getInstanceName());