WHIRR-661. Upgrade to Hadoop 1.0.3. Contributed by Steve Loughran.

apache · Mar 11, 2013 · d568961 · d568961
1 parent 7e027bb
commit d568961
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 20 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,8 @@ Release 0.8.2 (unreleased changes)
 
   IMPROVEMENTS
 
+    WHIRR-661. Upgrade to Hadoop 1.0.3. (Steve Loughran via abayer)
+
     WHIRR-634. Update private IP host file entry when required by
     AUTO_HOSTNAME_SUFFIX. (Graham Gear via abayer)
 

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -93,7 +93,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-core</artifactId>
-      <version>0.20.2</version>
+      <version>${hadoop.version}</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/pom.xml b/pom.xml
@@ -68,7 +68,7 @@
     <common-ssl.version>0.3.11</common-ssl.version>
     <dnsjava.version>2.1.1</dnsjava.version>
     <guava.version>13.0</guava.version>
-    <hadoop.version>0.20.205.0</hadoop.version>
+    <hadoop.version>1.0.3</hadoop.version>
     <hamcrest.version>1.1</hamcrest.version>
     <hama.version>0.4.0-incubating</hama.version>
     <hbase.version>0.94.1</hbase.version>

diff --git a/recipes/hadoop.properties b/recipes/hadoop.properties
@@ -93,5 +93,5 @@ whirr.instance-templates=1 hadoop-namenode+hadoop-jobtracker,5 hadoop-datanode+h
 # Expert: specify the version of Hadoop to install.
 #
 
-#whirr.hadoop.version=0.20.2
+#whirr.hadoop.version=1.0.3
 #whirr.hadoop.tarball.url=http://archive.apache.org/dist/hadoop/core/hadoop-${whirr.hadoop.version}/hadoop-${whirr.hadoop.version}.tar.gz
diff --git a/recipes/hbase-0.90.properties b/recipes/hbase-0.90.properties
@@ -69,10 +69,10 @@ hbase-site.dfs.replication=2
 whirr.hbase.tarball.url=http://apache.cu.be/hbase/hbase-0.90.3/hbase-0.90.3.tar.gz
 
 # The Hadoop version to use. See http://hbase.apache.org/book/hadoop.html
-# The default Hadoop version used by Whirr does not fulfill the HBase 0.90.x requirements.
+
-# Whirr will replace the hadoop-core jar in HBase with the one from the actually installed Hadoop.
+#whirr.hadoop.version=1.0.3
-# This example uses Cloudera's CDH3.
+#whirr.hadoop.tarball.url=http://archive.apache.org/dist/hadoop/core/hadoop-${whirr.hadoop.version}/hadoop-${whirr.hadoop.version}.tar.gz
-whirr.hadoop.tarball.url=http://archive.cloudera.com/cdh/3/hadoop-0.20.2-cdh3u1.tar.gz
+
 
 # Options for the hbase master & regionserver processes
 #hbase-env.HBASE_MASTER_OPTS=-Xms1000m -Xmx1000m -Xmn256m -XX:+UseConcMarkSweepGC -XX:+AggressiveOpts -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Xloggc:/data/hbase/logs/hbase-master-gc.log

diff --git a/recipes/pig.properties b/recipes/pig.properties
@@ -28,9 +28,6 @@ whirr.instance-templates=1 hadoop-namenode+hadoop-jobtracker+pig-client,1 hadoop
 whirr.pig.version=0.9.2
 whirr.pig.tarball.url=http://apache.osuosl.org/pig/pig-${whirr.pig.version}/pig-${whirr.pig.version}.tar.gz
 
-whirr.hadoop.version=0.20.205.0
-whirr.hadoop.tarball.url=http://apache.osuosl.org/hadoop/common/hadoop-${whirr.hadoop.version}/hadoop-${whirr.hadoop.version}.tar.gz
-
 # Setup your cloud credentials by copying conf/credentials.sample
 # to ~/.whirr/credentials and editing as needed
 

diff --git a/services/hadoop/src/main/resources/whirr-hadoop-default.properties b/services/hadoop/src/main/resources/whirr-hadoop-default.properties
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-whirr.hadoop.version=0.20.205.0
+whirr.hadoop.version=1.0.3
 whirr.hadoop.tarball.url=http://apache.osuosl.org/hadoop/common/hadoop-${whirr.hadoop.version}/hadoop-${whirr.hadoop.version}.tar.gz
 
 # Hadoop defaults. The first part of the key is removed by whirr.

diff --git a/services/hama/pom.xml b/services/hama/pom.xml
@@ -29,7 +29,7 @@
   <version>0.9.0-SNAPSHOT</version>
   <name>Apache Whirr Hama</name>
   <properties>
-    <hadoop.version>0.20.2</hadoop.version>
+    <hadoop.version>1.0.3</hadoop.version>
     <zookeeper.version>3.3.3</zookeeper.version>
     <osgi.import>
       !org.apache.whirr.service.hama*,

diff --git a/services/hama/src/main/resources/whirr-hama-default.properties b/services/hama/src/main/resources/whirr-hama-default.properties
@@ -10,5 +10,4 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-whirr.hadoop.version=0.20.2
 whirr.hama.tarball.url=http://archive.apache.org/dist/incubator/hama/0.4-incubating/hama-0.4.0-incubating.tar.gz
diff --git a/services/hama/src/test/resources/whirr-hama-test.properties b/services/hama/src/test/resources/whirr-hama-test.properties
@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-whirr.hadoop.version=0.20.2
 whirr.cluster-name=hama-itest-${sys:whirr.test.provider}-${sys:user.name}
 whirr.instance-templates=1 zookeeper,1 hadoop-namenode+hadoop-jobtracker+hama-master,1 hadoop-datanode+hadoop-tasktracker+hama-groomserver
 

diff --git a/services/hbase-oldtests/src/test/resources/whirr-hbase-0.90-singlenode-test.properties b/services/hbase-oldtests/src/test/resources/whirr-hbase-0.90-singlenode-test.properties
@@ -25,4 +25,3 @@ whirr.credential=${sys:whirr.test.credential}
 whirr.hardware-min-ram=4096
 
 whirr.hbase.tarball.url=http://apache.osuosl.org/hbase/hbase-0.90.5/hbase-0.90.5.tar.gz
-whirr.hadoop.tarball.url=http://archive.cloudera.com/cdh/3/hadoop-0.20.2-cdh3u0.tar.gz
diff --git a/services/hbase-oldtests/src/test/resources/whirr-hbase-0.90-test.properties b/services/hbase-oldtests/src/test/resources/whirr-hbase-0.90-test.properties
@@ -23,6 +23,5 @@ whirr.identity=${sys:whirr.test.identity}
 whirr.credential=${sys:whirr.test.credential}
 
 whirr.hbase.tarball.url=http://apache.osuosl.org/hbase/hbase-0.90.5/hbase-0.90.5.tar.gz
-whirr.hadoop.tarball.url=http://archive.cloudera.com/cdh/3/hadoop-0.20.2-cdh3u0.tar.gz
 
 
diff --git a/services/hbase/src/main/resources/whirr-hbase-default.properties b/services/hbase/src/main/resources/whirr-hbase-default.properties
@@ -11,7 +11,6 @@
 #   limitations under the License.
 
 whirr.hbase.tarball.url=http://archive.apache.org/dist/hbase/hbase-0.90.3/hbase-0.90.3.tar.gz
-whirr.hadoop.tarball.url=http://archive.cloudera.com/cdh/3/hadoop-0.20.2-cdh3u0.tar.gz
 
 hbase-site.hbase.cluster.distributed=true
 hbase-site.hbase.regionserver.handler.count=100

diff --git a/services/pig/src/test/resources/whirr-pig-test.properties b/services/pig/src/test/resources/whirr-pig-test.properties
@@ -26,5 +26,3 @@ whirr.credential=${sys:whirr.test.credential}
 whirr.pig.version=0.9.2
 whirr.pig.tarball.url=http://apache.osuosl.org/pig/pig-${whirr.pig.version}/pig-${whirr.pig.version}.tar.gz
 
-whirr.hadoop.version=0.20.205.0
-whirr.hadoop.tarball.url=http://apache.osuosl.org/hadoop/common/hadoop-${whirr.hadoop.version}/hadoop-${whirr.hadoop.version}.tar.gz
diff --git a/services/yarn/pom.xml b/services/yarn/pom.xml
@@ -29,7 +29,7 @@
   <version>0.9.0-SNAPSHOT</version>
   <name>Apache Whirr YARN</name>
   <properties>
-    <hadoop.version>0.20.2</hadoop.version>
+    <hadoop.version>1.0.3</hadoop.version>
     <osgi.import>
       !org.apache.whirr.service.yarn*,
       org.apache.commons.configuration*;version="[1.6,2)",