BIGTOP-29. Remove java dependency from all os types

git-svn-id: https://svn.apache.org/repos/asf/incubator/bigtop/trunk@1164137 13f79535-47bb-0310-9956-ffa450edef68

18 files changed, 17 insertions, 129 deletions

diff --git a/bigtop-packages/src/deb/flume/control b/bigtop-packages/src/deb/flume/control
index 9745d687..c7aa83fe 100644
--- a/bigtop-packages/src/deb/flume/control
+++ b/bigtop-packages/src/deb/flume/control
@@ -17,13 +17,13 @@ Source: flume
 Section: misc
 Priority: extra
 Maintainer: Alex Newman <newalex@cloudera.com>
-Build-Depends: debhelper (>= 6), ant, sun-java6-jdk, ant-optional, git-core
+Build-Depends: debhelper (>= 6), ant, ant-optional, git-core
 Standards-Version: 3.8.0
 Homepage: http://www.cloudera.com
 
 Package: flume
 Architecture: all
-Depends: sun-java6-jre, hadoop-zookeeper, adduser, hadoop
+Depends: hadoop-zookeeper, adduser, hadoop
 Description: reliable, scalable, and manageable distributed data collection application
  Flume is a reliable, scalable, and manageable distributed data collection
  application for collecting data such as logs and delivering it to data stores
diff --git a/bigtop-packages/src/deb/hadoop/control b/bigtop-packages/src/deb/hadoop/control
index 41227902..2e8e51ba 100644
--- a/bigtop-packages/src/deb/hadoop/control
+++ b/bigtop-packages/src/deb/hadoop/control
@@ -17,14 +17,14 @@ Source: hadoop
 Section: misc
 Priority: extra
 Maintainer: Todd Lipcon <todd@cloudera.com>
-Build-Depends: debhelper (>= 6), ant, ant-optional, liblzo2-dev, sun-java6-jdk, python, libzip-dev,automake, autoconf (>= 2.61), sharutils, g++ (>= 4), git-core, libfuse-dev, libssl-dev
+Build-Depends: debhelper (>= 6), ant, ant-optional, liblzo2-dev, python, libzip-dev,automake, autoconf (>= 2.61), sharutils, g++ (>= 4), git-core, libfuse-dev, libssl-dev
 Standards-Version: 3.8.0
 Homepage: http://hadoop.apache.org/core/
 
 Package: hadoop
 Provides: hadoop
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, sun-java6-jre, sun-java6-bin
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser 
 Recommends: hadoop-native
 Description: A software platform for processing vast amounts of data
  Hadoop is a software platform that lets one easily write and
diff --git a/bigtop-packages/src/deb/hbase/control b/bigtop-packages/src/deb/hbase/control
index 834c57f2..4fdf07cf 100644
--- a/bigtop-packages/src/deb/hbase/control
+++ b/bigtop-packages/src/deb/hbase/control
@@ -16,13 +16,13 @@ Source: hadoop-hbase
 Section: misc
 Priority: extra
 Maintainer: Alex Newman <newalex@cloudera.com>
-Build-Depends: debhelper (>= 6), sun-java6-jdk, git-core, adduser
+Build-Depends: debhelper (>= 6), git-core, adduser
 Standards-Version: 3.8.0
 Homepage: http://hadoop.apache.org/hbase/
 
 Package: hadoop-hbase
 Architecture: all
-Depends: adduser, sun-java6-jre, hadoop-zookeeper (>= 3.3.1), hadoop
+Depends: adduser, hadoop-zookeeper (>= 3.3.1), hadoop
 Recommends: ntp
 Description: HBase is the Hadoop database
  Use it when you need random, realtime read/write access to your Big Data. 
diff --git a/bigtop-packages/src/deb/hive/control b/bigtop-packages/src/deb/hive/control
index cff09a03..b3c63189 100644
--- a/bigtop-packages/src/deb/hive/control
+++ b/bigtop-packages/src/deb/hive/control
@@ -17,13 +17,13 @@ Source: hadoop-hive
 Section: misc
 Priority: extra
 Maintainer: Todd Lipcon <todd@cloudera.com>
-Build-Depends: debhelper (>= 6), ant, sun-java6-jdk, python-support, git-core
+Build-Depends: debhelper (>= 6), ant, python-support, git-core
 Standards-Version: 3.8.0
 Homepage: http://hadoop.apache.org/hive/
 
 Package: hadoop-hive
 Architecture: all
-Depends: adduser, sun-java6-jre, hadoop
+Depends: adduser, hadoop
 Description: A data warehouse infrastructure built on top of Hadoop
  Hive is a data warehouse infrastructure built on top of Hadoop that
  provides tools to enable easy data summarization, adhoc querying and
diff --git a/bigtop-packages/src/deb/oozie/control b/bigtop-packages/src/deb/oozie/control
index 15114dd1..674d9010 100644
--- a/bigtop-packages/src/deb/oozie/control
+++ b/bigtop-packages/src/deb/oozie/control
@@ -17,7 +17,7 @@ Section: misc
 Priority: extra
 Maintainer: Arvind Prabhakar <arvind@cloudera.com>
 Build-Depends: debhelper (>= 6)
-Depends: zip, unzip, sun-java6-jre, sun-java6-bin
+Depends: zip, unzip
 Standards-Version: 3.8.0
 Homepage: http://archive.cloudera.com/cdh/3/oozie
 
diff --git a/bigtop-packages/src/deb/pig/control b/bigtop-packages/src/deb/pig/control
index 050e9153..07d8c9bf 100644
--- a/bigtop-packages/src/deb/pig/control
+++ b/bigtop-packages/src/deb/pig/control
@@ -2,13 +2,13 @@ Source: hadoop-pig
 Section: misc
 Priority: extra
 Maintainer: Todd Lipcon <todd@cloudera.com>
-Build-Depends: debhelper (>= 6), ant, sun-java6-jdk, ant-optional, git-core
+Build-Depends: debhelper (>= 6), ant, ant-optional, git-core
 Standards-Version: 3.8.0
 Homepage: http://hadoop.apache.org/pig/
 
 Package: hadoop-pig
 Architecture: all
-Depends: sun-java6-jre, hadoop
+Depends: hadoop
 Description: A platform for analyzing large data sets using Hadoop
  Pig is a platform for analyzing large data sets that consists of a high-level language
  for expressing data analysis programs, coupled with infrastructure for evaluating these
diff --git a/bigtop-packages/src/deb/sqoop/control b/bigtop-packages/src/deb/sqoop/control
index 45c49db2..46d102c0 100644
--- a/bigtop-packages/src/deb/sqoop/control
+++ b/bigtop-packages/src/deb/sqoop/control
@@ -16,13 +16,13 @@ Source: sqoop
 Section: misc
 Priority: extra
 Maintainer: Alex Newman <newalex@cloudera.com>
-Build-Depends: debhelper (>= 6), ant, sun-java6-jdk, ant-optional, git-core, sed, asciidoc, xmlto
+Build-Depends: debhelper (>= 6), ant, ant-optional, git-core, sed, asciidoc, xmlto
 Standards-Version: 3.8.0
 Homepage: http://www.cloudera.com
 
 Package:  sqoop
 Architecture: all
-Depends: sun-java6-jre, hadoop
+Depends: hadoop
 Description: Tool for easy imports and exports of data sets between databases and HDFS
  Sqoop is a tool that provides the ability to import and export data sets between
  the Hadoop Distributed File System (HDFS) and relational databases.
diff --git a/bigtop-packages/src/deb/whirr/control b/bigtop-packages/src/deb/whirr/control
index 00959acd..a8ddd2e8 100644
--- a/bigtop-packages/src/deb/whirr/control
+++ b/bigtop-packages/src/deb/whirr/control
@@ -16,13 +16,12 @@ Source: whirr
 Section: misc
 Priority: extra
 Maintainer: Tom White <tom@cloudera.com>
-Build-Depends: debhelper (>= 6), sun-java6-jdk, git-core
+Build-Depends: debhelper (>= 6), git-core
 Standards-Version: 3.8.0
 Homepage: http://incubator.apache.org/whirr
 
 Package:  whirr
 Architecture: all
-Depends: sun-java6-jre 
 Description: Scripts and libraries for running software services on cloud infrastructure
  Whirr provides
  .
diff --git a/bigtop-packages/src/deb/zookeeper/control b/bigtop-packages/src/deb/zookeeper/control
index 53e30cf5..79899aa8 100755
--- a/bigtop-packages/src/deb/zookeeper/control
+++ b/bigtop-packages/src/deb/zookeeper/control
@@ -16,13 +16,12 @@ Source: hadoop-zookeeper
 Section: misc
 Priority: extra
 Maintainer: Alex Newman <newalex@cloudera.com>
-Build-Depends: debhelper (>= 6), ant, sun-java6-jdk, ant-optional, git-core, autoconf, automake, subversion
+Build-Depends: debhelper (>= 6), ant, ant-optional, git-core, autoconf, automake, subversion
 Standards-Version: 3.8.0
 Homepage: http://hadoop.apache.org/zookeeper/
 
 Package: hadoop-zookeeper
 Architecture: all
-Depends: sun-java6-jre
 Conflicts: zookeeper
 Replaces: zookeeper
 Description: A high-performance coordination service for distributed applications.
diff --git a/bigtop-packages/src/rpm/flume/SPECS/flume.spec b/bigtop-packages/src/rpm/flume/SPECS/flume.spec
index 4f77394d..e60c63bc 100644
--- a/bigtop-packages/src/rpm/flume/SPECS/flume.spec
+++ b/bigtop-packages/src/rpm/flume/SPECS/flume.spec
@@ -65,16 +65,6 @@ Source3: install_flume.sh
 Requires: sh-utils, textutils, /usr/sbin/useradd, /sbin/chkconfig, /sbin/service, hadoop-zookeeper >= 3.3.1, hadoop >= 0.20.2
 BuildRequires: ant xml-commons xml-commons-apis
 
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
-
 %description 
 Flume is a reliable, scalable, and manageable distributed data collection application for collecting data such as logs and delivering it to data stores such as Hadoop's HDFS.  It can efficiently collect, aggregate, and move large amounts of log data.  It has a simple, but flexible, architecture based on streaming data flows.  It is robust and fault tolerant with tunable reliability mechanisms and many failover and recovery mechanisms.  The system is centrally managed and allows for intelligent dynamic management. It uses a simple extensible data model that allows for online analytic applications.
 
@@ -87,13 +77,6 @@ Requires: sh-utils, textutils, /usr/sbin/useradd, /sbin/chkconfig, /sbin/service
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig, %{name}
 
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-Requires: java-1.6.0-sun
-%else
-Requires: jre >= 1.6
-%endif
-
 %if  %{?suse_version:1}0
 # Required for init scripts
 Requires: insserv
@@ -115,15 +98,6 @@ Requires: sh-utils, textutils, /usr/sbin/useradd, /sbin/chkconfig, /sbin/service
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig, %{name}
 
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
 %if  %{?suse_version:1}0
 # Required for init scripts
 Requires: insserv
diff --git a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
index 606625b2..d51aea86 100644
--- a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
+++ b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
@@ -110,15 +110,6 @@ BuildRequires: python >= 2.4, git, fuse-devel,fuse, automake, autoconf
 Requires: textutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service
 Provides: hadoop
 
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
 %if  %{?suse_version:1}0
 BuildRequires: libfuse2, libopenssl-devel, gcc-c++, ant, ant-nodeps, ant-trax, liblzo-devel
 # Required for init scripts
@@ -273,15 +264,6 @@ Requires: %{name} = %{version}-%{release}
 # TODO: reconcile libjvm
 AutoReq: no
 
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
 %description libhdfs
 Hadoop Filesystem Library
 
@@ -298,8 +280,8 @@ Hadoop Pipes Library
 %setup -n %{name}-%{hadoop_base_version}
 
 %build
-# This assumes that you installed Java JDK 6 via RPM
-# This assumes that you installed Java JDK 5 i386 via RPM
+# This assumes that you installed Java JDK 6 and set JAVA_HOME
+# This assumes that you installed Java JDK 5 and set JAVA5_HOME
 # This assumes that you installed Forrest and set FORREST_HOME
 
 ant -Dversion=%{version} \
diff --git a/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec b/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
index a5c58b44..d141c63e 100644
--- a/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
+++ b/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
@@ -68,15 +68,6 @@ Source4: install_hbase.sh
 BuildArch: noarch
 Requires: sh-utils, textutils, /usr/sbin/useradd, /sbin/chkconfig, /sbin/service, hadoop-zookeeper, hadoop >= 0.20.2, hadoop-zookeeper >= 3.3.1
 
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
 %description 
 HBase is an open-source, distributed, column-oriented store modeled after Google' Bigtable: A Distributed Storage System for Structured Data by Chang et al. Just as Bigtable leverages the distributed data storage provided by the Google File System, HBase provides Bigtable-like capabilities on top of Hadoop. HBase includes:
 
diff --git a/bigtop-packages/src/rpm/hive/SPECS/hive.spec b/bigtop-packages/src/rpm/hive/SPECS/hive.spec
index c99fc1be..3e8366fb 100644
--- a/bigtop-packages/src/rpm/hive/SPECS/hive.spec
+++ b/bigtop-packages/src/rpm/hive/SPECS/hive.spec
@@ -70,15 +70,6 @@ Source6: hive-site.xml
 Requires: hadoop >= 0.20.1
 Obsoletes: %{name}-webinterface
 
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
 %description 
 Hive is a data warehouse infrastructure built on top of Hadoop that provides tools to enable easy data summarization, adhoc querying and analysis of large datasets data stored in Hadoop files. It provides a mechanism to put structure on this data and it also provides a simple query language called Hive QL which is based on SQL and which enables users familiar with SQL to query this data. At the same time, this language also allows traditional map/reduce programmers to be able to plug in their custom mappers and reducers to do more sophisticated analysis which may not be supported by the built-in capabilities of the language. 
 
diff --git a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
index 852134c5..8b057ca5 100644
--- a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
+++ b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
@@ -39,15 +39,6 @@ Requires(preun): /sbin/chkconfig, /sbin/service
 Requires: oozie-client = %{version}
 BuildArch: noarch
 
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
 %description 
  Oozie is a system that runs workflows of Hadoop jobs.
  Oozie workflows are actions arranged in a control dependency DAG (Direct
diff --git a/bigtop-packages/src/rpm/pig/SPECS/pig.spec b/bigtop-packages/src/rpm/pig/SPECS/pig.spec
index a67b4f19..5377ae85 100644
--- a/bigtop-packages/src/rpm/pig/SPECS/pig.spec
+++ b/bigtop-packages/src/rpm/pig/SPECS/pig.spec
@@ -81,16 +81,6 @@ Source3: pig.1
 Source4: pig.properties
 Requires: hadoop
 
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
-
 %description 
 Pig is a platform for analyzing large data sets that consists of a high-level language 
 for expressing data analysis programs, coupled with infrastructure for evaluating these 
diff --git a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec b/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
index 4a547313..c36b266b 100644
--- a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
+++ b/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
@@ -43,15 +43,6 @@ Buildarch: noarch
 BuildRequires:  asciidoc, xmlto
 Prereq: hadoop
 
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
 %description 
 Sqoop allows easy imports and exports of data sets between databases and the Hadoop Distributed File System (HDFS).
 
diff --git a/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec b/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
index bbedc98b..2c273648 100644
--- a/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
+++ b/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
@@ -31,16 +31,6 @@ Source0: %{name}-%{whirr_base_version}-incubating-src.tar.gz
 Source1: install_%{name}.sh
 Source2: whirr.1
 
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
-
 %description 
 Whirr provides
 
diff --git a/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec b/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
index e98c7805..e944ba44 100644
--- a/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
+++ b/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
@@ -66,16 +66,6 @@ Source4: zookeeper.1
 BuildArch: noarch
 BuildRequires: autoconf, automake, subversion
 
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
-
 %description 
 ZooKeeper is a centralized service for maintaining configuration information, 
 naming, providing distributed synchronization, and providing group services.