From 68169b5dde3ab95c738ca06113db9bae7157a115 Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Thu, 13 Oct 2022 18:49:13 +0100 Subject: Add Java 17 as a known version Bug: 253389617 Test: TH Change-Id: Ifb96a47dc1af68f23c0a85104c79e615399a90b9 (cherry picked from commit 4e0f542648c4974db14edeb32da6841001a6d1d6) Merged-In: Ifb96a47dc1af68f23c0a85104c79e615399a90b9 --- tools/csuite-tradefed/src/scripts/csuite-tradefed | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/csuite-tradefed/src/scripts/csuite-tradefed b/tools/csuite-tradefed/src/scripts/csuite-tradefed index f3b887a..1de0f6b 100644 --- a/tools/csuite-tradefed/src/scripts/csuite-tradefed +++ b/tools/csuite-tradefed/src/scripts/csuite-tradefed @@ -35,9 +35,9 @@ checkPath adb checkPath java # Check the Java version. -JAVA_VERSION=$(java -version 2>&1 | head -n 1 | grep 'version [ "]\(1\.8\|9\|11\).*[ "]') +JAVA_VERSION=$(java -version 2>&1 | head -n 1 | grep 'version [ "]\(1\.8\|9\|11\|17\).*[ "]') if [ "${JAVA_VERSION}" == "" ]; then - echo "Wrong java version. 1.8, 9, or 11 is required." + echo "Wrong java version. 1.8, 9, 11, or 17 is required." exit fi -- cgit v1.2.3