Index: src/packages/rpm/spec/hbase.spec =================================================================== --- src/packages/rpm/spec/hbase.spec (revision 1186887) +++ src/packages/rpm/spec/hbase.spec (working copy) @@ -58,7 +58,7 @@ Prefix: %{_log_dir} Prefix: %{_pid_dir} Buildroot: %{_build_dir} -Requires: sh-utils, textutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service, jdk >= 1.6, hadoop +Requires: sh-utils, textutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service, hadoop AutoReqProv: no Provides: hbase Index: src/packages/deb/hbase.control/control =================================================================== --- src/packages/deb/hbase.control/control (revision 1186887) +++ src/packages/deb/hbase.control/control (working copy) @@ -3,7 +3,7 @@ Section: misc Priority: optional Architecture: all -Depends: openjdk-6-jre-headless, hadoop, zookeeper +Depends: hadoop, zookeeper Maintainer: Apache Software Foundation Description: HBase is the Hadoop database. Use it when you need random, realtime read/write access to your Big Data. This project's goal is the hosting of very large tables -- billions of rows X millions of columns -- atop clusters of commodity hardware. Distribution: development Index: src/packages/update-hbase-env.sh =================================================================== --- src/packages/update-hbase-env.sh (revision 1186887) +++ src/packages/update-hbase-env.sh (working copy) @@ -103,13 +103,13 @@ LOG_DIR=${LOG_DIR:-$PREFIX/var/log} PID_DIR=${PID_DIR:-$PREFIX/var/run} UNINSTALL=${UNINSTALL:-0} +ZOOKEEPER_HOME=${ZOOKEEPER_HOME:-/usr} if [ "${ARCH}" != "i386" ]; then LIB_DIR=${LIB_DIR}64 fi . /etc/default/hadoop-env.sh -. /etc/default/zookeeper-env.sh if [ "${UNINSTALL}" -eq "1" ]; then # Remove symlinks @@ -173,7 +173,7 @@ grep -v "^export JAVA_HOME" > ${TFILE} if [ -z "${JAVA_HOME}" ]; then if [ -e /etc/lsb-release ]; then - JAVA_HOME=`update-alternatives --config java | grep java | cut -f2 -d':' | cut -f2 -d' ' | sed -e 's/\/bin\/java//'` + JAVA_HOME=/usr/lib/jvm/java-6-sun else JAVA_HOME=/usr/java/default fi Index: CHANGES.txt =================================================================== --- CHANGES.txt (revision 1186887) +++ CHANGES.txt (working copy) @@ -384,6 +384,7 @@ HBASE-4479 TestMasterFailover failure in Hbase-0.92#17(Ram) IMPROVEMENTS + HBASE-4635 Removed Java dependency for rpm/deb packaging (Eric Yang) HBASE-3290 Max Compaction Size (Nicolas Spiegelberg via Stack) HBASE-3292 Expose block cache hit/miss/evict counts into region server metrics