This is an automated email from the ASF dual-hosted git repository. granthenke pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kudu.git
commit 141dfab4f65f9f4083ee5d62d4033a1ade9f232b Author: Grant Henke <[email protected]> AuthorDate: Mon Aug 24 15:07:03 2020 -0500 [build] Adjust JAVA_HOME candidates This patch removes the Java 7 candidates given Java 7 is no longer supported and adds Java 11 candidates along with a few more generic candidates. The updated version of bigtop-detect-javahome, which is the original inspiration for this file, was used to help update this file. https://github.com/apache/bigtop/blob/master/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome Change-Id: Ie51cde4153be23e8f33fcc061531c2c022791b16 Reviewed-on: http://gerrit.cloudera.org:8080/16354 Reviewed-by: Grant Henke <[email protected]> Tested-by: Grant Henke <[email protected]> --- build-support/java-home-candidates.txt | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/build-support/java-home-candidates.txt b/build-support/java-home-candidates.txt index 7a08118..b214c4e 100644 --- a/build-support/java-home-candidates.txt +++ b/build-support/java-home-candidates.txt @@ -16,8 +16,23 @@ # under the License. # This file list the locations to look for java candidates in priority order. +# The priority order is newer to older versions and specific to generic versions. # Note: Trailing comments are not allowed. +# Oracle JDK 11 Candidates +/usr/java/jdk-11 +/usr/lib/jvm/jdk-11 +/usr/lib/jvm/java-11-oracle + +# OpenJDK 11 Candidates +/usr/lib/jvm/java-11-openjdk-arm64 +/usr/lib/jvm/java-11-openjdk-amd64 +/usr/lib/jvm/java-11-openjdk-ppc64el +/usr/lib/jvm/java-11 +/usr/java/jdk-11 +/usr/lib/jvm/jdk-11 +/usr/lib64/jvm/jdk-11 + # Oracle JDK 8 Candidates /usr/java/jdk1.8 /usr/java/jre1.8 @@ -27,28 +42,19 @@ /usr/lib/jdk8-latest # OpenJDK 8 Candidates +/usr/lib/jvm/java-8-openjdk-arm64 /usr/lib/jvm/java-1.8.0-openjdk-amd64 /usr/lib/jvm/java-1.8.0-openjdk-ppc64el /usr/lib/jvm/java-1.8.0-openjdk /usr/lib64/jvm/java-1.8.0-openjdk-1.8.0 -# Oracle JDK 7 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 - -# OpenJDK 7 Candidates -/usr/lib/jvm/java-1.7.0-openjdk -/usr/lib/jvm/java-7-openjdk-amd64 -/usr/lib/jvm/java-7-openjdk - # Misc. Candidates +/Library/Java/Home +/usr/bin/java /usr/java/default /usr/lib/jvm/java /usr/lib/jvm/jre /usr/lib/jvm/default-java /usr/lib/jvm/java-openjdk -/usr/lib/jvm/jre-openjdk \ No newline at end of file +/usr/lib/jvm/jre-openjdk +/usr/lib/jvm/java-oracle \ No newline at end of file
