Repository: incubator-geode Updated Branches: refs/heads/develop a4c38a469 -> 2a84453b1
GEODE-1836: remove defunct Java 1.6 block for Mac Geode requires Java 1.8 and does not support Java 1.6. Attempting to add the 1.6 classes.jar to the classpath for the Attach API results in breaking the start and status commands in GFSH. Removal of these script lines allows GFSH to use either the Attach API in Java 1.8 or an alternative implementation for start and status. The alternative implementation uses temporary files to communcate with the other process. If you want to make sure you are using the Attach API then simply set JAVA_HOME to the location of JDK 1.8. If you use jenv on Mac, then consider configuring jenv to export JAVA_HOME by executing: $ jenv enable-plugin export Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/2a84453b Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/2a84453b Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/2a84453b Branch: refs/heads/develop Commit: 2a84453b160f3fc0b6b873b92c74954b3b192911 Parents: a4c38a4 Author: Kirk Lund <[email protected]> Authored: Fri Sep 2 15:24:18 2016 -0700 Committer: Kirk Lund <[email protected]> Committed: Tue Sep 6 11:04:38 2016 -0700 ---------------------------------------------------------------------- geode-assembly/src/main/dist/bin/gfsh | 7 ------- 1 file changed, 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2a84453b/geode-assembly/src/main/dist/bin/gfsh ---------------------------------------------------------------------- diff --git a/geode-assembly/src/main/dist/bin/gfsh b/geode-assembly/src/main/dist/bin/gfsh index 935a24e..48d3696 100755 --- a/geode-assembly/src/main/dist/bin/gfsh +++ b/geode-assembly/src/main/dist/bin/gfsh @@ -118,13 +118,6 @@ if [ ! -f "$TOOLS_JAR" ]; then TOOLS_JAR="$GF_JAVA_PARENT/../lib/tools.jar" if [ ! -f "$TOOLS_JAR" ]; then TOOLS_JAR= - if [ "${UNAME}" = "darwin" ]; then - # For MacOS, try default path - TOOLS_JAR="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes/classes.jar" - if [ ! -f "$TOOLS_JAR" ]; then - TOOLS_JAR= - fi - fi fi fi
