accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [1/3] git commit: ACCUMULO-2714 Roll back test module guava dependency
Date Wed, 23 Apr 2014 16:46:28 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT c6a55d1a4 -> af8588e3b
  refs/heads/master 373711f6a -> 9ef0fca84


ACCUMULO-2714 Roll back test module guava dependency

Bumping to guava 15 breaks MiniDFSCluster. Need to pull it back when
we're running hadoop in the same process as accumulo to avoid our
version of guava not containing something that hadoop needed.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/af8588e3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/af8588e3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/af8588e3

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: af8588e3b981f0f12d2f12cfc5816041ed0c7658
Parents: c6a55d1
Author: Josh Elser <elserj@apache.org>
Authored: Wed Apr 23 12:32:53 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Wed Apr 23 12:45:07 2014 -0400

----------------------------------------------------------------------
 test/pom.xml                                                     | 4 ++++
 .../test/java/org/apache/accumulo/test/functional/ScannerIT.java | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/af8588e3/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index ed46117..ee6c09f 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -34,8 +34,12 @@
       <artifactId>jcommander</artifactId>
     </dependency>
     <dependency>
+      <!-- Hadoop-2.4.0 MiniDFSCluster uses classes from <Guava-15.0 -->
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
+      <?SORTPOM IGNORE?>
+      <version>14.0.1</version><!--$NO-MVN-MAN-VER$-->
+      <?SORTPOM RESUME?>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/af8588e3/test/src/test/java/org/apache/accumulo/test/functional/ScannerIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ScannerIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ScannerIT.java
index fdf63d8..cbd1290 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ScannerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ScannerIT.java
@@ -74,7 +74,7 @@ public class ScannerIT extends SimpleMacIT {
     s.setBatchSize(1);
     s.setRange(new Range());
 
-    Stopwatch sw = Stopwatch.createUnstarted();
+    Stopwatch sw = new Stopwatch();
     Iterator<Entry<Key,Value>> iterator = s.iterator();
 
     sw.start();
@@ -96,7 +96,7 @@ public class ScannerIT extends SimpleMacIT {
     s.setBatchSize(1);
     s.setReadaheadThreshold(0l);
 
-    sw = Stopwatch.createUnstarted();
+    sw = new Stopwatch();
     iterator = s.iterator();
 
     sw.start();


Mime
View raw message