Return-Path: X-Original-To: apmail-phoenix-commits-archive@minotaur.apache.org Delivered-To: apmail-phoenix-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 76C9F183F3 for ; Tue, 21 Jul 2015 22:40:12 +0000 (UTC) Received: (qmail 69905 invoked by uid 500); 21 Jul 2015 22:40:12 -0000 Delivered-To: apmail-phoenix-commits-archive@phoenix.apache.org Received: (qmail 69865 invoked by uid 500); 21 Jul 2015 22:40:12 -0000 Mailing-List: contact commits-help@phoenix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@phoenix.apache.org Delivered-To: mailing list commits@phoenix.apache.org Received: (qmail 69856 invoked by uid 99); 21 Jul 2015 22:40:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Jul 2015 22:40:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 32EE0E07F6; Tue, 21 Jul 2015 22:40:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mujtaba@apache.org To: commits@phoenix.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: phoenix git commit: PHOENIX-2115 Simplify Pherf generated dependency jar and pom.xml Date: Tue, 21 Jul 2015 22:40:12 +0000 (UTC) Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 5f52793b1 -> 4b1b1fb43 PHOENIX-2115 Simplify Pherf generated dependency jar and pom.xml Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4b1b1fb4 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4b1b1fb4 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4b1b1fb4 Branch: refs/heads/4.x-HBase-0.98 Commit: 4b1b1fb43b51e5e7d988379741ec080d0f756150 Parents: 5f52793 Author: Mujtaba Authored: Tue Jul 21 15:39:36 2015 -0700 Committer: Mujtaba Committed: Tue Jul 21 15:39:36 2015 -0700 ---------------------------------------------------------------------- phoenix-pherf/cluster/pherf.sh | 4 +- phoenix-pherf/config/env.sh | 4 +- phoenix-pherf/pom.xml | 526 ++++++------------- phoenix-pherf/src/main/assembly/cluster.xml | 5 +- .../src/main/assembly/components-minimal.xml | 33 ++ phoenix-pherf/src/main/assembly/minimal.xml | 31 ++ phoenix-pherf/src/main/assembly/standalone.xml | 13 +- 7 files changed, 247 insertions(+), 369 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/4b1b1fb4/phoenix-pherf/cluster/pherf.sh ---------------------------------------------------------------------- diff --git a/phoenix-pherf/cluster/pherf.sh b/phoenix-pherf/cluster/pherf.sh index 8d58dfe..2e0913e 100755 --- a/phoenix-pherf/cluster/pherf.sh +++ b/phoenix-pherf/cluster/pherf.sh @@ -17,7 +17,7 @@ # limitations under the License. source config/env.sh -HBASE_CLASSPATH=`$HBASE_ROOT/hbase/hbase/bin/hbase classpath` +HBASE_CLASSPATH=`$HBASE_PATH/bin/hbase classpath` PHERF_HOME=$(cd "`dirname $0`" && pwd) @@ -30,4 +30,4 @@ done CMD="time ${JAVA_HOME}/bin/java ${REMOTE_DEBUG} -Dapp.home=${PHERF_HOME} ${ENV_PROPS} -Xms512m -Xmx3072m -cp ${CLASSPATH} org.apache.phoenix.pherf.Pherf ${@}" -eval $CMD \ No newline at end of file +eval $CMD http://git-wip-us.apache.org/repos/asf/phoenix/blob/4b1b1fb4/phoenix-pherf/config/env.sh ---------------------------------------------------------------------- diff --git a/phoenix-pherf/config/env.sh b/phoenix-pherf/config/env.sh index 0979415..b8115b6 100644 --- a/phoenix-pherf/config/env.sh +++ b/phoenix-pherf/config/env.sh @@ -19,11 +19,11 @@ # Required variable to point to Java installation JAVA_HOME= -# Absolute path the the unzipped root directory of the HBase installation +# Absolute path the the unzipped directory of the HBase installation # This is required if you build using the default or cluster profile # Cluster profile assumes you want to pick up dependencies from HBase classpath # Not required in standalone. -HBASE_ROOT= +HBASE_PATH= # Add a space seperated list of -D environment args. "-Dkey1-val1 -Dkey2=val2" ENV_PROPS="" http://git-wip-us.apache.org/repos/asf/phoenix/blob/4b1b1fb4/phoenix-pherf/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 9bdd583..30c6171 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -1,363 +1,179 @@ - - - 4.0.0 - - org.apache.phoenix - phoenix - 4.5.0-HBase-0.98-SNAPSHOT - + + + 4.0.0 + + org.apache.phoenix + phoenix + 4.5.0-HBase-0.98-SNAPSHOT + - phoenix-pherf - jar - Phoenix - Pherf + phoenix-pherf + jar + Phoenix - Pherf - - ${project.basedir}/.. - + + ${project.basedir}/.. + - - - standalone - - true - - - - - src/main/resources - - - - - src/test/resources - - - ${project.basedir}/config - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.apache.maven.plugins - maven-resources-plugin - - - maven-assembly-plugin - - - make-dependency-jar - package - - single - - - - jar-with-dependencies - - - - org.apache.phoenix.pherf.Pherf - - - - - - make-assembly - package - - single - - - - src/main/assembly/standalone.xml - - - - - - - - + + + apache release + https://repository.apache.org/content/repositories/releases/ + + - - - cluster - - true - - - - - src/main/resources - - - - - src/test/resources - - - ${project.basedir}/config - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.apache.maven.plugins - maven-resources-plugin - - - maven-assembly-plugin - - - make-dependency-jar - package - - single - - - - jar-with-dependencies - - - - org.apache.phoenix.pherf.Pherf - - - - - - make-assembly - package - - single - - - - src/main/assembly/cluster.xml - - - - - - - - + + + org.apache.phoenix + phoenix-core + + + org.apache.phoenix + phoenix-core + tests + test + + + org.jfree + jfreechart + 1.0.19 + + + com.googlecode.java-diff-utils + diffutils + 1.2.1 + + + org.apache.commons + commons-lang3 + 3.3.2 + + + org.apache.commons + commons-math3 + 3.3 + - - - - apache release - https://repository.apache.org/content/repositories/releases/ - - - - - org.apache.phoenix - phoenix-core - - - org.apache.phoenix - phoenix-core - tests - test - - - com.google.guava - guava - 14.0.1 - - - commons-io - commons-io - 2.4 - - - commons-cli - commons-cli - 1.2 - - - org.apache.commons - commons-lang3 - 3.3.2 - - - org.apache.commons - commons-math3 - 3.3 - - - org.jfree - jfreechart - 1.0.19 - - - joda-time - joda-time - ${jodatime.version} - - - com.googlecode.java-diff-utils - diffutils - 1.2.1 - - - org.slf4j - slf4j-log4j12 - 1.7.10 - + + + junit + junit + 4.11 + test + + + com.jcabi + jcabi-jdbc + 0.15 + + + org.hamcrest + hamcrest-junit + 1.0.0.0 + test + + + com.github.stefanbirkner + system-rules + 1.8.0 + + - - - com.jcabi - jcabi-jdbc - 0.15 - - - junit - junit - 4.11 - test - - - org.hamcrest - hamcrest-junit - 1.0.0.0 - test - - - com.github.stefanbirkner - system-rules - 1.8.0 - - - org.apache.hbase - hbase-testing-util - ${hbase.version} - test - true - - - org.jruby - jruby-complete - - - - - org.apache.hbase - hbase-it - ${hbase.version} - test-jar - test - - - org.jruby - jruby-complete - - - - - org.apache.hbase - hbase-common - ${hbase.version} - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - - org.apache.hbase - hbase-client - ${hbase.version} - - - org.apache.hbase - hbase-hadoop-compat - ${hbase.version} - test - - - org.apache.hbase - hbase-hadoop-compat - ${hbase.version} - test-jar - test - - - org.apache.hbase - hbase-hadoop2-compat - ${hbase.version} - test - - - org.apache.hbase - hbase-hadoop2-compat - ${hbase.version} - test-jar - test - - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-mapreduce-client-core - - - org.apache.hadoop - hadoop-minicluster - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - org.apache.maven.plugins - maven-failsafe-plugin - - - maven-dependency-plugin - ${maven-dependency-plugin.version} - + + + + src/main/resources + + + + + src/test/resources + + + ${project.basedir}/config + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + + + maven-dependency-plugin + ${maven-dependency-plugin.version} + - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - - + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-resources-plugin + + + maven-assembly-plugin + + + make-dependency-jar + package + + single + + + + jar-with-dependencies + + + + org.apache.phoenix.pherf.Pherf + + + + + + make-assembly + package + + single + + + + + src/main/assembly/minimal.xml + + src/main/assembly/standalone.xml + + src/main/assembly/cluster.xml + + + + + + + http://git-wip-us.apache.org/repos/asf/phoenix/blob/4b1b1fb4/phoenix-pherf/src/main/assembly/cluster.xml ---------------------------------------------------------------------- diff --git a/phoenix-pherf/src/main/assembly/cluster.xml b/phoenix-pherf/src/main/assembly/cluster.xml index 961240a..c870309 100644 --- a/phoenix-pherf/src/main/assembly/cluster.xml +++ b/phoenix-pherf/src/main/assembly/cluster.xml @@ -38,15 +38,14 @@ pherf-${project.version}-cluster/ *sh - *dependencies.jar ${project.build.directory} pherf-${project.version}-cluster/lib - *dependencies.jar + *minimal.jar - \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/phoenix/blob/4b1b1fb4/phoenix-pherf/src/main/assembly/components-minimal.xml ---------------------------------------------------------------------- diff --git a/phoenix-pherf/src/main/assembly/components-minimal.xml b/phoenix-pherf/src/main/assembly/components-minimal.xml new file mode 100644 index 0000000..38c6929 --- /dev/null +++ b/phoenix-pherf/src/main/assembly/components-minimal.xml @@ -0,0 +1,33 @@ + + + + + + true + / + + org.apache.phoenix:phoenix-pherf + org.jfree:jfreechart + com.googlecode.java-diff-utils:diffutils + org.apache.commons:commons-lang3 + org.apache.commons:commons-math3 + + + + http://git-wip-us.apache.org/repos/asf/phoenix/blob/4b1b1fb4/phoenix-pherf/src/main/assembly/minimal.xml ---------------------------------------------------------------------- diff --git a/phoenix-pherf/src/main/assembly/minimal.xml b/phoenix-pherf/src/main/assembly/minimal.xml new file mode 100644 index 0000000..5b1f482 --- /dev/null +++ b/phoenix-pherf/src/main/assembly/minimal.xml @@ -0,0 +1,31 @@ + + + + minimal + / + + jar + + false + + src/main/assembly/components-minimal.xml + + http://git-wip-us.apache.org/repos/asf/phoenix/blob/4b1b1fb4/phoenix-pherf/src/main/assembly/standalone.xml ---------------------------------------------------------------------- diff --git a/phoenix-pherf/src/main/assembly/standalone.xml b/phoenix-pherf/src/main/assembly/standalone.xml index 7163427..dfeb921 100644 --- a/phoenix-pherf/src/main/assembly/standalone.xml +++ b/phoenix-pherf/src/main/assembly/standalone.xml @@ -40,13 +40,12 @@ *sh - - - - false + + ${project.build.directory} pherf-${project.version}-standalone/lib + *dependencies.jar - - - \ No newline at end of file + + +