You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ap...@apache.org on 2014/12/23 03:44:43 UTC
bigtop git commit: PHOENIX-1574 Phoenix packaging requires build and
classpath changes after PHOENIX-1455
Repository: bigtop
Updated Branches:
refs/heads/master 26eb29c98 -> bc80fd447
PHOENIX-1574 Phoenix packaging requires build and classpath changes after PHOENIX-1455
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/bc80fd44
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/bc80fd44
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/bc80fd44
Branch: refs/heads/master
Commit: bc80fd44796c6642c2d349fa7eaab228324779fb
Parents: 26eb29c
Author: Andrew Purtell <ap...@apache.org>
Authored: Mon Dec 22 18:20:05 2014 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Mon Dec 22 18:20:05 2014 -0800
----------------------------------------------------------------------
bigtop-packages/src/common/phoenix/do-component-build | 11 ++++++-----
bigtop-packages/src/common/phoenix/install_phoenix.sh | 6 ++----
bigtop-packages/src/common/phoenix/phoenix.default | 2 +-
bigtop.mk | 4 ++--
pom.xml | 2 +-
5 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/bc80fd44/bigtop-packages/src/common/phoenix/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/phoenix/do-component-build b/bigtop-packages/src/common/phoenix/do-component-build
index 923fbaf..dbc2508 100644
--- a/bigtop-packages/src/common/phoenix/do-component-build
+++ b/bigtop-packages/src/common/phoenix/do-component-build
@@ -18,13 +18,14 @@ set -ex
. `dirname $0`/bigtop.bom
-mvn -DskipTests -Dhadoop.profile=2 \
- -Dhadoop-two.version=$HADOOP_VERSION \
- -Dhbase-hadoop2.version=$HBASE_VERSION-hadoop2 \
+mvn -DskipTests \
+ -Dhadoop.version=$HADOOP_VERSION \
+ -Dhbase.version=$HBASE_VERSION-hadoop2 \
-Dpig.version=$PIG_VERSION \
-Dflume.version=$FLUME_VERSION \
- -Dsnappy.version=1.0.4.1 \
- clean package "$@"
+ clean install package "$@"
rm -rf build
mkdir build
tar -C build --strip-components=1 -xzf phoenix-assembly/target/phoenix-$PHOENIX_VERSION.tar.gz
+# workaround for PHOENIX-1532
+cp -a phoenix-assembly/target/phoenix-$PHOENIX_VERSION-server.jar build/
http://git-wip-us.apache.org/repos/asf/bigtop/blob/bc80fd44/bigtop-packages/src/common/phoenix/install_phoenix.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/phoenix/install_phoenix.sh b/bigtop-packages/src/common/phoenix/install_phoenix.sh
index 34314da..7dddb62 100755
--- a/bigtop-packages/src/common/phoenix/install_phoenix.sh
+++ b/bigtop-packages/src/common/phoenix/install_phoenix.sh
@@ -130,7 +130,5 @@ find $PREFIX/$LIB_DIR -name '*.jar' -exec chmod a-x {} \;
# phoenix-client for clients like sqlline
ln -s `cd $PREFIX/$LIB_DIR ; ls phoenix*-client.jar` $PREFIX/$LIB_DIR/phoenix-client.jar
-# phoenix-core for placing on the HBase regionserver classpath
-cp -af $PREFIX/$LIB_DIR/lib/phoenix-core-*.jar $PREFIX/$LIB_DIR/
-rm $PREFIX/$LIB_DIR/phoenix*-tests.jar
-ln -s `cd $PREFIX/$LIB_DIR ; ls phoenix-core-*.jar` $PREFIX/$LIB_DIR/phoenix-core.jar
+# phoenix-server for placing on the HBase regionserver classpath
+ln -s `cd $PREFIX/$LIB_DIR ; ls phoenix*-server.jar` $PREFIX/$LIB_DIR/phoenix-server.jar
http://git-wip-us.apache.org/repos/asf/bigtop/blob/bc80fd44/bigtop-packages/src/common/phoenix/phoenix.default
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/phoenix/phoenix.default b/bigtop-packages/src/common/phoenix/phoenix.default
index edea51a..4b1f444 100644
--- a/bigtop-packages/src/common/phoenix/phoenix.default
+++ b/bigtop-packages/src/common/phoenix/phoenix.default
@@ -17,4 +17,4 @@ export PHOENIX_HOME="/usr/lib/phoenix"
export PHOENIX_LIB_DIR="$PHOENIX_HOME"
# Add the Phoenix server side jar to the HBase classpath
-export HBASE_CLASSPATH="$HBASE_CLASSPATH $PHOENIX_HOME/phoenix-core.jar"
+export HBASE_CLASSPATH="$HBASE_CLASSPATH $PHOENIX_HOME/phoenix-server.jar"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/bc80fd44/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index 235ce36..043fc9d 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -261,8 +261,8 @@ $(eval $(call PACKAGE,spark,SPARK))
PHOENIX_NAME=phoenix
PHOENIX_RELNOTES_NAME=Phoenix: A SQL skin over HBase
PHOENIX_PKG_NAME=phoenix
-PHOENIX_BASE_VERSION=4.1.0
-PHOENIX_PKG_VERSION=4.1.0
+PHOENIX_BASE_VERSION=4.2.2
+PHOENIX_PKG_VERSION=4.2.2
PHOENIX_RELEASE_VERSION=1
PHOENIX_TARBALL_DST=phoenix-$(PHOENIX_BASE_VERSION)-src.tar.gz
PHOENIX_TARBALL_SRC=$(PHOENIX_TARBALL_DST)
http://git-wip-us.apache.org/repos/asf/bigtop/blob/bc80fd44/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6987fd0..bc0d1d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
<giraph.version>1.0.0</giraph.version>
<solr.version>4.6.0</solr.version>
<spark.version>0.9.1</spark.version>
- <phoenix.version>4.1.0</phoenix.version>
+ <phoenix.version>4.2.2</phoenix.version>
<spark-smoke.version>${project.version}</spark-smoke.version>
<itest-common.version>${project.version}</itest-common.version>