WHIRR-709. Bump Hadoop to latest available version at osuosl.

apache · Mar 27, 2013 · 97939f1 · 97939f1
1 parent 114f750
commit 97939f1
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
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>1.0.3</hadoop.version>
+    <hadoop.version>1.0.4</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=1.0.3
+#whirr.hadoop.version=1.0.4
 #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
@@ -70,7 +70,7 @@ whirr.hbase.tarball.url=http://apache.cu.be/hbase/hbase-0.90.3/hbase-0.90.3.tar.
 
 # The Hadoop version to use. See http://hbase.apache.org/book/hadoop.html
 
-#whirr.hadoop.version=1.0.3
+#whirr.hadoop.version=1.0.4
 #whirr.hadoop.tarball.url=http://archive.apache.org/dist/hadoop/core/hadoop-${whirr.hadoop.version}/hadoop-${whirr.hadoop.version}.tar.gz
 
 

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=1.0.3
+whirr.hadoop.version=1.0.4
 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>1.0.3</hadoop.version>
+    <hadoop.version>1.0.4</hadoop.version>
     <zookeeper.version>3.3.3</zookeeper.version>
     <osgi.import>
       !org.apache.whirr.service.hama*,

diff --git a/services/hbase/src/test/resources/whirr-hbase-singlenode-test.properties b/services/hbase/src/test/resources/whirr-hbase-singlenode-test.properties
@@ -25,4 +25,4 @@ whirr.credential=${sys:whirr.test.credential}
 whirr.hardware-min-ram=4096
 
 whirr.hbase.tarball.url=http://archive.apache.org/dist/hbase/hbase-0.94.1/hbase-0.94.1.tar.gz
-whirr.hadoop.tarball.url=http://archive.apache.org/dist/hadoop/common/hadoop-1.0.3/hadoop-1.0.3.tar.gz
+whirr.hadoop.tarball.url=http://archive.apache.org/dist/hadoop/common/hadoop-1.0.4/hadoop-1.0.4.tar.gz
diff --git a/services/hbase/src/test/resources/whirr-hbase-test.properties b/services/hbase/src/test/resources/whirr-hbase-test.properties
@@ -23,6 +23,6 @@ whirr.identity=${sys:whirr.test.identity}
 whirr.credential=${sys:whirr.test.credential}
 
 whirr.hbase.tarball.url=http://archive.apache.org/dist/hbase/hbase-0.94.1/hbase-0.94.1.tar.gz
-whirr.hadoop.tarball.url=http://archive.apache.org/dist/hadoop/common/hadoop-1.0.3/hadoop-1.0.3.tar.gz
+whirr.hadoop.tarball.url=http://archive.apache.org/dist/hadoop/common/hadoop-1.0.4/hadoop-1.0.4.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>1.0.3</hadoop.version>
+    <hadoop.version>1.0.4</hadoop.version>
     <osgi.import>
       !org.apache.whirr.service.yarn*,
       org.apache.commons.configuration*;version="[1.6,2)",