[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - jvmfwk/distributions jvmfwk/plugins

[Michael Weghorn (via logerrit)]

 jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml |    6 ++++++
 jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx         |    5 +++++
 2 files changed, 11 insertions(+)

New commits:
commit 0ab610848160721eb76e172bbbab378c6b77a638
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Tue Aug 13 15:04:24 2019 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Tue Aug 13 17:59:00 2019 +0200

    Support Java vendors "Ubuntu" and "Private Build" on Linux
    
    Updated OpenJDK 8 package in Ubuntu bionic and thus walhalla has vendor
    "Private Build" and current OpenJDK 11 package has "Ubuntu" as vendor.
    
    This leads to Java not being found unless those vendors are supported.
    
    This has been made to work on master with c4aa8b366fb879b0dd37241e70c5842825305620
    ("tdf#124503: Support JRE installations with unknown java.vendor property"), which
    was backported to distro/lhm/libreoffice-6-1+backports as well.
    
    However, to keep the change small for LO 5.2 and avoid conflicts while backporting,
    just add the two vendor strings actually being used on this branch.
    
    Change-Id: I0c4ae1db2b92a47512fe86ce73934813cfc26185
    Reviewed-on: https://gerrit.libreoffice.org/77417
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    Tested-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 18d44d4f58f6..418a4036a225 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -47,5 +47,11 @@
   <vendor name="AdoptOpenJdk">
     <minVersion>1.8.0</minVersion>
   </vendor>
+  <vendor name="Ubuntu">
+    <minVersion>1.8.0</minVersion>
+  </vendor>
+  <vendor name="Private Build">
+    <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 afe51216a334..da69427b81db 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -42,6 +42,11 @@ BEGIN_VENDOR_MAP()
     VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo)
     VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo)
     VENDOR_MAP_ENTRY("AdoptOpenJdk", SunInfo)
+#ifdef LINUX
+    VENDOR_MAP_ENTRY("Ubuntu", SunInfo)
+    VENDOR_MAP_ENTRY("Private Build", SunInfo)
+#endif
+
 #ifndef MACOSX
     VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo)
     VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo)