This is an automated email from the ASF dual-hosted git repository. ardovm pushed a commit to branch catalina in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit fa262b04cf7564c5f40c7bc8b486ad28009e096b Author: Arrigo Marchiori <[email protected]> AuthorDate: Sat Jul 17 15:00:11 2021 +0200 Detect AdoptOpenJDK 1.8 on macOS --- main/scripting/java/build.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/main/scripting/java/build.xml b/main/scripting/java/build.xml index 8dca581..176db83 100644 --- a/main/scripting/java/build.xml +++ b/main/scripting/java/build.xml @@ -90,8 +90,14 @@ <and> <os family="mac"/> <os family="unix"/> - <contains string="${java.version}" substring="1.7" casesensitive="false" /> - <contains string="${java.vendor}" substring="Oracle" casesensitive="false" /> + <or> + <contains string="${java.version}" substring="1.7" casesensitive="false" /> + <contains string="${java.version}" substring="1.8" casesensitive="false" /> + </or> + <or> + <contains string="${java.vendor}" substring="Oracle" casesensitive="false" /> + <contains string="${java.vendor}" substring="adoptopenjdk" casesensitive="false" /> + </or> </and> </condition>
