pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject svn commit: r1604938 - in /pig/trunk: CHANGES.txt build.xml ivy.xml ivy/libraries.properties test/excluded-tests-23
Date Mon, 23 Jun 2014 21:09:45 GMT
Author: daijy
Date: Mon Jun 23 21:09:44 2014
New Revision: 1604938

URL: http://svn.apache.org/r1604938
Log:
PIG-4005: depend on hbase-hadoop2-compat rather than hbase-hadoop1-compat when hbaseversion
is 95

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/build.xml
    pig/trunk/ivy.xml
    pig/trunk/ivy/libraries.properties
    pig/trunk/test/excluded-tests-23

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1604938&r1=1604937&r2=1604938&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Jun 23 21:09:44 2014
@@ -225,6 +225,8 @@ PIG-3882: Multiquery off mode execution 
  
 BUG FIXES
 
+PIG-4005: depend on hbase-hadoop2-compat rather than hbase-hadoop1-compat when hbaseversion
is 95 (daijy)
+
 PIG-4021: Fix TestHBaseStorage failure after auto local mode change (PIG-3463) (daijy)
 
 PIG-4029: TestMRCompiler is broken after PIG-3874 (daijy)

Modified: pig/trunk/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1604938&r1=1604937&r2=1604938&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Mon Jun 23 21:09:44 2014
@@ -205,6 +205,12 @@
         <equals arg1="${hadoopversion}" arg2="23"/>
     </condition>
 
+    <condition property="hbase.hadoop.version" value="hadoop1" else="hadoop2">
+        <not>
+            <equals arg1="${hadoopversion}" arg2="23"/>
+        </not>
+    </condition>
+
     <!--
       HBase master version
       Denotes how the HBase dependencies are layout. Value "94" denotes older
@@ -214,7 +220,7 @@
       e.g. "client", "server", ... . Only values "94" and "95" are supported
       at the moment.
     -->
-    <property name="hbaseversion" value="94" />
+    <property name="hbaseversion" value="95" />
 
     <!-- exclude tez code if not hadoop20 -->
     <condition property="src.exclude.dir" value="**/tez/**" else="">

Modified: pig/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/pig/trunk/ivy.xml?rev=1604938&r1=1604937&r2=1604938&view=diff
==============================================================================
--- pig/trunk/ivy.xml (original)
+++ pig/trunk/ivy.xml Mon Jun 23 21:09:44 2014
@@ -333,9 +333,9 @@
       <artifact name="hbase-hadoop-compat" type="test-jar" ext="jar" m:classifier="tests"/>
     </dependency>
 
-    <dependency org="org.apache.hbase" name="hbase-hadoop1-compat" rev="${hbase95.version}"
conf="hbase95->master">
-      <artifact name="hbase-hadoop1-compat" type="jar"/>
-      <artifact name="hbase-hadoop1-compat" type="test-jar" ext="jar" m:classifier="tests"/>
+    <dependency org="org.apache.hbase" name="hbase-${hbase.hadoop.version}-compat" rev="${hbase95.version}"
conf="hbase95->master">
+      <artifact name="hbase-${hbase.hadoop.version}-compat" type="jar"/>
+      <artifact name="hbase-${hbase.hadoop.version}-compat" type="test-jar" ext="jar"
m:classifier="tests"/>
       <exclude org="org.apache.hadoop" module="hadoop-core"/>
       <exclude org="org.slf4j" module="slf4j-api"/>
       <exclude org="stax" module="stax-api" />

Modified: pig/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/pig/trunk/ivy/libraries.properties?rev=1604938&r1=1604937&r2=1604938&view=diff
==============================================================================
--- pig/trunk/ivy/libraries.properties (original)
+++ pig/trunk/ivy/libraries.properties Mon Jun 23 21:09:44 2014
@@ -44,7 +44,7 @@ hadoop-common.version=2.4.0
 hadoop-hdfs.version=2.4.0
 hadoop-mapreduce.version=2.4.0
 hbase94.version=0.94.1
-hbase95.version=0.96.0-hadoop1
+hbase95.version=0.96.0-${hbase.hadoop.version}
 hsqldb.version=1.8.0.10
 hive.version=0.8.0
 httpcomponents.version=4.1

Modified: pig/trunk/test/excluded-tests-23
URL: http://svn.apache.org/viewvc/pig/trunk/test/excluded-tests-23?rev=1604938&r1=1604937&r2=1604938&view=diff
==============================================================================
--- pig/trunk/test/excluded-tests-23 (original)
+++ pig/trunk/test/excluded-tests-23 Mon Jun 23 21:09:44 2014
@@ -1 +0,0 @@
-**/TestHBaseStorage.java



Mime
View raw message