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 A7A4E109A4 for ; Tue, 7 Jan 2014 00:24:26 +0000 (UTC) Received: (qmail 87486 invoked by uid 500); 7 Jan 2014 00:24:26 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 87304 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 86962 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 0D15E38378; Tue, 7 Jan 2014 00:24:25 +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:36 -0000 Message-Id: <9e75f70fb5d848e9bab232b950cf5499@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [13/18] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a91ee4dd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a91ee4dd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a91ee4dd Branch: refs/heads/1.6.0-SNAPSHOT Commit: a91ee4dde68fd96e2fb3014d2a811b860564979e Parents: 65aaddd 71f150a Author: Mike Drob Authored: Mon Jan 6 16:14:20 2014 -0800 Committer: Mike Drob Committed: Mon Jan 6 16:14:20 2014 -0800 ---------------------------------------------------------------------- README | 10 +++++----- pom.xml | 45 ++++++++++++++++++++++++++++++++++++--------- test/pom.xml | 36 +++++++++++++++++++++++++++++------- 3 files changed, 70 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/a91ee4dd/README ---------------------------------------------------------------------- diff --cc README index a100077,f32d606..b0fbcbd --- a/README +++ b/README @@@ -11,21 -11,21 +11,21 @@@ key/value pairs at various points in th 1. Building In the normal tarball or RPM release of accumulo, everything is built and -ready to go on x86 GNU/Linux for Hadoop 0.20.x and Hadoop 1.x: there is no -build step. +ready to go on x86 GNU/Linux: there is no build step. -However, if you only have source code, or you wish to make changes, or you -wish to run under a different version of Hadoop, you need to have Maven -configured to get Accumulo prerequisites from repositories. See the pom.xml -file for the necessary components. +However, if you only have source code, or you wish to make changes, you need to +have maven configured to get Accumulo prerequisites from repositories. See +the pom.xml file for the necessary components. Activate the 'docs' profile to build +the Accumulo developer and user manual. -Run "mvn package && mvn assembly:single -N". By default, Accumulo compiles -against Hadoop 0.20.203.0. To compile against a different version +Run "mvn package -P assemble" to build a distribution, or run +"mvn package -P assemble,docs" to also build the documentation. By default, - Accumulo compiles against Hadoop 1.0.4. To compile against a different version - that is compatible with Hadoop 1.0, specify hadoop.version on the command line, ++Accumulo compiles against Hadoop 1.2.1. To compile against a different version + 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.0.4-alpha. 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 ++2.2.0. To compile against a different 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/a91ee4dd/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 241d116,92d8106..2d5f663 --- a/pom.xml +++ b/pom.xml @@@ -20,337 -21,316 +20,337 @@@ org.apache apache - 10 + 13 - - org.apache.accumulo - accumulo + accumulo-project + 1.5.1-SNAPSHOT pom - 1.4.5-SNAPSHOT - accumulo - + Apache Accumulo Project + Apache Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify key/value pairs at various points in the data management process. + + http://accumulo.apache.org/maven-site/ + + Apache Accumulo Project + http://accumulo.apache.org/ + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + User + user-subscribe@accumulo.apache.org + user-unsubscribe@accumulo.apache.org + user@accumulo.apache.org + http://mail-archives.apache.org/mod_mbox/accumulo-user + + + Dev + dev-subscribe@accumulo.apache.org + dev-unsubscribe@accumulo.apache.org + dev@accumulo.apache.org + http://mail-archives.apache.org/mod_mbox/accumulo-dev + + + Commits + commits-subscribe@accumulo.apache.org + commits-unsubscribe@accumulo.apache.org + http://mail-archives.apache.org/mod_mbox/accumulo-commits + + + Notifications + notifications-subscribe@accumulo.apache.org + notifications-unsubscribe@accumulo.apache.org + http://mail-archives.apache.org/mod_mbox/accumulo-notifications + + + + ${maven.min-version} + - src/trace - src/core - src/server - src/start - src/examples - src/proxy - src/minicluster + trace + core + fate + server + start + examples + assemble + proxy + test + minicluster - - - - - ${basedir}/src/main/resources - - - package - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-mvn - - enforce - - - - - [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. - - - - - - - - maven-clean-plugin - - - - lib - - *.jar - - - - docs/apidocs - - - test - - **/*.so - - - - ./ - - **/*.pyc - - - - - - - com.github.koraktor - mavanagaiata - - - git-commit - validate - - commit - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - process-resources - - copy-dependencies - - - ../../lib - - commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api,guava - true - - - - - - maven-jar-plugin - - ../../lib - - - true - true - - - ${mvngit.commit.id} - - - - cloudtrace/** - org/apache/accumulo**/** - web/** - randomwalk/** - *.* - **/META-INF/* - - - - - maven-resources-plugin - - UTF-8 - - - - maven-assembly-plugin - - - src/assemble/dist.xml - - gnu - - - - maven-compiler-plugin - - 1.6 - 1.6 - true - - - - maven-javadoc-plugin - - UTF-8 - true - lib - docs - 1.6 - -J-Xmx512m - - - - maven-source-plugin - - ../../lib - - - - maven-surefire-plugin - - - ../.. - - - - - org.codehaus.mojo - rpm-maven-plugin - 2.1-alpha-3 - false - - accumulo - ${project.version} - Apache Accumulo BigTable clone - - Apache Accumulo is a large distributed structured store based on - Google's BigTable design. - - 2011 The Apache Software Foundation. - http://accumulo.apache.org - x86_64 - Utilities - - jdk - hadoop - zookeeper - - /opt/accumulo - 755 - 644 - root - root - - - /opt/accumulo/accumulo-${project.version} - - - README - - - - - /opt/accumulo/accumulo-${project.version}/docs - - - docs - - - - - /opt/accumulo/accumulo-${project.version}/test - - - test - - **/walkers.txt - **/ingesters.txt - **/continuous-env.sh - **/*.pyc - - - - - - /opt/accumulo/accumulo-${project.version}/bin - - - /opt/accumulo/accumulo-${project.version}/bin - false - 755 - root - root - - - bin - - - - - /opt/accumulo/accumulo-${project.version}/conf - - - conf - - **/accumulo-site.xml - **/accumulo-env.sh - **/accumulo-metrics.xml - **/test-* - **/slaves - **/masters - **/tracers - **/gc - **/monitor - - - - - - /opt/accumulo/accumulo-${project.version}/lib - - - - lib - - - - - - - - org.codehaus.mojo - exec-maven-plugin - false + + scm:git:git://git.apache.org/accumulo.git + scm:git:https://git-wip-us.apache.org/repos/asf/accumulo.git + https://git-wip-us.apache.org/repos/asf?p=accumulo.git + + + JIRA + https://issues.apache.org/jira/browse/ACCUMULO + + + Apache Jenkins + https://builds.apache.org/view/A-D/view/Accumulo/ + + + + accumulo.mvn.website + Accumulo Maven Site + + scm:svn:https://svn.apache.org/repos/asf/accumulo/site/trunk/maven-site + + + + + ${project.version} - ++ + 1.2.1 + 3.0.1 + + 3.0.4 + 1.5 + UTF-8 + UTF-8 + false - ++ + 1.4.3 + + 3.3.6 + + + + + com.beust + jcommander + 1.30 + + + com.google.code.gson + gson + 2.2.2 + + + com.google.guava + guava + 14.0.1 + + + commons-cli + commons-cli 1.2 - - bash - - docs/src/user_manual/build.sh - - - - - user-manual - prepare-package - - exec - - - - - + + + commons-codec + commons-codec + 1.4 + + + commons-collections + commons-collections + 3.2.1 + + + commons-configuration + commons-configuration + 1.6 + + + commons-httpclient + commons-httpclient + ${httpclient.version} + + + commons-io + commons-io + 2.1 + + + commons-lang + commons-lang + 2.4 + + + commons-logging + commons-logging + 1.1.1 + + + commons-logging + commons-logging-api + 1.0.4 + + + javax.servlet + servlet-api + 2.5 + + + javax.ws.rs + jsr311-api + 1.1.1 + + + jline + jline + 1.0 + + + junit + junit + 4.11 + + + log4j + log4j + 1.2.16 + + + org.apache.accumulo + accumulo-core + ${project.version} + + + org.apache.accumulo + accumulo-examples-simple + ${project.version} + + + org.apache.accumulo + accumulo-fate + ${project.version} + + + org.apache.accumulo + accumulo-minicluster + ${project.version} + + + org.apache.accumulo + accumulo-proxy + ${project.version} + + + org.apache.accumulo + accumulo-server + ${project.version} + + + org.apache.accumulo + accumulo-start + ${project.version} + + + org.apache.accumulo + accumulo-test + ${project.version} + + + org.apache.accumulo + accumulo-trace + ${project.version} + + + org.apache.commons + commons-jci-core + 1.0 + + + org.apache.commons + commons-jci-fam + 1.0 + + + org.apache.commons + commons-math + 2.1 + + + org.apache.commons + commons-vfs2 + 2.0 + + + org.apache.hadoop + hadoop-client + ${hadoop.version} + + + org.apache.hadoop + hadoop-distcp + ${hadoop.version} + + + org.apache.hadoop + hadoop-minicluster + ${hadoop.version} + + + org.apache.hadoop + hadoop-tools + ${hadoop.version} + + + org.apache.thrift + libthrift + 0.9.0 + + + org.apache.zookeeper + zookeeper + ${zookeeper.version} + + + org.easymock + easymock + 3.1 + + + org.mortbay.jetty + jetty + 6.1.26 + + + org.powermock + powermock-api-easymock + ${powermock.version} + + + org.powermock + powermock-core + ${powermock.version} + + + org.powermock + powermock-module-junit4 + ${powermock.version} + + + org.powermock + powermock-reflect + ${powermock.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + + + org.slf4j + slf4j-nop + ${slf4j.version} + + + + @@@ -625,119 -419,18 +625,125 @@@ - - com.github.koraktor - mavanagaiata - 0.6.1 - - true - - + + + + com.google.code.sortpom + maven-sortpom-plugin + + + verify-sorted-pom + + verify + + validate + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + ../lib + + true + runtime + true + sources,test-sources + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-mvn + + enforce + + + + + [${maven.min-version},) + ++ ++ 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. ++ + + + + + + + com.github.koraktor + mavanagaiata + + + git-commit + + commit + + validate + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + run-integration-tests + + integration-test + + integration-test + + + verify-integration-tests + + verify + + verify + + + + + org.apache.maven.plugins + maven-scm-publish-plugin + + + scm-publish + + publish-scm + + site-deploy + + + + + + + + org.apache.maven.wagon + wagon-ssh + 2.4 + + - @@@ -939,31 -711,70 +945,52 @@@ - + + - - hadoop-1.0 + hadoop-default !hadoop.profile + + 1 - 0.20.203.0 + 1.2.1 + 3.0.1 1.4.3 - - - - org.apache.hadoop - hadoop-core - ${hadoop.version} - provided - - - + - - hadoop-2.0 + hadoop-1 hadoop.profile - 2.0 + 1 + + + - 0.20.203.0 ++ 1.2.1 ++ 3.0.1 + 1.4.3 + - - - - org.apache.hadoop - hadoop-core - ${hadoop.version} - provided - - - + + + + hadoop-2 + + + hadoop.profile + 2 http://git-wip-us.apache.org/repos/asf/accumulo/blob/a91ee4dd/test/pom.xml ---------------------------------------------------------------------- diff --cc test/pom.xml index 1d3dce4,0000000..9579581 mode 100644,000000..100644 --- a/test/pom.xml +++ b/test/pom.xml @@@ -1,167 -1,0 +1,189 @@@ + + + + 4.0.0 + + org.apache.accumulo + accumulo-project + 1.5.1-SNAPSHOT + + accumulo-test + Testing + + + com.beust + jcommander + + + jline + jline + + + org.apache.accumulo + accumulo-core + + + org.apache.accumulo + accumulo-fate + + + org.apache.accumulo + accumulo-minicluster + + + org.apache.accumulo + accumulo-server + + + org.apache.accumulo + accumulo-start + + + org.apache.accumulo + accumulo-trace + + + org.apache.thrift + libthrift + + + commons-cli + commons-cli + provided + + + commons-codec + commons-codec + provided + + + commons-io + commons-io + provided + + + log4j + log4j + provided + + + org.apache.commons + commons-math + provided + + + org.apache.hadoop + hadoop-client + provided + + + org.apache.zookeeper + zookeeper + provided + + + org.slf4j + slf4j-api + provided + + + org.slf4j + slf4j-log4j12 + provided + + + junit + junit + test + + + + + + + org.apache.rat + apache-rat-plugin + + + system/bench/lib/*splits + + + + + + + + - - hadoop-1.0 ++ hadoop-default + + + !hadoop.profile + + ++ ++ ++ 1 ++ + + + org.apache.hadoop + hadoop-tools + test + + + ++ + - - hadoop-2.0 ++ hadoop-1 + + + hadoop.profile - 2.0 ++ 1 ++ ++ ++ ++ ++ org.apache.hadoop ++ hadoop-tools ++ test ++ ++ ++ ++ ++ ++ hadoop-2 ++ ++ ++ hadoop.profile ++ 2 + + + + + org.apache.hadoop + hadoop-distcp + test + + + + +