aboutsummaryrefslogtreecommitdiff
path: root/pom.xml
diff options
context:
space:
mode:
authorSean Owen <sowen@cloudera.com>2015-01-12 12:15:34 -0800
committerPatrick Wendell <pwendell@gmail.com>2015-01-12 12:15:34 -0800
commitaff49a3ee1a91d730590f4a0b9ac485fd52dc8bf (patch)
tree41903eb4f837e9111594f72c965aca57c254f386 /pom.xml
parenta3978f3e156e0ca67e978f1795b238ddd69ff9a6 (diff)
downloadspark-aff49a3ee1a91d730590f4a0b9ac485fd52dc8bf.tar.gz
spark-aff49a3ee1a91d730590f4a0b9ac485fd52dc8bf.tar.bz2
spark-aff49a3ee1a91d730590f4a0b9ac485fd52dc8bf.zip
SPARK-5172 [BUILD] spark-examples-***.jar shades a wrong Hadoop distribution
In addition to the `hadoop-2.x` profiles in the parent POM, there is actually another set of profiles in `examples` that has to be activated differently to get the right Hadoop 1 vs 2 flavor of HBase. This wasn't actually used in making Hadoop 2 distributions, hence the problem. To reduce complexity, I suggest merging them with the parent POM profiles, which is possible now. You'll see this changes appears to update the HBase version, but actually, the default 0.94 version was not being used. HBase is only used in examples, and the examples POM always chose one profile or the other that updated the version to 0.98.x anyway. Author: Sean Owen <sowen@cloudera.com> Closes #3992 from srowen/SPARK-5172 and squashes the following commits: 17830d9 [Sean Owen] Control hbase hadoop1/2 flavor in the parent POM with existing hadoop-2.x profiles
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml5
1 files changed, 4 insertions, 1 deletions
diff --git a/pom.xml b/pom.xml
index 0403c008be..f4466e56c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
<hadoop.version>1.0.4</hadoop.version>
<protobuf.version>2.4.1</protobuf.version>
<yarn.version>${hadoop.version}</yarn.version>
- <hbase.version>0.94.6</hbase.version>
+ <hbase.version>0.98.7-hadoop1</hbase.version>
<hbase.artifact>hbase</hbase.artifact>
<flume.version>1.4.0</flume.version>
<zookeeper.version>3.4.5</zookeeper.version>
@@ -1466,6 +1466,7 @@
<properties>
<hadoop.version>2.2.0</hadoop.version>
<protobuf.version>2.5.0</protobuf.version>
+ <hbase.version>0.98.7-hadoop2</hbase.version>
<avro.mapred.classifier>hadoop2</avro.mapred.classifier>
</properties>
</profile>
@@ -1476,6 +1477,7 @@
<hadoop.version>2.3.0</hadoop.version>
<protobuf.version>2.5.0</protobuf.version>
<jets3t.version>0.9.0</jets3t.version>
+ <hbase.version>0.98.7-hadoop2</hbase.version>
<commons.math3.version>3.1.1</commons.math3.version>
<avro.mapred.classifier>hadoop2</avro.mapred.classifier>
</properties>
@@ -1487,6 +1489,7 @@
<hadoop.version>2.4.0</hadoop.version>
<protobuf.version>2.5.0</protobuf.version>
<jets3t.version>0.9.0</jets3t.version>
+ <hbase.version>0.98.7-hadoop2</hbase.version>
<commons.math3.version>3.1.1</commons.math3.version>
<avro.mapred.classifier>hadoop2</avro.mapred.classifier>
</properties>