You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fluo.apache.org by kt...@apache.org on 2016/07/14 22:48:48 UTC
[2/5] incubator-fluo git commit: Updates to dependency versions in
pom and docs
Updates to dependency versions in pom and docs
* Made required Java version 8+
* Made Accumulo version 1.6.5 in pom to reflect docs
* Made Hadoop version 2.6+ in docs to reflect pom
* Fixed it instance name variable
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/5ebe3866
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/5ebe3866
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/5ebe3866
Branch: refs/heads/master
Commit: 5ebe38660fe3f05995d07d65ceeab9b61b6a41e1
Parents: 2f32661
Author: Mike Walch <mw...@gmail.com>
Authored: Thu Jul 14 15:55:10 2016 -0400
Committer: Mike Walch <mw...@gmail.com>
Committed: Thu Jul 14 16:07:09 2016 -0400
----------------------------------------------------------------------
docs/prod-fluo-setup.md | 4 ++--
.../fluo/integration/impl/GarbageCollectionIteratorIT.java | 3 +--
pom.xml | 6 +++---
3 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/5ebe3866/docs/prod-fluo-setup.md
----------------------------------------------------------------------
diff --git a/docs/prod-fluo-setup.md b/docs/prod-fluo-setup.md
index e2015ca..df4a26c 100644
--- a/docs/prod-fluo-setup.md
+++ b/docs/prod-fluo-setup.md
@@ -12,9 +12,9 @@ Before you install Fluo, you will need the following installed and running on
your local machine or cluster:
* [Accumulo][Accumulo] (version 1.6+)
-* [Hadoop][Hadoop] (version 2.2+)
+* [Hadoop][Hadoop] (version 2.6+)
* [Zookeeper]
-* [Java][Java] (version 7+)
+* [Java][Java] (version 8+)
Obtain a distribution
---------------------
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/5ebe3866/modules/integration/src/test/java/org/apache/fluo/integration/impl/GarbageCollectionIteratorIT.java
----------------------------------------------------------------------
diff --git a/modules/integration/src/test/java/org/apache/fluo/integration/impl/GarbageCollectionIteratorIT.java b/modules/integration/src/test/java/org/apache/fluo/integration/impl/GarbageCollectionIteratorIT.java
index 0451f16..ac713bc 100644
--- a/modules/integration/src/test/java/org/apache/fluo/integration/impl/GarbageCollectionIteratorIT.java
+++ b/modules/integration/src/test/java/org/apache/fluo/integration/impl/GarbageCollectionIteratorIT.java
@@ -21,7 +21,6 @@ import java.util.Map.Entry;
import com.google.common.collect.Iterables;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.TableNotFoundException;
-import org.apache.accumulo.core.client.admin.CompactionConfig;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.PartialKey;
import org.apache.accumulo.core.data.Value;
@@ -166,7 +165,7 @@ public class GarbageCollectionIteratorIT extends ITBaseImpl {
Assert.assertEquals(0, countInTable("-DATA"));
// compact should drop all del locks except for primary
- conn.tableOperations().compact(table, new CompactionConfig().setWait(true));
+ conn.tableOperations().compact(table, null, null, true, true);
Assert.assertEquals(0, countInTable("-LOCK"));
Assert.assertEquals(1, countInTable("-DEL_LOCK"));
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/5ebe3866/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 16cf544..b4bf85b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
<url>https://github.com/apache/incubator-fluo/issues</url>
</issueManagement>
<properties>
- <accumulo.version>1.7.1</accumulo.version>
+ <accumulo.version>1.6.5</accumulo.version>
<curator.version>2.7.1</curator.version>
<dropwizard.version>0.8.1</dropwizard.version>
<findbugs.maxRank>9</findbugs.maxRank>
@@ -293,8 +293,8 @@
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <org.apache.fluo.it.instance.name>it-instance-maven</org.apache.fluo.it.instance.name>
- <org.apache.fluo.it.instance.clear>false</org.apache.fluo.it.instance.clear>
+ <fluo.it.instance.name>it-instance-maven</fluo.it.instance.name>
+ <fluo.it.instance.clear>false</fluo.it.instance.clear>
</systemPropertyVariables>
</configuration>
</plugin>