diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-10-20 18:57:27 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-10-20 21:33:53 +0200 |
| commit | 95c38f6d77f1cb6ff3dc229c5e7130b2e732891d (patch) | |
| tree | e7e9b7aa240df45aa9843d9e02d6609f49e850f6 /jvmfwk/distributions/OpenOfficeorg | |
| parent | 67c15910606575b862410179698f81e7a598aa44 (diff) | |
Drop support for dead GNU Java
...which no longer worked anyway at least since
aafc10c9edb61e13ac557c7e43c8d4a31dce4f37 "Bump Java baseline to Java 8":
According to <https://en.wikipedia.org/wiki/GNU_Compiler_for_Java>, the last
version of GCC providing Java was GCC 6.5. But trying to add a build of that
("Tools - Options... - LibreOffice - Advanced - Java Options - Add...") would
already have failed before this commit due to a java.lang.ClassFormatError
("JREProperties (unrecognized class file version)") when executing the
JREProperties code compiled with --release 8. (Whereas now it fails because it
cannot even determine a JRE installation there according to the SunInfo rather
than GnuInfo rules used for the now-unknown vendor.)
The <updated> elements of the modified
jvmfwk/distributions/OpenOfficeorg/javavendors_*.xml have not been updated in
line with the rules documented at the end of jvmfwk/README.md: As mentioned
above, a GNU Java JRE cannot have been selected prior to this commit anyway, so
even though this is nominally an incompatible change of the xml files,
actually updating <updated> would only have negative ("just annoying if an
already selected JRE is still supported") but no positive consequences.
Change-Id: Ica245677dae977360bdb3c6544897eb060c3f844
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123906
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'jvmfwk/distributions/OpenOfficeorg')
| -rw-r--r-- | jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml | 3 | ||||
| -rw-r--r-- | jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml index 89ffc08ffc8d..0b41b60a9cab 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml @@ -28,9 +28,6 @@ <vendor name="The FreeBSD Foundation"> <minVersion>1.8.0</minVersion> </vendor> - <vendor name="Free Software Foundation, Inc."> - <minVersion>1.8.0</minVersion> - </vendor> <vendor name="AdoptOpenJdk"> <minVersion>1.8.0</minVersion> </vendor> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml index ad9d287a62a7..22f73a7dc6bb 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml @@ -31,9 +31,6 @@ <vendor name="Blackdown Java-Linux Team"> <minVersion>1.8.0</minVersion> </vendor> - <vendor name="Free Software Foundation, Inc."> - <minVersion>1.8.0</minVersion> - </vendor> <vendor name="BEA Systems, Inc."> <minVersion>1.8.0</minVersion> </vendor> |