From c1c90499109b272117b320624acc12cc99aee583 Mon Sep 17 00:00:00 2001 From: Mike Kaplinskiy Date: Mon, 28 Feb 2022 09:19:34 -0800 Subject: [PATCH] adoptopenjdk is now called temurin Support the new path format when trying to find java versions --- programs/java_lookup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/java_lookup.py b/programs/java_lookup.py index 2f84ae4a16e..ff7fdb4f8ac 100644 --- a/programs/java_lookup.py +++ b/programs/java_lookup.py @@ -24,11 +24,11 @@ JDK_8_AND_UNDER_PATH_VERSION_REGEX_STRINGS = [ r"jdk(?P1\.(?P\d+)(\.\d+(_\d+)?)?)(\.jdk)?", - r"adoptopenjdk-(?P(?P[6-8])(\.\d+(_\d+)?)?)(\.jdk|\.jre)?", + r"(?:adoptopenjdk|temurin)-(?P(?P[6-8])(\.\d+(_\d+)?)?)(\.jdk|\.jre)?", ] JDK_9_AND_OVER_PATH_VERSION_REGEX_STRINGS = [ r"jdk-(?P(?P\d+)(\.\d+(\.\d+(_\d+)?)?)?)(\.jdk)?", - r"adoptopenjdk-(?P(?P9|\d{2,})(\.\d+(\.\d+(_\d+)?)?)?)(\.jdk|\.jre)?", + r"(?:adoptopenjdk|temurin)-(?P(?P9|\d{2,})(\.\d+(\.\d+(_\d+)?)?)?)(\.jdk|\.jre)?", ] JDK_8_AND_UNDER_PATH_VERSION_REGEXES = [