Don't look for JAVA_HOME in bash_profile

The Bazel-provided remote JDK is now used by default to build and run

Change-Id: I0f9b340899dbd1fa59bf78c453df94d28cfded1a
This commit is contained in:
Carmelo Cascone 2019-06-26 15:58:57 -07:00
parent 5edc84aab0
commit 912808dc20

View File

@ -13,17 +13,6 @@ ONOS_ROOT=$(pushd $ONOS_ROOT >/dev/null && pwd -P && popd >/dev/null)
# Default to drivers and gui2
export ONOS_APPS=${ONOS_APPS:-drivers,openflow,gui2}
# Setup some environmental context for developers
if [ -z "${JAVA_HOME}" ]; then
if [ -x /usr/libexec/java_home ]; then
export JAVA_HOME=$(/usr/libexec/java_home -v 1.8)
elif [ -d /usr/lib/jvm/java-8-oracle ]; then
export JAVA_HOME="/usr/lib/jvm/java-8-oracle"
elif [ -d /usr/lib/jvm/java-8-openjdk-amd64 ]; then
export JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64"
fi
fi
export MAVEN=${MAVEN:-~/Applications/apache-maven-3.3.9}
# Clean up Karaf environment variables to avoid issues when switching from ONOS 1.x to 2.x