From eebac81f2c249852973902a6b7529ea05e06f7ed Mon Sep 17 00:00:00 2001 From: Anton Chevychalov Date: Mon, 2 Oct 2017 18:55:12 +0300 Subject: [PATCH] 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 --- ...ove-h2-pig-classifier-in-Phoenix-deps.diff | 40 +++++++++++++++++++ .../src/rpm/phoenix/SPECS/phoenix.spec | 2 + 2 files changed, 42 insertions(+) create mode 100644 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 0000000000..a7c69a27fc --- /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 +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 @@ + + org.apache.pig + pig +- h2 + + + org.apache.hbase +diff --git a/pom.xml b/pom.xml +index 0f93146..35dc64e 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -748,7 +748,6 @@ + org.apache.pig + pig + ${pig.version} +- h2 + + + org.xerial.snappy +-- +2.7.4 + diff --git a/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec b/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec index 3f33574cec..a99282e85f 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}