Repository: bigtop Updated Branches: refs/heads/master 38e1571b2 -> af762bd81
BIGTOP-2724. putting a final nail in Java's 7 coffin Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/68dce399 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/68dce399 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/68dce399 Branch: refs/heads/master Commit: 68dce399ac30a3b48b9f245e088efcc4c5502cfa Parents: 38e1571 Author: Roman Shaposhnik <[email protected]> Authored: Mon Mar 27 22:20:22 2017 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Mon Mar 27 22:20:22 2017 -0700 ---------------------------------------------------------------------- .../common/bigtop-utils/bigtop-detect-javahome | 22 ++------------------ build.gradle | 2 +- 2 files changed, 3 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/68dce399/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome b/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome index 46dca01..f3e57c2 100644 --- a/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome +++ b/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome @@ -20,20 +20,6 @@ BIGTOP_DEFAULTS_DIR=${BIGTOP_DEFAULTS_DIR-/etc/default} [ -n "${BIGTOP_DEFAULTS_DIR}" -a -r ${BIGTOP_DEFAULTS_DIR}/bigtop-utils ] && . ${BIGTOP_DEFAULTS_DIR}/bigtop-utils -JAVA7_HOME_CANDIDATES=( - '/usr/java/jdk1.7' - '/usr/java/jre1.7' - '/usr/lib/jvm/j2sdk1.7-oracle' - '/usr/lib/jvm/j2sdk1.7-oracle/jre' - '/usr/lib/jvm/java-7-oracle' - '/usr/lib/jdk7-latest' -) - -OPENJAVA7_HOME_CANDIDATES=( - '/usr/lib/jvm/java-1.7.0-openjdk' - '/usr/lib/jvm/java-7-openjdk' -) - JAVA8_HOME_CANDIDATES=( '/usr/java/jdk1.8' '/usr/java/jre1.8' @@ -61,18 +47,14 @@ MISCJAVA_HOME_CANDIDATES=( ) case ${BIGTOP_JAVA_MAJOR} in - 6) echo "Java 6 is no longer supported. Please upgrade" + 6|7) echo "Java ${BIGTOP_JAVA_MAJOR} is no longer supported. Please upgrade" exit 1 ;; - 7) JAVA_HOME_CANDIDATES=(${JAVA7_HOME_CANDIDATES[@]} ${OPENJAVA7_HOME_CANDIDATES[@]}) - ;; 8) JAVA_HOME_CANDIDATES=(${JAVA8_HOME_CANDIDATES[@]} ${OPENJAVA8_HOME_CANDIDATES[@]}) ;; *) JAVA_HOME_CANDIDATES=(${JAVA8_HOME_CANDIDATES[@]} - ${JAVA7_HOME_CANDIDATES[@]} ${MISCJAVA_HOME_CANDIDATES[@]} - ${OPENJAVA8_HOME_CANDIDATES[@]} - ${OPENJAVA7_HOME_CANDIDATES[@]}) + ${OPENJAVA8_HOME_CANDIDATES[@]}) ;; esac http://git-wip-us.apache.org/repos/asf/bigtop/blob/68dce399/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index b0a83b1..3db2e25 100644 --- a/build.gradle +++ b/build.gradle @@ -64,7 +64,7 @@ o88o o8888o 888bod8P'`Y888""8o`Y8bod8P'o888o o888o`Y8bod8P' o888bood8P' o88 o888o "Y88888P' o888o ''' -def final langLevel = "1.7" +def final langLevel = "1.8" rat { excludes = [
