Return-Path: 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 82FC11099B for ; Tue, 7 Jan 2014 00:24:26 +0000 (UTC) Received: (qmail 87140 invoked by uid 500); 7 Jan 2014 00:24:25 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 87032 invoked by uid 500); 7 Jan 2014 00:24:25 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 86772 invoked by uid 99); 7 Jan 2014 00:24:25 -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, 07 Jan 2014 00:24:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E49EB38370; Tue, 7 Jan 2014 00:24:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mdrob@apache.org To: commits@accumulo.apache.org Date: Tue, 07 Jan 2014 00:24:32 -0000 Message-Id: <70ceb101c31845f7a3a17ab109cb8547@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [09/18] git commit: ACCUMULO-2126 Hadoop profile names should be consistent across branches. ACCUMULO-2126 Hadoop profile names should be consistent across branches. Changes naming scheme to be by Hadoop generation, i.e. hadoop-1 and hadoop-2. Adds ability to either rely on default or to specify default by profile, i.e. hadoop.profile=1 on 1.4. Adds a more helpful error message when the provided hadoop.profile doesn't match one of our expected options. Signed-off-by: Mike Drob Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/71f150a7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/71f150a7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/71f150a7 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 71f150a777f9fb125fd72e51a23b11ed1f48d5c2 Parents: 65d5fba Author: Sean Busbey Authored: Thu Jan 2 16:54:03 2014 -0600 Committer: Mike Drob Committed: Mon Jan 6 15:58:05 2014 -0800 ---------------------------------------------------------------------- README | 8 +++--- pom.xml | 54 +++++++++++++++++++++++++++++++++------- src/core/pom.xml | 35 ++++++++++++++++++++------ src/examples/simple/pom.xml | 35 ++++++++++++++++++++------ src/minicluster/pom.xml | 35 ++++++++++++++++++++------ src/proxy/pom.xml | 35 ++++++++++++++++++++------ src/server/pom.xml | 35 ++++++++++++++++++++------ src/start/pom.xml | 35 ++++++++++++++++++++------ 8 files changed, 217 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/71f150a7/README ---------------------------------------------------------------------- diff --git a/README b/README index 08bac4c..f32d606 100644 --- a/README +++ b/README @@ -21,11 +21,11 @@ file for the necessary components. Run "mvn package && mvn assembly:single -N". By default, Accumulo compiles against Hadoop 0.20.203.0. To compile against a different version -that is compatible with Hadoop 1.0, specify hadoop.version on the command line, +that is compatible with Hadoop 1, specify hadoop.version on the command line, e.g. "-Dhadoop.version=0.20.205.0" or "-Dhadoop.version=1.1.0". To compile -against Hadoop 2.0, specify "-Dhadoop.profile=2.0". By default this uses -2.2.0. To compile against a different 2.0-compatible version, specify -the profile and version, e.g. "-Dhadoop.profile=2.0 -Dhadoop.version=0.23.5". +against Hadoop 2, specify "-Dhadoop.profile=2". By default this uses +2.2.0. To compile against a different Hadoop 2-compatible version, specify +the profile and version, e.g. "-Dhadoop.profile=2 -Dhadoop.version=0.23.5". If you are running on another Unix-like operating system (OSX, etc) then you may wish to build the native libraries. They are not strictly necessary http://git-wip-us.apache.org/repos/asf/accumulo/blob/71f150a7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7d3dc82..92d8106 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,12 @@ [2.0.9,) + + hadoop.profile + (1|2) + You should specify the Hadoop profile by major Hadoop generation, i.e. 1 or 2, not by a version number. + Use hadoop.version to use a particular Hadoop version within that generation. See README for more details. + @@ -707,16 +713,20 @@ - + - hadoop-1.0 + hadoop-default !hadoop.profile + + 1 0.20.203.0 1.4.3 @@ -731,14 +741,40 @@ - + - hadoop-2.0 + hadoop-1 hadoop.profile - 2.0 + 1 + + + + 0.20.203.0 + 1.4.3 + + + + + org.apache.hadoop + hadoop-core + ${hadoop.version} + provided + + + + + + + hadoop-2 + + + hadoop.profile + 2 @@ -943,9 +979,9 @@ 1.6 - + 0.20.203.0 - + 1.4.3 3.3.1 http://git-wip-us.apache.org/repos/asf/accumulo/blob/71f150a7/src/core/pom.xml ---------------------------------------------------------------------- diff --git a/src/core/pom.xml b/src/core/pom.xml index 77a4a72..11ce09b 100644 --- a/src/core/pom.xml +++ b/src/core/pom.xml @@ -78,15 +78,18 @@ - - hadoop-1.0 + hadoop-default !hadoop.profile + + + 1 + org.apache.hadoop @@ -94,14 +97,32 @@ - + - hadoop-2.0 + hadoop-1 hadoop.profile - 2.0 + 1 + + + + + org.apache.hadoop + hadoop-core + + + + + + hadoop-2 + + + hadoop.profile + 2 http://git-wip-us.apache.org/repos/asf/accumulo/blob/71f150a7/src/examples/simple/pom.xml ---------------------------------------------------------------------- diff --git a/src/examples/simple/pom.xml b/src/examples/simple/pom.xml index 6834b87..6ef7741 100644 --- a/src/examples/simple/pom.xml +++ b/src/examples/simple/pom.xml @@ -30,15 +30,18 @@ examples-simple - - hadoop-1.0 + hadoop-default !hadoop.profile + + + 1 + org.apache.hadoop @@ -46,14 +49,32 @@ - + - hadoop-2.0 + hadoop-1 hadoop.profile - 2.0 + 1 + + + + + org.apache.hadoop + hadoop-core + + + + + + hadoop-2 + + + hadoop.profile + 2 http://git-wip-us.apache.org/repos/asf/accumulo/blob/71f150a7/src/minicluster/pom.xml ---------------------------------------------------------------------- diff --git a/src/minicluster/pom.xml b/src/minicluster/pom.xml index 3c8843d..a956fdd 100644 --- a/src/minicluster/pom.xml +++ b/src/minicluster/pom.xml @@ -51,15 +51,18 @@ - - hadoop-1.0 + hadoop-default !hadoop.profile + + + 1 + org.apache.hadoop @@ -67,14 +70,32 @@ - + - hadoop-2.0 + hadoop-1 hadoop.profile - 2.0 + 1 + + + + + org.apache.hadoop + hadoop-core + + + + + + hadoop-2 + + + hadoop.profile + 2 http://git-wip-us.apache.org/repos/asf/accumulo/blob/71f150a7/src/proxy/pom.xml ---------------------------------------------------------------------- diff --git a/src/proxy/pom.xml b/src/proxy/pom.xml index eb88e6b..466d88a 100644 --- a/src/proxy/pom.xml +++ b/src/proxy/pom.xml @@ -119,15 +119,18 @@ - - hadoop-1.0 + hadoop-default !hadoop.profile + + + 1 + org.apache.hadoop @@ -135,14 +138,32 @@ - + - hadoop-2.0 + hadoop-1 hadoop.profile - 2.0 + 1 + + + + + org.apache.hadoop + hadoop-core + + + + + + hadoop-2 + + + hadoop.profile + 2 http://git-wip-us.apache.org/repos/asf/accumulo/blob/71f150a7/src/server/pom.xml ---------------------------------------------------------------------- diff --git a/src/server/pom.xml b/src/server/pom.xml index 672a6d3..b58affc 100644 --- a/src/server/pom.xml +++ b/src/server/pom.xml @@ -111,15 +111,18 @@ - - hadoop-1.0 + hadoop-default !hadoop.profile + + + 1 + org.apache.hadoop @@ -127,14 +130,32 @@ - + - hadoop-2.0 + hadoop-1 hadoop.profile - 2.0 + 1 + + + + + org.apache.hadoop + hadoop-core + + + + + + hadoop-2 + + + hadoop.profile + 2 http://git-wip-us.apache.org/repos/asf/accumulo/blob/71f150a7/src/start/pom.xml ---------------------------------------------------------------------- diff --git a/src/start/pom.xml b/src/start/pom.xml index de3be18..69a9ca7 100644 --- a/src/start/pom.xml +++ b/src/start/pom.xml @@ -51,15 +51,18 @@ - - hadoop-1.0 + hadoop-default !hadoop.profile + + + 1 + org.apache.hadoop @@ -67,14 +70,32 @@ - + - hadoop-2.0 + hadoop-1 hadoop.profile - 2.0 + 1 + + + + + org.apache.hadoop + hadoop-core + + + + + + hadoop-2 + + + hadoop.profile + 2