Change default Hadoop version to 2.2.0
This change moves the default version of Hadoop to 2.2.0, as well as introducing some dependencyManagement and
property tags to ease management of this and other similar dependencies. Additionally, in this change Hivesterix
and Pregelix are no longer built by default (as part of moving their codebases to separate repositories).
Change-Id: I7609f192cbb246fdec2d0f301130c389688047a9
Reviewed-on: http://fulliautomatix.ics.uci.edu:8443/124
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <westmann@gmail.com>
diff --git a/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml b/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml
index 2e5b9c0..0eb32fc 100644
--- a/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml
+++ b/hyracks/hyracks-hdfs/hyracks-hdfs-core/pom.xml
@@ -67,13 +67,13 @@
<profiles>
<profile>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<id>hadoop-0.20.2</id>
<dependencies>
<dependency>
<groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-hdfs-0.20.2</artifactId>
+ <artifactId>hyracks-hdfs-1.x</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
@@ -92,7 +92,27 @@
<dependencies>
<dependency>
<groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-hdfs-0.20.2</artifactId>
+ <artifactId>hyracks-hdfs-1.x</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>hadoop</name>
+ <value>2.2.0</value>
+ </property>
+ </activation>
+ <id>hadoop-2.2.0</id>
+ <dependencies>
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-hdfs-2.x</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
@@ -111,7 +131,7 @@
<dependencies>
<dependency>
<groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-hdfs-0.23.1</artifactId>
+ <artifactId>hyracks-hdfs-2.x</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
@@ -130,7 +150,7 @@
<dependencies>
<dependency>
<groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-hdfs-0.23.1</artifactId>
+ <artifactId>hyracks-hdfs-2.x</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
@@ -149,7 +169,7 @@
<dependencies>
<dependency>
<groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-hdfs-0.23.1</artifactId>
+ <artifactId>hyracks-hdfs-2.x</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
@@ -168,7 +188,7 @@
<dependencies>
<dependency>
<groupId>edu.uci.ics.hyracks</groupId>
- <artifactId>hyracks-hdfs-0.23.1</artifactId>
+ <artifactId>hyracks-hdfs-2.x</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
diff --git a/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/resources/hadoop/conf/hdfs-site.xml b/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/resources/hadoop/conf/hdfs-site.xml
index bff9a3e..4bb966d 100644
--- a/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/resources/hadoop/conf/hdfs-site.xml
+++ b/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/resources/hadoop/conf/hdfs-site.xml
@@ -26,7 +26,12 @@
<property>
<name>dfs.block.size</name>
- <value>65536</value>
+ <value>1048576</value>
+</property>
+
+<property>
+ <name>dfs.namenode.fs-limits.min-block-size</name>
+ <value>1048576</value>
</property>
</configuration>