Repository: bigtop Updated Branches: refs/heads/master 932bfb44f -> 8cf130ccf
BIGTOP-2898 Remove h2 pig classifier in Phoenix There is a regression in Pig relase 0.17 After PIG-4923 they drop h2 classifer. There is only one jar now and it suports Hadoop 2 That commit also adds BIGTOP_PATCH macro to Phoenix Signed-off-by: Youngwoo Kim <yw...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/8cf130cc Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/8cf130cc Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/8cf130cc Branch: refs/heads/master Commit: 8cf130ccfbe7bcffe8ea83ba9465cdedf89f130f Parents: 932bfb4 Author: Anton Chevychalov <c...@arenadata.io> Authored: Mon Oct 2 18:55:12 2017 +0300 Committer: Youngwoo Kim <yw...@apache.org> Committed: Mon Dec 25 15:00:00 2017 +0900 ---------------------------------------------------------------------- ...emove-h2-pig-classifier-in-Phoenix-deps.diff | 40 ++++++++++++++++++++ .../src/rpm/phoenix/SPECS/phoenix.spec | 2 + 2 files changed, 42 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/8cf130cc/bigtop-packages/src/common/phoenix/patch0-ADH-207-Remove-h2-pig-classifier-in-Phoenix-deps.diff ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/phoenix/patch0-ADH-207-Remove-h2-pig-classifier-in-Phoenix-deps.diff b/bigtop-packages/src/common/phoenix/patch0-ADH-207-Remove-h2-pig-classifier-in-Phoenix-deps.diff new file mode 100644 index 0000000..a7c69a2 --- /dev/null +++ b/bigtop-packages/src/common/phoenix/patch0-ADH-207-Remove-h2-pig-classifier-in-Phoenix-deps.diff @@ -0,0 +1,40 @@ +From 401934c00d7184a05c308bc219a4597ba4e3dce2 Mon Sep 17 00:00:00 2001 +From: Anton Chevychalov <c...@arenadata.io> +Date: Thu, 28 Sep 2017 19:06:07 +0300 +Subject: [PATCH] ADH-207 Remove h2 pig classifier in Phoenix deps + +There is a regression in Pig relase 0.17 +After PIG-4923 they drop h2 classifer. +There is only one jar now and it suports Hadoop 2 +--- + phoenix-pig/pom.xml | 1 - + pom.xml | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml +index aed4a9d..77d2e23 100644 +--- a/phoenix-pig/pom.xml ++++ b/phoenix-pig/pom.xml +@@ -54,7 +54,6 @@ + <dependency> + <groupId>org.apache.pig</groupId> + <artifactId>pig</artifactId> +- <classifier>h2</classifier> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> +diff --git a/pom.xml b/pom.xml +index 0f93146..35dc64e 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -748,7 +748,6 @@ + <groupId>org.apache.pig</groupId> + <artifactId>pig</artifactId> + <version>${pig.version}</version> +- <classifier>h2</classifier> + <exclusions> + <exclusion> + <groupId>org.xerial.snappy</groupId> +-- +2.7.4 + http://git-wip-us.apache.org/repos/asf/bigtop/blob/8cf130cc/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec b/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec index 3f33574..a99282e 100644 --- a/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec +++ b/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec @@ -25,6 +25,7 @@ %define hadoop_yarn_home /usr/lib/hadoop-yarn %define hadoop_hdfs_home /usr/lib/hadoop-hdfs %define hbase_home /usr/lib/hbase +#BIGTOP_PATCH_FILES %if %{?suse_version:1}0 @@ -117,6 +118,7 @@ other than the JVM. %prep %setup -n apache-%{name}-%{phoenix_base_version}-src +#BIGTOP_PATCH_COMMANDS %build bash %{SOURCE1}
