You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2022/02/13 16:17:53 UTC

[openoffice] 02/02: Add support for Azul and OpenJDK JDK's

This is an automated email from the ASF dual-hosted git repository.

ardovm pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 6b9dcf425c98079ba3243c445033c03406aeb447
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Fri Feb 11 09:45:16 2022 +0100

    Add support for Azul and OpenJDK JDK's
---
 main/scripting/java/build.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/main/scripting/java/build.xml b/main/scripting/java/build.xml
index db526af..c521d0a 100644
--- a/main/scripting/java/build.xml
+++ b/main/scripting/java/build.xml
@@ -91,7 +91,11 @@
       <os family="mac"/>
       <os family="unix"/>
       <contains string="${java.version}" substring="1.8" casesensitive="false" />
-      <contains string="${java.vendor}" substring="Oracle" casesensitive="false" /> 
+      <or>
+        <contains string="${java.vendor}" substring="Oracle" casesensitive="false" />
+        <contains string="${java.vendor}" substring="adoptopenjdk" casesensitive="false" />
+        <contains string="${java.vendor}" substring="azul" casesensitive="false" />
+      </or>
     </and>
   </condition>