Updated Branches: refs/heads/flume-1.5 46e365dcb -> 5bfed347d
FLUME-2191. HDFS Minicluster tests failing after protobuf upgrade. (Hari Shreedharan via Arvind Prabhakar) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/5bfed347 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/5bfed347 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/5bfed347 Branch: refs/heads/flume-1.5 Commit: 5bfed347df4ea63dac8bb90016044af806003819 Parents: 46e365d Author: Arvind Prabhakar <[email protected]> Authored: Thu Oct 3 18:25:02 2013 -0700 Committer: Arvind Prabhakar <[email protected]> Committed: Thu Oct 3 18:25:02 2013 -0700 ---------------------------------------------------------------------- flume-ng-sinks/flume-hdfs-sink/pom.xml | 4 ---- pom.xml | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/5bfed347/flume-ng-sinks/flume-hdfs-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-hdfs-sink/pom.xml b/flume-ng-sinks/flume-hdfs-sink/pom.xml index 95fcdea..c646a89 100644 --- a/flume-ng-sinks/flume-hdfs-sink/pom.xml +++ b/flume-ng-sinks/flume-hdfs-sink/pom.xml @@ -142,10 +142,6 @@ limitations under the License. <value>2</value> </property> </activation> - <properties> - <hadoop.version>2.0.0-alpha</hadoop.version> - <hadoop.common.artifact.id>hadoop-common</hadoop.common.artifact.id> - </properties> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/5bfed347/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f0fd22e..267925f 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ limitations under the License. </property> </activation> <properties> - <hadoop.version>2.0.0-alpha</hadoop.version> + <hadoop.version>2.1.0-beta</hadoop.version> <hbase.version>0.94.2</hbase.version> <hadoop.common.artifact.id>hadoop-common</hadoop.common.artifact.id> <thrift.version>0.8.0</thrift.version> @@ -666,7 +666,7 @@ limitations under the License. <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>10.0.1</version> + <version>11.0.2</version> </dependency> <dependency>
