You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2015/03/27 23:12:06 UTC

bigtop git commit: BIGTOP-1780: bigtop_toolchain: JAVA_HOME incorrect, remove JAVA6_HOME

Repository: bigtop
Updated Branches:
  refs/heads/master 10cfc36c7 -> 85d9001dd


BIGTOP-1780: bigtop_toolchain: JAVA_HOME incorrect, remove JAVA6_HOME


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/85d9001d
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/85d9001d
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/85d9001d

Branch: refs/heads/master
Commit: 85d9001ddea9cdf9ed1d72b9c828117d791ae800
Parents: 10cfc36
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Fri Mar 27 11:14:06 2015 +0100
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Fri Mar 27 23:10:58 2015 +0100

----------------------------------------------------------------------
 bigtop_toolchain/files/jenkins.sh.centos | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/85d9001d/bigtop_toolchain/files/jenkins.sh.centos
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/files/jenkins.sh.centos b/bigtop_toolchain/files/jenkins.sh.centos
index 5f90bc4..4bd4863 100644
--- a/bigtop_toolchain/files/jenkins.sh.centos
+++ b/bigtop_toolchain/files/jenkins.sh.centos
@@ -14,9 +14,7 @@
 # limitations under the License.
 
 export MAVEN_HOME=/usr/local/maven
-export JAVA6_HOME=/usr/java/latest
-export JAVA7_HOME=/usr/lib/jvm/java-1.7.0-openjdk
-export JAVA_HOME=$JAVA7_HOME
+export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk.x86_64
 export ANT_HOME=/usr/local/ant
 export FORREST_HOME=/usr/local/apache-forrest
 export SCALA_HOME=/usr/share/java