diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-04-09 14:51:54 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-04-11 18:02:30 +0200 |
| commit | feca4bf320ae33dd1926f3a1afdc77c3b4f7b2a4 (patch) | |
| tree | c82f49cbeac5aa32d4e03224c73ea5b0cebd5591 /solenv | |
| parent | 600fbb77a0869723dd00b6ec1643bac1be2e211c (diff) | |
tdf#124503: Support JRE installations with unknown java.vendor property
After recent additions of 61c4f96d6ae6a80370774e53287edb27cbce8067 "Support
AdoptOpenJDK" and 41507db590b24e1b9b45d95cad55c71ba2e4091d "Support Amazon
Corretto" to our hard-coded list, there is now reports that at least Debian and
Ubuntu tried to distribute versions of OpenJDK with the java.vendor propety set
to string like "Debian" or "Ubuntu". Instead of trying to catch up with an
ever-growing hard-coded list, it is probably better to stop relying exclusively
on such a hard-coded list, and for unknown vendor values, try out whether the
SunInfo backend (which supports the "generic" OpenJDK) would be able to handle
the given JRE. (For simplicity, assume that any versions of such JREs are
supported. Our baseline is Java 6, and there are unlikely any older versions of
JREs from unknown vendors out there. If this turns out to be problematic, we
could include information about problematic vendors after all, or add a general
check that JREs from unknown vendors are at least Java 6.)
Many functions in jvmfwk/inc/vendorplugin.hxx that used to take a set of
sVendor/sMinVersion/sMaxVerison/arExcludeList paramters had to be revised to
take a vendorSettings parameter instead, and
VendorSettings::getVersionInformation has been changed to return a
boost::optional, so that unknown vendors can be handled gracefully.
Change-Id: Ibf915f2ddd59e09b77e2c03be688cac0547b9ac9
Reviewed-on: https://gerrit.libreoffice.org/70460
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 3d27b2fa9c5a03f78e5145377402f8a88e3da1be)
Reviewed-on: https://gerrit.libreoffice.org/70586
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/clang-format/blacklist | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index ef370d3289a7..7bcce11e2e63 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -8238,7 +8238,9 @@ jvmaccess/workbench/exceptiontest1.cxx jvmaccess/workbench/exceptiontest2.cxx jvmaccess/workbench/javainfo/javainfotest.cxx jvmfwk/inc/elements.hxx +jvmfwk/inc/fwkbase.hxx jvmfwk/inc/fwkutil.hxx +jvmfwk/inc/libxmlutil.hxx jvmfwk/inc/vendorbase.hxx jvmfwk/inc/vendorplugin.hxx jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -8262,10 +8264,8 @@ jvmfwk/source/elements.cxx jvmfwk/source/framework.cxx jvmfwk/source/framework.hxx jvmfwk/source/fwkbase.cxx -jvmfwk/source/fwkbase.hxx jvmfwk/source/fwkutil.cxx jvmfwk/source/libxmlutil.cxx -jvmfwk/source/libxmlutil.hxx l10ntools/inc/cfglex.hxx l10ntools/inc/cfgmerge.hxx l10ntools/inc/common.hxx |