Repository: bigtop Updated Branches: refs/heads/master 3c5b7546b -> c765c3fde
BIGTOP-1358. adjust toolchain to use JDK7 by default Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/c765c3fd Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/c765c3fd Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/c765c3fd Branch: refs/heads/master Commit: c765c3fde701293053c4a16c487827351fd236ad Parents: 3c5b754 Author: Roman Shaposhnik <[email protected]> Authored: Sat Aug 9 16:56:46 2014 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Sat Aug 9 16:56:46 2014 -0700 ---------------------------------------------------------------------- bigtop_toolchain/files/jenkins.sh.centos | 3 ++- bigtop_toolchain/files/jenkins.sh.ubu | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/c765c3fd/bigtop_toolchain/files/jenkins.sh.centos ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/files/jenkins.sh.centos b/bigtop_toolchain/files/jenkins.sh.centos index b48d867..6ed1025 100644 --- a/bigtop_toolchain/files/jenkins.sh.centos +++ b/bigtop_toolchain/files/jenkins.sh.centos @@ -15,8 +15,9 @@ export MAVEN_HOME=/usr/local/maven export PATH=$PATH:$MAVEN_HOME/bin -export JAVA_HOME=/usr/java/latest +export JAVA6_HOME=/usr/java/latest export JAVA7_HOME=/usr/lib/jdk7-latest +export JAVA_HOME=$JAVA7_HOME export ANT_HOME=/usr/local/ant export PATH=$PATH:$ANT_HOME/bin export FORREST_HOME=/usr/local/apache-forrest http://git-wip-us.apache.org/repos/asf/bigtop/blob/c765c3fd/bigtop_toolchain/files/jenkins.sh.ubu ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/files/jenkins.sh.ubu b/bigtop_toolchain/files/jenkins.sh.ubu index 5684e10..828856d 100644 --- a/bigtop_toolchain/files/jenkins.sh.ubu +++ b/bigtop_toolchain/files/jenkins.sh.ubu @@ -15,8 +15,9 @@ export MAVEN_HOME=/usr/local/maven export PATH=$PATH:$MAVEN_HOME/bin -export JAVA_HOME=/usr/lib/jvm/java-6-oracle +export JAVA6_HOME=/usr/lib/jvm/java-6-oracle export JAVA7_HOME=/usr/lib/jvm/java-7-oracle +export JAVA_HOME=$JAVA7_HOME export ANT_HOME=/usr/local/ant export PATH=$PATH:$ANT_HOME/bin export FORREST_HOME=/usr/local/apache-forrest
