summaryrefslogtreecommitdiff
path: root/jvmfwk/distributions
AgeCommit message (Collapse)Author
2021-11-18There was a typo in the AdoptOpenJDK java.vendor property valueStephan Bergmann
...ever since 61c4f96d6ae6a80370774e53287edb27cbce8067 "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 after 3d27b2fa9c5a03f78e5145377402f8a88e3da1be "tdf#124503: Support JRE installations with unknown java.vendor property" and 3460c16d7f749d8d2a59d8b927df5ec31f64a083 "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 of 95c38f6d77f1cb6ff3dc229c5e7130b2e732891d "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>
2021-10-21Restrict macOS ARM64 to Java >= 17Stephan Bergmann
The commit message of e529461bcb126e0975ffa3f86e1fd5a630551de2 "Enable JVM also on macOS ARM64" had identified <https://cdn.azul.com/zulu/bin/zulu17.0.63-ea-jdk17.0.0-ea.27-macosx_aarch64.zip> "to work reliably now" while other (older Zulu) JVMs "have always crashed with SIGBUS that smelled like our uses of pthread_jit_write_protect_np in bridges/source/cpp_uno/shared/vtablefactory.cxx colided with corresponding calls in the in-process JVM". Those observations would be in line with <http://openjdk.java.net/jeps/391> "JEP 391: macOS/AArch64 Port" only implemented for Java 17 now (see <https://github.com/openjdk/jdk/commit/dbc9e4b50cdda35f5712deaf440c49f50b9edc96> "8253795: Implementation of JEP 391: macOS/AArch64 Port"). So for macOS ARM64 assume that all OpenJDK variants (i.e., providing an empty jvmfwk/distributions/OpenOfficeorg/javavendors_macosx_aarch64.xml) of at least Java 17 (i.e., building on recent 3460c16d7f749d8d2a59d8b927df5ec31f64a083 "Make getVersionInformation always return a VersionInfo" and "change the hardcoded '1.8.0' to '17' for just that one platform") work. Change-Id: I11e8ba232cee066a25a49edebd0cc50e24e84124 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123989 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-10-20Drop support for dead GNU JavaStephan Bergmann
...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>
2019-07-26Bump Java baseline to Java 8Stephan Bergmann
...as discussed at <https://lists.freedesktop.org/archives/libreoffice/2019-July/083193.html> "Minutes of ESC call: 2019-07-25". 3d27b2fa9c5a03f78e5145377402f8a88e3da1be "tdf#124503: Support JRE installations with unknown java.vendor property" had added support for JREs with unknown vendor strings without checking that those JREs have a matching version (Java 6 back then, Java 8 now). That check has still not be implemented, assuming that Java 8 is old enough in practice so that any such JRE encountered in the wild will at least be Java 8 anyway. Change-Id: I0205a34955368067c698bcabd24de84205a382bd Reviewed-on: https://gerrit.libreoffice.org/76365 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-02-13Javavendors: Set minimum version to 1.6Samuel Mehrbrodt
which is our new baseline (as discussed in ESC call 2019-02-07) Change-Id: Ie94e2af4e9231fc355961cdf3d9241b1c5748943 Reviewed-on: https://gerrit.libreoffice.org/67750 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-02-04Support Amazon CorrettoMike Kaganski
https://aws.amazon.com/corretto Change-Id: I7f9ef25e1e81ededce426bad661adc6880feb9d3 Reviewed-on: https://gerrit.libreoffice.org/67289 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins
2019-01-22Support AdoptOpenJDKhimajin100000
Change-Id: Idcfd542c6caede3d987e9b8219cf48114800daa5 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>
2016-11-01Clean up javavendors_*.xml filesStephan Bergmann
...and drop unnecessary javavendors_template.xml Change-Id: Ib7f2d595d2086c1d3bf324f19693b9032cf00cd7
2016-11-01quickfix: Automatic selection of Oracle Java runtime on macOSStephan Bergmann
same issue as 36f637f7f21906fa3f37223e69b044db52036fb1 "tdf#103507 quickfix: Automatic selection of Oracle Java runtime on Windows" Change-Id: I3239bbf52263fb53bcd0ed54e8e983bda3b19182
2016-10-28tdf#103507 quickfix: Automatic selection of Oracle Java runtime on WindowsStephan Bergmann
...which had been broken since 5e9a2e9b0f33ab50aa3a84728db75383aede19d9 "Check each potential JRE location only once", as jfw_findAndSelectJRE calls jfw_plugin_getAllJavaInfos on each vendor in turn, but that now only operates on any items newly added by addAllJREInfos, so the first call to jfw_plugin_getAllJavaInfos (with sVendor being "Sun Microsystems Inc." unsuccesfully operated on all items, and the next call (with sVendor being "Oracle Corporation") didn't see any further items to operate on. So the quickfix (at least for any Java runtimes by Oracle) is to reorder the vendors in javavendors_wnt.xml. The proper fix will be to reorder the code so it obtains the list of all Java runtimes only once, and then matches that list against the known vendors. (Other plaforms appear not to be affected by this issue. Some jvmfwk/distributions/OpenOfficeorg/javavendors_*.xml already sort Oracle first, anyway. And e.g. on Linux, jfw_findAndSelectJRE typically already succeeds with calling jfw_plugin_getJavaInfosFromPath and so doesn't reach the problematic code. Change-Id: Ied571ae1d4745d53ce0c8697d0f1b268e1aac407
2015-05-29Support Azul Zulu JRE on Linux and Mac OS X, tooStephan Bergmann
Change-Id: I317506319b91daf006a0ba79874ff265ba6ed4da
2015-05-27Support Azul Zulu JRE (at least on Windows)Stephan Bergmann
(<http://www.azulsystems.com/products/zulu/downloads> also offers it for Linux and Mac OS X, so it could be added to more javavendors_*.xml if need be; I only checked it actually works with a Windows 64-bit LO build) Change-Id: If549a0d5bf1459eba2f6ba2bd545cfd55a20cea6
2014-10-09Remove jvmfwk plugin featureStephan Bergmann
...which was effectively unused; there only ever was a single sunjavaplugin that is now folded directly into jvmfwk. Leaves room for further clean up. Change-Id: I14dd2a3a09bd1ce9a8c3f5c156628ec11d954a0b
2013-08-27fdo#67313: Use "lo" suffix for private URE libsStephan Bergmann
...(like is done for most of LO's non-URE libs already) to reduce likelihood of name clashes, esp. on Windows where URE libs are found via PATH. This introduces PRIVATELIBS_URE, and removes now-unused UNOLIBS_URE. Change-Id: Ib95dd45f18de140a54e62d632dbf2239f83c232e
2013-05-18Add Oracle as a Java vendor for Solaris.Pedro Giffuni
Conflicts: jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml Change-Id: Ifaa60fafb0db62ed60ba4080b6bb3713d8d9e3be
2013-05-02Resolves: #i66923# Add support for JRockit JVMAriel Constenla-Haile
(cherry picked from commit cb38ee0da6fa928118fbc1da118a707d7799cb40) Conflicts: jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Change-Id: Iffd413ba1d74ae3b7da58df7b092c43c4f64a7c9
2013-04-09Look for Oracle Java 7 in a 64-bit LibreOffice on OS XTor Lillqvist
Change-Id: Ife3fc97c11ab5216df62aba92dc11ed6cf07c154
2012-07-13re-base on ALv2 code. Includes:Michael Meeks
cws mba34issues01: #i117709#: make sure that parent of error message box is visible Patch contributed by Mathias Bauer http://svn.apache.org/viewvc?view=revision&revision=1172346 i#119036 - improve user experience of certification dialog - only shown once Patch contributed by Oliver-Rainer Wittmann http://svn.apache.org/viewvc?view=revision&revision=1299727
2012-06-22.xml files don't need executable bitsMichael Stahl
Change-Id: I399d086181a9f513cd95157e815551f0be9b9e95
2012-06-03fdo#48946: URE_INTERNAL_LIB_DIR/libsunjavaplugin.dll does not exist.David Ostrovsky
Change-Id: If2d21c3f04459a4cee1ebb748ddc885915063b31
2011-12-24gbuildize jvmfwk, part 2: finish & clean upDavid Tardon
2011-12-23we do not support OS/2David Tardon
2011-12-23add lib prefix to sunjavapluginDavid Tardon
2011-11-25duplicate "add Oracle Java 1.7.0 recognition" from javavendors_linux -> wntStephan Bergmann
2011-09-13add Oracle Java 1.7.0 recognitionHanno Meyer-Thurow
2011-04-18Remove OS/2 support.Francois Tigeot
2010-10-13tweaks for AIXCaolán McNamara
2010-02-12changefileheader2: #i109125#: change source file copyright notice from Sun ↵Jens-Heiner Rechtien
Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)
2009-09-11CWS-TOOLING: integrate CWS jl131Kurt Zenker
2009-09-02 16:42:40 +0200 jl r275720 : #i97896# 2009-08-31 13:01:53 +0200 jl r275599 : CWS-TOOLING: rebase CWS jl131 to trunk@275331 (milestone: DEV300:m56) 2009-07-31 14:35:30 +0200 jl r274531 : CWS-TOOLING: rebase CWS jl131 to trunk@274203 (milestone: DEV300:m53) 2009-07-23 14:20:32 +0200 jl r274272 : #i79839# better error text when trying to modify shared layer without having write permission, eg. unopkg add --shared, unopkg remove --shared, unopkg reinstall --shared 2009-07-22 16:38:02 +0200 jl r274252 : #i97896# localize error message for lock file 2009-07-22 16:37:22 +0200 jl r274251 : #i80462# unprecise wording in updatedialog 2009-07-22 16:36:06 +0200 jl r274250 : #i97896# localize error message for lock file 2009-07-22 16:35:20 +0200 jl r274249 : #i97896# localize error message for lock file 2009-07-22 15:07:30 +0200 jl r274242 : #i98873# minimum java version is 1.5 since OOo 3.0
2009-09-10CWS-TOOLING: integrate CWS os2port06dev300Kurt Zenker
2009-09-05 22:49:00 +0200 ydario r275858 : #i99588# applied os2port06 diff to DEV300 tree.
2009-04-02CWS-TOOLING: integrate CWS jl119_DEV300Ivo Hinkelmann
2009-03-13 08:14:58 +0100 jl r269453 : CWS-TOOLING: rebase CWS jl119 to branches/OOO310@269350 (milestone: OOO310:m5) 2009-03-10 16:01:33 +0100 jl r269280 : #i98990# apply patch by jbu: fixing the python script provider 2009-03-10 13:25:02 +0100 jl r269268 : #i93939# 2009-03-10 11:44:07 +0100 jl r269261 : #i93939# 2009-03-09 17:14:58 +0100 jl r269205 : #i93939# choose a different JRE when the selected one was uninstalled 2009-03-09 16:34:34 +0100 jl r269201 : #i93939# choose a different JRE when the selected one was uninstalled 2009-03-05 16:40:16 +0100 jl r268924 : #99618# Do not migrate java settings 2009-02-25 14:29:53 +0100 jl r268439 : #i99618# do not invalidate existing javasettings by using a new date in the update element
2009-02-12CWS-TOOLING: integrate CWS jl115Oliver Bolte
2009-01-29 13:13:16 +0100 jsk r267121 : #i98596# 2009-01-23 14:50:24 +0100 jl r266821 : #98273# climaker.exe.config prevents using publisher policy 2009-01-23 14:10:51 +0100 jl r266817 : #i98392# wrong use of iterator when removing a factory, which may lead to a crash 2009-01-19 11:36:29 +0100 jl r266484 : #i96690# test extension 2009-01-19 11:32:46 +0100 jl r266483 : #i96690# 2009-01-16 17:09:19 +0100 jl r266439 : #i96690# ignore duplicate path URLs in manifest.xml. These may be introduces by copy/paste and lead to nasty errors 2009-01-16 14:04:00 +0100 jl r266416 : #i92032# increasing minimum version of Java 2009-01-16 10:57:02 +0100 jl r266407 : #i96816# compiler warning breaks build 2009-01-15 16:58:54 +0100 jl r266384 : #i94938# patch from cmc. 2009-01-15 16:35:18 +0100 jl r266383 : #i95838# applying patch 2009-01-15 16:15:58 +0100 jl r266381 : #i70855# #i96102# WaitForMultipleObjects wrong implemented 2009-01-14 12:46:21 +0100 jl r266287 : #i98038# increased assembly versions 2009-01-14 12:44:55 +0100 jl r266285 : #i98038# increased assembly versions 2009-01-13 17:11:20 +0100 jl r266239 : #i98038# new test library for assemblies from 3.0.1
2009-01-21CWS-TOOLING: integrate CWS jl111Vladimir Glazounov
2009-01-13 13:36:03 +0100 jl r266218 : #i91642# do not localize the error message, just print out the changed text in plain English 2009-01-09 12:54:03 +0100 jl r266075 : Committing changes which have been originally made on cws jl105 but which were not integrated on the master, due to a failed integration procedured. Then only three files were integrated. The files committed fix i80449, i83134, i86079, i91204, i92869 2009-01-07 15:10:52 +0100 jl r265970 : CWS-TOOLING: rebase CWS jl111 to trunk@265758 (milestone: DEV300:m38) 2009-01-06 10:38:21 +0100 jl r265900 : #i93235# #i93946# migrating to svn
2008-04-11INTEGRATION: CWS changefileheader (1.8.4); FILE MERGEDRüdiger Timm
2008/03/31 07:24:49 rt 1.8.4.1: #i87441# Change license header to LPGL v3.
2008-03-18INTEGRATION: CWS sb83 (1.7.16); FILE MERGEDVladimir Glazounov
2008/02/14 15:38:18 sb 1.7.16.1: #i84200# use standard OOo javavendors.xml for StarOffice, too
2008-03-18INTEGRATION: CWS sb83 (1.1.2); FILE ADDEDVladimir Glazounov
2008/02/14 15:39:26 sb 1.1.2.1: #i84200# moved here from dead ../StarOffice/ sibling
2008-03-18INTEGRATION: CWS sb83 (1.1.2); FILE ADDEDVladimir Glazounov
2008/02/14 15:39:38 sb 1.1.2.1: #i84200# moved here from dead ../StarOffice/ sibling
2007-11-02INTEGRATION: CWS os2port02 (1.6.20); FILE MERGEDJens-Heiner Rechtien
2007/10/06 16:42:58 ydario 1.6.20.1: Add OS/2 javavendors info. Issue number: i81904 Submitted by: ydario Reviewed by: ydario
2007-11-02INTEGRATION: CWS os2port02 (1.1.2); FILE ADDEDJens-Heiner Rechtien
2007/10/06 16:42:58 ydario 1.1.2.1: Add OS/2 javavendors info. Issue number: i81904 Submitted by: ydario Reviewed by: ydario
2007-10-22#i82857# solve conflict with m234 ( sb71)Eric Bachard
2007-10-15INTEGRATION: CWS sb71 (1.6.96); FILE MERGEDVladimir Glazounov
2007/04/16 13:48:38 sb 1.6.96.1: #i75466# Use vnd.sun.star.expand URLs in javavendors.xml (so that the same files can now be used for OOo and URE).
2007-10-15INTEGRATION: CWS sb71 (1.4.96); FILE MERGEDVladimir Glazounov
2007/04/16 13:48:38 sb 1.4.96.1: #i75466# Use vnd.sun.star.expand URLs in javavendors.xml (so that the same files can now be used for OOo and URE).
2007-10-15INTEGRATION: CWS sb71 (1.6.46); FILE MERGEDVladimir Glazounov
2007/04/16 13:48:38 sb 1.6.46.1: #i75466# Use vnd.sun.star.expand URLs in javavendors.xml (so that the same files can now be used for OOo and URE).
2007-10-15INTEGRATION: CWS sb71 (1.7.72); FILE MERGEDVladimir Glazounov
2007/04/16 13:48:38 sb 1.7.72.1: #i75466# Use vnd.sun.star.expand URLs in javavendors.xml (so that the same files can now be used for OOo and URE).
2007-01-25INTEGRATION: CWS ause069 (1.5.44); FILE MERGEDOliver Bolte
2006/11/28 09:52:58 hjs 1.5.44.1: #i70359# remove forced shell calls
2006-05-04INTEGRATION: CWS pj54 (1.5.52); FILE MERGEDRüdiger Timm
2006/05/02 09:42:57 pjanik 1.5.52.1: #i64988#: Allow Java 1.5.0 to be used on Mac OS X.
2006-01-31INTEGRATION: CWS freebsd04 (1.4.18); FILE MERGEDKurt Zenker
2006/01/19 11:14:14 maho 1.4.18.1: #i56951# javavendors_linux.xml can be used for FreeBSD as well
2005-10-25INTEGRATION: CWS morejava (1.6.10); FILE MERGEDJens-Heiner Rechtien
2005/08/26 13:55:40 fridrich_strba 1.6.10.1: Issue number: Submitted by: fridrich_strba Reviewed by: fridrich_strba Add JRE of BEA Systems, Inc. among supported java virtual machines
2005-09-07INTEGRATION: CWS ooo19126 (1.3.52); FILE MERGEDRüdiger Timm
2005/09/05 17:12:17 rt 1.3.52.1: #i54170# Change license header: remove SISSL
2005-05-11INTEGRATION: CWS linuxppc02 (1.5.20); FILE MERGEDRüdiger Timm
2005/05/03 20:05:50 ericb 1.5.20.1: i38974 max version is 142 for IBM jre on Linux PPC