Author: daijy
Date: Tue Apr 28 22:45:29 2015
New Revision: 1676644
URL: http://svn.apache.org/r1676644
Log:
PIG-4494: Pig's htrace version conflicts with that of hadoop 2.6.0
Modified:
pig/trunk/CHANGES.txt
pig/trunk/ivy.xml
pig/trunk/ivy/libraries.properties
Modified: pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1676644&r1=1676643&r2=1676644&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue Apr 28 22:45:29 2015
@@ -74,6 +74,8 @@ PIG-4333: Split BigData tests into multi
BUG FIXES
+PIG-4494: Pig's htrace version conflicts with that of hadoop 2.6.0 (daijy)
+
PIG-4519: Correct link to Contribute page (gliptak via daijy)
PIG-4514: pig trunk compilation is broken -
VertexManagerPluginContext.reconfigureVertex change (thejas)
Modified: pig/trunk/ivy.xml
URL:
http://svn.apache.org/viewvc/pig/trunk/ivy.xml?rev=1676644&r1=1676643&r2=1676644&view=diff
==============================================================================
--- pig/trunk/ivy.xml (original)
+++ pig/trunk/ivy.xml Tue Apr 28 22:45:29 2015
@@ -352,6 +352,9 @@
<exclude org="asm" module="asm"/>
</dependency>
+ <dependency org="org.htrace" name="htrace-core" rev="${htrace.version}"
conf="hadoop23->master"/>
+ <dependency org="org.fusesource.leveldbjni" name="leveldbjni-all"
rev="${leveldbjni.version}"
+ conf="hadoop23->master"/>
<dependency org="org.cloudera.htrace" name="htrace-core" rev="2.00"
conf="hbase95->master">
<artifact name="htrace-core" type="jar"/>
</dependency>
@@ -452,7 +455,10 @@
conf="hadoop23->master"/>
<dependency org="org.apache.commons" name="commons-math3"
rev="${commons-math3.version}"
conf="hadoop23->master"/>
-
+ <dependency org="org.apache.curator" name="curator-framework"
rev="${curator.version}"
+ conf="hadoop23->master"/>
+ <dependency org="org.apache.curator" name="curator-client"
rev="${curator.version}"
+ conf="hadoop23->master"/>
</dependencies>
</ivy-module>
Modified: pig/trunk/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/pig/trunk/ivy/libraries.properties?rev=1676644&r1=1676643&r2=1676644&view=diff
==============================================================================
--- pig/trunk/ivy/libraries.properties (original)
+++ pig/trunk/ivy/libraries.properties Tue Apr 28 22:45:29 2015
@@ -41,9 +41,9 @@ guava.version=11.0
jersey-core.version=1.8
hadoop-core.version=1.0.4
hadoop-test.version=1.0.4
-hadoop-common.version=2.4.0
-hadoop-hdfs.version=2.4.0
-hadoop-mapreduce.version=2.4.0
+hadoop-common.version=2.6.0
+hadoop-hdfs.version=2.6.0
+hadoop-mapreduce.version=2.6.0
hbase94.version=0.94.1
hbase95.version=0.96.0-${hbase.hadoop.version}
hsqldb.version=1.8.0.10
@@ -95,3 +95,6 @@ snappy-java.version=1.1.0.1
tez.version=0.7.0-SNAPSHOT
parquet-pig-bundle.version=1.2.3
snappy.version=0.2
+leveldbjni.version=1.8
+curator.version=2.6.0
+htrace.version=3.0.4
