PIG-4728: Compilation against hbase 1.x fails with hbase-hadoop1-compat not found (szita via rohini)
git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1778589 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 83c0cc7..2cd0109 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -22,6 +22,8 @@
INCOMPATIBLE CHANGES
+PIG-4728: Compilation against hbase 1.x fails with hbase-hadoop1-compat not found (szita via rohini)
+
PIG-4897: Scope of param substitution for run/exec commands (knoguchi)
PIG-4923: Drop Hadoop 1.x support in Pig 0.17 (szita via rohini)
diff --git a/build.xml b/build.xml
index df5bcdd..1786b26 100644
--- a/build.xml
+++ b/build.xml
@@ -703,7 +703,9 @@
<fileset dir="${ivy.lib.dir}" includes="jruby-*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="groovy-*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="js-*.jar"/>
- <fileset dir="${ivy.lib.dir}" includes="hbase-*.jar" excludes="hbase-*tests.jar,hbase-*hadoop*.jar"/>
+ <fileset dir="${ivy.lib.dir}" includes="htrace-core*incubating.jar"/>
+ <fileset dir="${ivy.lib.dir}" includes="metrics-core-*.jar"/>
+ <fileset dir="${ivy.lib.dir}" includes="hbase-*.jar" excludes="hbase-*tests.jar,hbase-*hadoop2*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="hive-*.jar" excludes="hive-shims-0.*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="protobuf-java-*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="zookeeper-*.jar"/>
@@ -721,7 +723,7 @@
<copy todir="${lib.dir}/h2">
<fileset dir="${ivy.lib.dir}" includes="avro-mapred-*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="hive-shims-0.*.jar"/>
- <fileset dir="${ivy.lib.dir}" includes="hbase-*hadoop2.jar"/>
+ <fileset dir="${ivy.lib.dir}" includes="hbase-hadoop2*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="tez-*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="commons-collections4-*.jar"/>
</copy>
diff --git a/ivy.xml b/ivy.xml
index 23d3865..42daec9 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -337,10 +337,7 @@
<dependency org="com.lmax" name="disruptor" rev="3.3.0" conf="hbase1->master"/>
<!-- for TestHBaseStorage -->
- <dependency org="com.github.stephenc.high-scale-lib" name="high-scale-lib" rev="${high-scale-lib.version}"
- conf="test->default"/>
- <dependency org="com.google.protobuf" name="protobuf-java" rev="${protobuf-java.version}"
- conf="test->default"/>
+ <dependency org="org.apache.hbase" name="hbase-procedure" rev="${hbase1.version}" conf="test->master"/>
<dependency org="com.yammer.metrics" name="metrics-core" rev="${metrics-core.version}"
conf="test->default"/>
diff --git a/ivy/libraries.properties b/ivy/libraries.properties
index b73d6d7..289ef45 100644
--- a/ivy/libraries.properties
+++ b/ivy/libraries.properties
@@ -42,7 +42,7 @@
hadoop-common.version=2.7.3
hadoop-hdfs.version=2.7.3
hadoop-mapreduce.version=2.7.3
-hbase1.version=0.98.12-hadoop2
+hbase1.version=1.2.4
hsqldb.version=1.8.0.10
hive.version=1.2.1
httpcomponents.version=4.1
@@ -80,7 +80,6 @@
servlet.version=4.0.6
servlet-api.version=2.5
protobuf-java.version=2.5.0
-high-scale-lib.version=1.1.1
metrics-core.version=2.1.2
guice.version=3.0
guice-servlet.version=3.0
