You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by pb...@apache.org on 2018/04/28 18:12:57 UTC
phoenix git commit: PHOENIX-4670 Increase parcel compatibility to
minor versions (addendum)
Repository: phoenix
Updated Branches:
refs/heads/4.x-cdh5.11 fa0fb9e6c -> 01df0cb59
PHOENIX-4670 Increase parcel compatibility to minor versions (addendum)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/01df0cb5
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/01df0cb5
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/01df0cb5
Branch: refs/heads/4.x-cdh5.11
Commit: 01df0cb595aa79e19518105e7b07abbd86bedf19
Parents: fa0fb9e
Author: Pedro Boado <pb...@apache.org>
Authored: Sat Apr 28 18:00:49 2018 +0100
Committer: Pedro Boado <pb...@apache.org>
Committed: Sat Apr 28 18:13:40 2018 +0100
----------------------------------------------------------------------
phoenix-parcel/pom.xml | 2 +-
phoenix-parcel/src/parcel/meta/parcel.json | 4 ++--
phoenix-parcel/src/parcel/meta/phoenix_env.sh | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/01df0cb5/phoenix-parcel/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-parcel/pom.xml b/phoenix-parcel/pom.xml
index 5e6fccc..4615e61 100644
--- a/phoenix-parcel/pom.xml
+++ b/phoenix-parcel/pom.xml
@@ -48,7 +48,7 @@
<parcel.package.version>${phoenix.version}+${cdh.version}+${parcel.patch.count}</parcel.package.version>
<parcel.component.version>${phoenix.version}-${cdh.version}</parcel.component.version>
<parcel.component.release>${cdh.version}.p${parcel.release}</parcel.component.release>
- <parcel.depends>CDH (= ${cdh.minor.version})</parcel.depends>
+ <parcel.depends>CDH (>= ${cdh.minor.version}.0), CDH (<= ${cdh.minor.version}.999)</parcel.depends>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/01df0cb5/phoenix-parcel/src/parcel/meta/parcel.json
----------------------------------------------------------------------
diff --git a/phoenix-parcel/src/parcel/meta/parcel.json b/phoenix-parcel/src/parcel/meta/parcel.json
index 57e4d59..8d4671b 100644
--- a/phoenix-parcel/src/parcel/meta/parcel.json
+++ b/phoenix-parcel/src/parcel/meta/parcel.json
@@ -27,8 +27,8 @@
},
"depends": "${parcel.depends}",
"provides": [
- "phoenix"
+ "hbase-plugin"
],
"setActiveSymlink": true,
"users": {}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/01df0cb5/phoenix-parcel/src/parcel/meta/phoenix_env.sh
----------------------------------------------------------------------
diff --git a/phoenix-parcel/src/parcel/meta/phoenix_env.sh b/phoenix-parcel/src/parcel/meta/phoenix_env.sh
index 4f1f052..fd06855 100755
--- a/phoenix-parcel/src/parcel/meta/phoenix_env.sh
+++ b/phoenix-parcel/src/parcel/meta/phoenix_env.sh
@@ -27,7 +27,7 @@ if [ -z $PARCELS_ROOT ] ; then
export MYDIR=`dirname "${BASH_SOURCE[0]}"`
PARCELS_ROOT=`cd $MYDIR/../.. && pwd`
fi
-PARCEL_DIRNAME=${PARCEL_DIRNAME-PHOENIX}
+PARCEL_DIRNAME=${PARCEL_DIRNAME-APACHE_PHOENIX}
MYLIBDIR=${PARCELS_ROOT}/${PARCEL_DIRNAME}/lib/phoenix