Return-Path: 
 <commits-return-6474-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
X-Original-To: apmail-accumulo-commits-archive@www.apache.org
Delivered-To: apmail-accumulo-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A5FE510958
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Tue, 26 Nov 2013 15:47:40 +0000 (UTC)
Received: (qmail 32990 invoked by uid 500); 26 Nov 2013 15:47:25 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 32478 invoked by uid 500); 26 Nov 2013 15:47:13 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 31859 invoked by uid 99); 26 Nov 2013 15:47:06 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Nov 2013 15:47:06 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id C7B009185E0; Tue, 26 Nov 2013 15:47:06 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ecn@apache.org
To: commits@accumulo.apache.org
Date: Tue, 26 Nov 2013 15:47:37 -0000
Message-Id: <ca0f8bf429c14ba1a4033a25e1ed5675@git.apache.org>
In-Reply-To: <a7d2dfbd63d94a518ef521d5b0aaba96@git.apache.org>
References: <a7d2dfbd63d94a518ef521d5b0aaba96@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [33/38] git commit: ACCUMULO-1876 Add default values for
 hadoop.version and httpclient.version to make ivy work.

ACCUMULO-1876 Add default values for hadoop.version and httpclient.version to make ivy work.

(cherry picked from commit 20cbf248e27069c0c05a595342de73e9ecc43743)

Differs from original by changing Hadoop version to match current pom and leaving out dependencies not yet declared in profiles.

Reason: bugfix
Author: Josh Elser <elserj@apache.org>
Ref: ACCUMULO-1792

Signed-off-by: Eric Newton <eric.newton@gmail.com>


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 6446ad5c20fec4b4506a01ac259c26d08974faf4
Parents: c093974
Author: Josh Elser <elserj@apache.org>
Authored: Fri Nov 15 16:39:11 2013 -0600
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Mon Nov 25 16:06:44 2013 -0500

----------------------------------------------------------------------
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6446ad5c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index eda8390..d664a5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -869,6 +869,8 @@
   <properties>
     <targetJdk>1.6</targetJdk>
     <!-- overwritten in profiles hadoop-1.0 or hadoop-2.0 -->
+    <hadoop.version>1.0.4</hadoop.version>
+    <!-- overwritten in profiles hadoop-1.0 or hadoop-2.0 -->
     <slf4j.version>1.4.3</slf4j.version>
     <zookeeper.version>3.3.1</zookeeper.version>
   </properties>