This is an automated email from the ASF dual-hosted git repository. leginee pushed a commit to branch bazel-migration in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 30e07deeeec6a56f1a0a4696b923a96bb943610a Author: Peter Kovacs <[email protected]> AuthorDate: Wed Aug 5 21:33:16 2026 +0200 Accept Temurin JREs, and 64-bit JVMs that ship only a server VM Two independent reasons AOO rejects a current JDK on Windows. 1. Vendor "Temurin" is unknown. Adoptium renamed AdoptOpenJDK to Temurin in 2021, and java.vendor has read "Temurin" since 8u302. A JRE is accepted only if its vendor appears in BOTH gates — vendorlist.cxx's compiled-in map, which picks the handler class, and javavendors_*.xml, which is the policy — and it was in neither. Mapped to OtherInfo, the same handler as its own predecessor AdoptOpenJDK, since they are the same builds. Added to all three platform files; <updated> bumped, which is the documented mechanism for invalidating a JRE selection cached from an older list (framework.cxx compares javaInfo/@vendorUpdate against javaSelection/updated). 2. 64-bit JREs ship no client VM. The Windows runtime-path lists offered only bin/{client,hotspot,classic,jrockit}/jvm.dll, none of which exists in a 64-bit JDK — only bin/server/jvm.dll does — so even a supported vendor would fail once found. Upstream already made the equivalent fix on the Unix side ("/lib/server/libjvm.so // > 1.8" in both SunInfo and OtherInfo) and never on the Windows side; this completes it. Symptom of either, and of several unrelated causes, is the same unhelpful line, since it is what jfw_getSelectedJRE prints for every failure mode of jfw_getJavaInfoByPath: [Java framework] The JRE specified by the bootstrap variable UNO_JAVA_JFW_JREHOME or UNO_JAVA_JFW_ENV_JREHOME could not be recognized. Verified by //main/cppuhelper:cppuhelper_qa_propertysetmixin, which goes from 3/6 to 6/6: its three Java cases start a real JVM on Temurin 8u452 (32-bit) and load a Java UNO component through com.sun.star.loader.Java2. Change 1 is exercised by that test; change 2 is not — the 32-bit JDK still has bin/client — and matters for the x64 build. Worth reporting upstream: without this, stock AOO 4.1 finds no Java on a machine whose only JDK is a current Temurin, which is the default install from adoptium.net. Co-Authored-By: Claude Opus 5 <[email protected]> --- main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml | 6 +++++- main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml | 6 +++++- main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml | 6 +++++- main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 3 ++- main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 3 ++- main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx | 4 ++++ 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml index 7032416ff3..6223b69faa 100644 --- a/main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml +++ b/main/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml @@ -23,7 +23,7 @@ <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <updated>2019-07-27</updated> + <updated>2026-08-05</updated> <vendorInfos> <vendor name="Apple Computer, Inc."> @@ -38,6 +38,9 @@ <vendor name="AdoptOpenJDK"> <minVersion>1.8.0</minVersion> </vendor> + <vendor name="Temurin"> + <minVersion>1.8.0</minVersion> + </vendor> <vendor name="OpenJDK"> <minVersion>1.8.0</minVersion> </vendor> @@ -48,6 +51,7 @@ <library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library> <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library> <library vendor="AdoptOpenJDK">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library> + <library vendor="Temurin">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library> <library vendor="OpenJDK">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library> </plugins> </javaSelection> diff --git a/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml index 69a09123ca..2be0d1914f 100644 --- a/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml +++ b/main/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml @@ -23,7 +23,7 @@ <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <updated>2019-07-27</updated> + <updated>2026-08-05</updated> <vendorInfos> <vendor name="Oracle Corporation"> @@ -35,6 +35,9 @@ <vendor name="AdoptOpenJDK"> <minVersion>1.8.0</minVersion> </vendor> + <vendor name="Temurin"> + <minVersion>1.8.0</minVersion> + </vendor> <vendor name="OpenJDK"> <minVersion>1.8.0</minVersion> </vendor> @@ -44,6 +47,7 @@ <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> <library vendor="AdoptOpenJDK">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> + <library vendor="Temurin">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> <library vendor="OpenJDK">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> </plugins> </javaSelection> diff --git a/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml index b37ee4abfd..e1ba240504 100644 --- a/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml +++ b/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml @@ -23,7 +23,7 @@ <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <updated>2019-07-27</updated> + <updated>2026-08-05</updated> <vendorInfos> <vendor name="Oracle Corporation"> @@ -38,6 +38,9 @@ <vendor name="AdoptOpenJDK"> <minVersion>1.8.0</minVersion> </vendor> + <vendor name="Temurin"> + <minVersion>1.8.0</minVersion> + </vendor> <vendor name="OpenJDK"> <minVersion>1.8.0</minVersion> </vendor> @@ -48,6 +51,7 @@ <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library> <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library> <library vendor="AdoptOpenJDK">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library> + <library vendor="Temurin">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library> <library vendor="OpenJDK">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library> </plugins> </javaSelection> diff --git a/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index ba6f52d4a6..28b00b583f 100644 --- a/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/main/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -62,7 +62,8 @@ char const* const* OtherInfo::getRuntimePaths(int * size) "/bin/client/jvm.dll", "/bin/hotspot/jvm.dll", "/bin/classic/jvm.dll", - "/bin/jrockit/jvm.dll" + "/bin/jrockit/jvm.dll", + "/bin/server/jvm.dll" // 64-bit JREs ship no client VM #elif defined(OS2) "/bin/classic/jvm.dll", "/bin/client/jvm.dll", diff --git a/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index a0ecb25088..bfc271298f 100644 --- a/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx +++ b/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx @@ -64,7 +64,8 @@ char const* const* SunInfo::getRuntimePaths(int * size) "/bin/client/jvm.dll", "/bin/hotspot/jvm.dll", "/bin/classic/jvm.dll", - "/bin/jrockit/jvm.dll" + "/bin/jrockit/jvm.dll", + "/bin/server/jvm.dll" // 64-bit JREs ship no client VM #elif defined(OS2) "/bin/classic/jvm.dll", "/bin/client/jvm.dll", diff --git a/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx index 78ecd61474..47a91af209 100644 --- a/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx +++ b/main/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx @@ -52,6 +52,10 @@ BEGIN_VENDOR_MAP() VENDOR_MAP_ENTRY("Free Software Foundation, Inc.", GnuInfo) VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo) VENDOR_MAP_ENTRY("AdoptOpenJDK", OtherInfo) + // Adoptium renamed AdoptOpenJDK to Temurin in 2021; java.vendor reads + // "Temurin" from 8u302 on. Same builds, so same handler as its own + // predecessor above. + VENDOR_MAP_ENTRY("Temurin", OtherInfo) VENDOR_MAP_ENTRY("OpenJDK", SunInfo) END_VENDOR_MAP()
