$ diff build.xml build.xml.orig
41,42c41,42
< <echo message="Use Hadoop 2.6.0 by default" />
< <property name="hadoopversion" value="260" />
---
> <echo message="Use Hadoop 2.x by default" />
> <property name="hadoopversion" value="200" />
188,201d187
<
< <elseif>
< <equals arg1="${hadoopversion}" arg2="260" />
< <then>
< <property name="hadoop.version" value="2.6.0" />
< <property name="hbase94.version" value="0.94.2" />
< <property name="zookeeper.version" value="3.4.2" />
< <property name="hadoop.version.full" value="2.6.0" />
< <property name="hcatalog.version" value="0.13.0" />
< <property name="hbasecompatprofile" value="2" />
< <property name="avrohadoopprofile" value="2" />
< </then>
< </elseif>
<
203c189
< <fail message="Unrecognized hadoopversion. Can only be 20, 23, 100, 200, 210 or 260." />
---
> <fail message="Unrecognized hadoopversion. Can only be 20, 23, 100, 200 or 210." />$ diff ivy.xml ivy.xml.orig
58,59d57
< <conf name="hadoop260" visibility="private"
< extends="common,runtime,avro,hbase${hbaseprofile},hcatalog${hcatprofile},accumulo" />
67d64
< <conf name="hadoop260test" visibility="private" extends="test,hadoop260" />
91,110d87
< <!-- Dependencies for Hadoop 2.6.0 -->
< <dependency org="org.apache.hadoop" name="hadoop-common"
< rev="${hadoop.version}" conf="hadoop260->default">
< <artifact name="hadoop-common" type="jar" />
< <artifact name="hadoop-common" type="jar" m:classifier="tests"/>
< </dependency>
< <dependency org="org.apache.hadoop" name="hadoop-hdfs"
< rev="${hadoop.version}" conf="hadoop260->default">
< <artifact name="hadoop-hdfs" type="jar" />
< <artifact name="hadoop-hdfs" type="jar" m:classifier="tests"/>
< </dependency>
< <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-common"
< rev="${hadoop.version}" conf="hadoop260->default"/>
< <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
< rev="${hadoop.version}" conf="hadoop260->default"/>
< <dependency org="org.aspectj" name="aspectjtools" rev="${aspectj.version}"
< conf="hadoop260->default"/>
< <dependency org="org.aspectj" name="aspectjrt" rev="${aspectj.version}"
< conf="hadoop260->default"/>
< 