summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhimajin100000 <himajin100000@gmail.com>2019-01-19 14:25:50 +0900
committerMichael Weghorn <m.weghorn@posteo.de>2019-08-13 17:58:40 +0200
commit4ce8d2d865224e29e2b8bcb0c267a6437722aa73 (patch)
treec321df840729ca120b89e8bd38f196e213db18ad
parenta285ce82cfa9686c0f235c8b1a245f414311b5e3 (diff)
Support AdoptOpenJDK
Reviewed-on: https://gerrit.libreoffice.org/66634 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 61c4f96d6ae6a80370774e53287edb27cbce8067) Conflicts: jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml Change-Id: Idcfd542c6caede3d987e9b8219cf48114800daa5 Reviewed-on: https://gerrit.libreoffice.org/77416 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Michael Weghorn <m.weghorn@posteo.de>
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml6
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml6
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml6
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml4
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml4
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx1
6 files changed, 19 insertions, 8 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
index 13089bca3000..0d1d15da7610 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
@@ -16,7 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -35,6 +34,9 @@
<vendor name="Free Software Foundation, Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
- </vendorInfos>
+ <vendor name="AdoptOpenJdk">
+ <minVersion>1.8.0</minVersion>
+ </vendor>
+ </vendorInfos>
</javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 943b2ce1bf45..18d44d4f58f6 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -44,6 +44,8 @@
<vendor name="Azul Systems, Inc.">
<minVersion>1.6.0</minVersion>
</vendor>
- </vendorInfos>
-
+ <vendor name="AdoptOpenJdk">
+ <minVersion>1.8.0</minVersion>
+ </vendor>
+</vendorInfos>
</javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 61ab2e29a846..4e2b34ef429d 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -35,6 +35,8 @@
<vendor name="Azul Systems, Inc.">
<minVersion>1.6.0</minVersion>
</vendor>
-</vendorInfos>
-
+ <vendor name="AdoptOpenJdk">
+ <minVersion>1.8.0</minVersion>
+ </vendor>
+ </vendorInfos>
</javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index c7b0568c2d18..31de8c37b2b2 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -29,6 +29,8 @@
<vendor name="Sun Microsystems Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
+ <vendor name="AdoptOpenJdk">
+ <minVersion>1.8.0</minVersion>
+ </vendor>
</vendorInfos>
-
</javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 330461094180..66c9472d10af 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -35,6 +35,8 @@
<vendor name="Azul Systems, Inc.">
<minVersion>1.6.0</minVersion>
</vendor>
+ <vendor name="AdoptOpenJdk">
+ <minVersion>1.8.0</minVersion>
+ </vendor>
</vendorInfos>
-
</javaSelection>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index a08b237b62cd..afe51216a334 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -41,6 +41,7 @@ BEGIN_VENDOR_MAP()
#endif
VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo)
VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo)
+ VENDOR_MAP_ENTRY("AdoptOpenJdk", SunInfo)
#ifndef MACOSX
VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo)
VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo)