pig-commits mailing list archives

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

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

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

Modified: pig/branches/branch-0.13/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.13/CHANGES.txt?rev=1604937&r1=1604936&r2=1604937&view=diff
==============================================================================
--- pig/branches/branch-0.13/CHANGES.txt (original)
+++ pig/branches/branch-0.13/CHANGES.txt Mon Jun 23 21:09:04 2014
@@ -153,6 +153,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/branches/branch-0.13/build.xml
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.13/build.xml?rev=1604937&r1=1604936&r2=1604937&view=diff
==============================================================================
--- pig/branches/branch-0.13/build.xml (original)
+++ pig/branches/branch-0.13/build.xml Mon Jun 23 21:09:04 2014
@@ -202,6 +202,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
@@ -211,7 +217,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" />
 
     <property name="src.shims.dir" value="${basedir}/shims/src/hadoop${hadoopversion}"
/>
     <property name="src.shims.test.dir" value="${basedir}/shims/test/hadoop${hadoopversion}"
/>

Modified: pig/branches/branch-0.13/ivy.xml
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.13/ivy.xml?rev=1604937&r1=1604936&r2=1604937&view=diff
==============================================================================
--- pig/branches/branch-0.13/ivy.xml (original)
+++ pig/branches/branch-0.13/ivy.xml Mon Jun 23 21:09:04 2014
@@ -331,9 +331,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/branches/branch-0.13/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.13/ivy/libraries.properties?rev=1604937&r1=1604936&r2=1604937&view=diff
==============================================================================
--- pig/branches/branch-0.13/ivy/libraries.properties (original)
+++ pig/branches/branch-0.13/ivy/libraries.properties Mon Jun 23 21:09:04 2014
@@ -43,7 +43,7 @@ hadoop-common.version=2.0.3-alpha
 hadoop-hdfs.version=2.0.3-alpha
 hadoop-mapreduce.version=2.0.3-alpha
 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/branches/branch-0.13/test/excluded-tests-23
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.13/test/excluded-tests-23?rev=1604937&r1=1604936&r2=1604937&view=diff
==============================================================================
--- pig/branches/branch-0.13/test/excluded-tests-23 (original)
+++ pig/branches/branch-0.13/test/excluded-tests-23 Mon Jun 23 21:09:04 2014
@@ -1,2 +1 @@
-**/TestHBaseStorage.java
 **/TestStreamingUDF.java



Mime
View raw message