Hi,
I have just tried to apply the patch of SPARK-1297:
https://issues.apache.org/jira/browse/SPARK-1297
There are two files in it, named spark-1297-v2.txt and spark-1297-v4.txt
respectively.
When applying the 2nd one, I got "Hunk #1 FAILED at 45"
Can you please advise how to fix it in order to make the compilation of Spark
Project Examples success?
(Here: Hadoop 2.4.1, HBase 0.98.5, Spark 1.0.2)
Regards
Arthur
patch -p1 -i spark-1297-v4.txt
patching file examples/pom.xml
Hunk #1 FAILED at 45.
Hunk #2 succeeded at 94 (offset -16 lines).
1 out of 2 hunks FAILED -- saving rejects to file examples/pom.xml.rej
below is the content of examples/pom.xml.rej:
+++ examples/pom.xml
@@ -45,6 +45,39 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>hbase-hadoop2</id>
+ <activation>
+ <property>
+ <name>hbase.profile</name>
+ <value>hadoop2</value>
+ </property>
+ </activation>
+ <properties>
+ <protobuf.version>2.5.0</protobuf.version>
+ <hbase.version>0.98.4-hadoop2</hbase.version>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
+ <profile>
+ <id>hbase-hadoop1</id>
+ <activation>
+ <property>
+ <name>!hbase.profile</name>
+ </property>
+ </activation>
+ <properties>
+ <hbase.version>0.98.4-hadoop1</hbase.version>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
+
</profiles>
<dependencies>
This caused the related compilation failed:
[INFO] Spark Project Examples ............................ FAILURE [0.102s]
