There was a typo in the AdoptOpenJDK java.vendor property value
...ever since61c4f96d6a
"Support AdoptOpenJDK": At least the old AdoptOpenJDK 1.8.0_275 I had lying around on macOS reported it as "AdoptOpenJDK", not "AdoptOpenJdk". But instead of fixing all occurences of "AdoptOpenJdk", we can just as well get rid of that vendor listing completely now after3d27b2fa9c
"tdf#124503: Support JRE installations with unknown java.vendor property" and3460c16d7f
"Make getVersionInformation always return a VersionInfo ...even for JREs not listed in javavendors.xml, making it default to a VersionInfo with sMinVersion = "1.8.0". (For a rationale for not updating the <updated> elements of the modified jvmfwk/distributions/OpenOfficeorg/javavendors_*.xml see the commit message of95c38f6d77
"Drop support for dead GNU Java".) Change-Id: Iea34914201f604a0665a86dd07724628fa021c90 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125402 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
parent
cd5c8e5a99
commit
af9ae2d6a9
6 changed files with 0 additions and 16 deletions
|
@ -28,8 +28,5 @@
|
||||||
<vendor name="The FreeBSD Foundation">
|
<vendor name="The FreeBSD Foundation">
|
||||||
<minVersion>1.8.0</minVersion>
|
<minVersion>1.8.0</minVersion>
|
||||||
</vendor>
|
</vendor>
|
||||||
<vendor name="AdoptOpenJdk">
|
|
||||||
<minVersion>1.8.0</minVersion>
|
|
||||||
</vendor>
|
|
||||||
</vendorInfos>
|
</vendorInfos>
|
||||||
</javaSelection>
|
</javaSelection>
|
||||||
|
|
|
@ -37,9 +37,6 @@
|
||||||
<vendor name="Azul Systems, Inc.">
|
<vendor name="Azul Systems, Inc.">
|
||||||
<minVersion>1.8.0</minVersion>
|
<minVersion>1.8.0</minVersion>
|
||||||
</vendor>
|
</vendor>
|
||||||
<vendor name="AdoptOpenJdk">
|
|
||||||
<minVersion>1.8.0</minVersion>
|
|
||||||
</vendor>
|
|
||||||
<vendor name="Amazon.com Inc.">
|
<vendor name="Amazon.com Inc.">
|
||||||
<minVersion>1.8.0</minVersion>
|
<minVersion>1.8.0</minVersion>
|
||||||
</vendor>
|
</vendor>
|
||||||
|
|
|
@ -31,9 +31,6 @@
|
||||||
<vendor name="Azul Systems, Inc.">
|
<vendor name="Azul Systems, Inc.">
|
||||||
<minVersion>1.8.0</minVersion>
|
<minVersion>1.8.0</minVersion>
|
||||||
</vendor>
|
</vendor>
|
||||||
<vendor name="AdoptOpenJdk">
|
|
||||||
<minVersion>1.8.0</minVersion>
|
|
||||||
</vendor>
|
|
||||||
<vendor name="Amazon.com Inc.">
|
<vendor name="Amazon.com Inc.">
|
||||||
<minVersion>1.8.0</minVersion>
|
<minVersion>1.8.0</minVersion>
|
||||||
</vendor>
|
</vendor>
|
||||||
|
|
|
@ -25,8 +25,5 @@
|
||||||
<vendor name="Sun Microsystems Inc.">
|
<vendor name="Sun Microsystems Inc.">
|
||||||
<minVersion>1.8.0</minVersion>
|
<minVersion>1.8.0</minVersion>
|
||||||
</vendor>
|
</vendor>
|
||||||
<vendor name="AdoptOpenJdk">
|
|
||||||
<minVersion>1.8.0</minVersion>
|
|
||||||
</vendor>
|
|
||||||
</vendorInfos>
|
</vendorInfos>
|
||||||
</javaSelection>
|
</javaSelection>
|
||||||
|
|
|
@ -31,9 +31,6 @@
|
||||||
<vendor name="Azul Systems, Inc.">
|
<vendor name="Azul Systems, Inc.">
|
||||||
<minVersion>1.8.0</minVersion>
|
<minVersion>1.8.0</minVersion>
|
||||||
</vendor>
|
</vendor>
|
||||||
<vendor name="AdoptOpenJdk">
|
|
||||||
<minVersion>1.8.0</minVersion>
|
|
||||||
</vendor>
|
|
||||||
<vendor name="Amazon.com Inc.">
|
<vendor name="Amazon.com Inc.">
|
||||||
<minVersion>1.8.0</minVersion>
|
<minVersion>1.8.0</minVersion>
|
||||||
</vendor>
|
</vendor>
|
||||||
|
|
|
@ -37,7 +37,6 @@ VendorSupportMapEntry const gVendorMap[] ={
|
||||||
#endif
|
#endif
|
||||||
VENDOR_MAP_ENTRY<SunInfo>("Sun Microsystems Inc."),
|
VENDOR_MAP_ENTRY<SunInfo>("Sun Microsystems Inc."),
|
||||||
VENDOR_MAP_ENTRY<SunInfo>("Oracle Corporation"),
|
VENDOR_MAP_ENTRY<SunInfo>("Oracle Corporation"),
|
||||||
VENDOR_MAP_ENTRY<SunInfo>("AdoptOpenJdk"),
|
|
||||||
VENDOR_MAP_ENTRY<SunInfo>("Amazon.com Inc."),
|
VENDOR_MAP_ENTRY<SunInfo>("Amazon.com Inc."),
|
||||||
VENDOR_MAP_ENTRY<SunInfo>("Azul Systems, Inc."),
|
VENDOR_MAP_ENTRY<SunInfo>("Azul Systems, Inc."),
|
||||||
#ifndef MACOSX
|
#ifndef MACOSX
|
||||||
|
|
Loading…
Reference in a new issue