You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/09/09 00:26:40 UTC
[1/3] git commit: ACCUMULO-3100 Pull back Guava dependency from 15.0
to 14.0.1.
Repository: accumulo
Updated Branches:
refs/heads/1.6.1-SNAPSHOT 7eeb08ae9 -> ae01d35bc
refs/heads/master ef701cabb -> c2ca6386a
ACCUMULO-3100 Pull back Guava dependency from 15.0 to 14.0.1.
Hadoop-2 still depends on 14.0.1 and uses some classes that do
not exist in >14.0.1. As such, if we depend on a newer version of
Guava, we're incorrectly advertising that Accumulo fully works
with this version: specifically tests that level MiniDFSCluster
and, specifically, clients who use MiniAccumuloCluster are subject
to failure.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ae01d35b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ae01d35b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ae01d35b
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: ae01d35bca216e02c368d675b2e38033b2f6c3f4
Parents: 7eeb08a
Author: Josh Elser <el...@apache.org>
Authored: Mon Sep 8 10:41:26 2014 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Mon Sep 8 10:41:26 2014 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
test/pom.xml | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ae01d35b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ca99168..98501c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>15.0</version>
+ <version>14.0.1</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ae01d35b/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index daf4fbd..196742a 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -34,12 +34,8 @@
<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>
[3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Posted by el...@apache.org.
Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c2ca6386
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c2ca6386
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c2ca6386
Branch: refs/heads/master
Commit: c2ca6386a6fc55edbefe52e2cf88a52b3175aee3
Parents: ef701ca ae01d35
Author: Josh Elser <el...@apache.org>
Authored: Mon Sep 8 15:25:58 2014 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Mon Sep 8 15:25:58 2014 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
test/pom.xml | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c2ca6386/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index dbfce99,98501c7..4c66132
--- a/pom.xml
+++ b/pom.xml
@@@ -156,14 -154,9 +156,14 @@@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>15.0</version>
+ <version>14.0.1</version>
</dependency>
<dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>2.5.0</version>
+ </dependency>
+ <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.2</version>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c2ca6386/test/pom.xml
----------------------------------------------------------------------
[2/3] git commit: ACCUMULO-3100 Pull back Guava dependency from 15.0
to 14.0.1.
Posted by el...@apache.org.
ACCUMULO-3100 Pull back Guava dependency from 15.0 to 14.0.1.
Hadoop-2 still depends on 14.0.1 and uses some classes that do
not exist in >14.0.1. As such, if we depend on a newer version of
Guava, we're incorrectly advertising that Accumulo fully works
with this version: specifically tests that level MiniDFSCluster
and, specifically, clients who use MiniAccumuloCluster are subject
to failure.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ae01d35b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ae01d35b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ae01d35b
Branch: refs/heads/master
Commit: ae01d35bca216e02c368d675b2e38033b2f6c3f4
Parents: 7eeb08a
Author: Josh Elser <el...@apache.org>
Authored: Mon Sep 8 10:41:26 2014 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Mon Sep 8 10:41:26 2014 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
test/pom.xml | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ae01d35b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ca99168..98501c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>15.0</version>
+ <version>14.0.1</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ae01d35b/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index daf4fbd..196742a 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -34,12 +34,8 @@
<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>