Updated Branches: refs/heads/master eff304c71 -> be910a182
BIGTOP-1069. Remove descriptions about JDK5 dependency Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/be910a18 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/be910a18 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/be910a18 Branch: refs/heads/master Commit: be910a1824c986bfd0982e554383c7fada94f1a8 Parents: eff304c Author: Masatake Iwasaki <[email protected]> Authored: Mon Sep 16 12:34:58 2013 -0700 Committer: Konstantin Boudnik <[email protected]> Committed: Mon Sep 16 12:34:58 2013 -0700 ---------------------------------------------------------------------- README | 2 +- bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec | 1 - check-env.sh | 5 ----- package.mk | 1 - 4 files changed, 1 insertion(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/be910a18/README ---------------------------------------------------------------------- diff --git a/README b/README index 96ec936..76e4547 100644 --- a/README +++ b/README @@ -35,7 +35,7 @@ related distributions. Building all of Bigtop requires the following tools: * Java JDK 1.6 -* Apache Forrest 0.8 (requires 32bit version of Java JDK 1.5) +* Apache Forrest 0.8 * Apache Ant * Apache Maven * git http://git-wip-us.apache.org/repos/asf/bigtop/blob/be910a18/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec index 377456e..8a8348c 100644 --- a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec +++ b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec @@ -440,7 +440,6 @@ These projects (enumerated below) allow HDFS to be mounted (on most flavors of U %build # 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 env HADOOP_VERSION=%{hadoop_base_version} HADOOP_ARCH=%{hadoop_arch} bash %{SOURCE1} http://git-wip-us.apache.org/repos/asf/bigtop/blob/be910a18/check-env.sh ---------------------------------------------------------------------- diff --git a/check-env.sh b/check-env.sh index f784116..1f655fb 100755 --- a/check-env.sh +++ b/check-env.sh @@ -21,11 +21,6 @@ if [ -z "$JAVA_HOME" ]; then exit 1 fi -if [ -z "$JAVA5_HOME" ]; then - echo JAVA5_HOME is not set - exit 1 -fi - if [ -z "$FORREST_HOME" ]; then echo FORREST_HOME is not set exit 1 http://git-wip-us.apache.org/repos/asf/bigtop/blob/be910a18/package.mk ---------------------------------------------------------------------- diff --git a/package.mk b/package.mk index bec000d..51a5d51 100644 --- a/package.mk +++ b/package.mk @@ -127,7 +127,6 @@ $(BUILD_DIR)/%/.deb: --preserve-envvar PATH \ --preserve-envvar JAVA32_HOME \ --preserve-envvar JAVA64_HOME \ - --preserve-envvar JAVA5_HOME \ --preserve-envvar FORREST_HOME \ --preserve-envvar MAVEN3_HOME \ --preserve-envvar MAVEN_OPTS \
