From af9ae2d6a968656208528144e5f01b17b383126c Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 17 Nov 2021 15:03:56 +0100
Subject: [PATCH] There was a typo in the AdoptOpenJDK java.vendor property
 value

...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>
---
 jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml | 3 ---
 jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml   | 3 ---
 jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml  | 3 ---
 jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml     | 3 ---
 jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml     | 3 ---
 jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx           | 1 -
 6 files changed, 16 deletions(-)

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
index 0b41b60a9cab..b7776db5886b 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
@@ -28,8 +28,5 @@
     <vendor name="The FreeBSD Foundation">
       <minVersion>1.8.0</minVersion>
     </vendor>
-    <vendor name="AdoptOpenJdk">
-      <minVersion>1.8.0</minVersion>
-    </vendor>
   </vendorInfos>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 22f73a7dc6bb..09fcf373329e 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -37,9 +37,6 @@
     <vendor name="Azul Systems, Inc.">
       <minVersion>1.8.0</minVersion>
     </vendor>
-    <vendor name="AdoptOpenJdk">
-      <minVersion>1.8.0</minVersion>
-    </vendor>
     <vendor name="Amazon.com Inc.">
       <minVersion>1.8.0</minVersion>
     </vendor>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 23d6485105c8..a10e366f5598 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -31,9 +31,6 @@
     <vendor name="Azul Systems, Inc.">
       <minVersion>1.8.0</minVersion>
     </vendor>
-    <vendor name="AdoptOpenJdk">
-      <minVersion>1.8.0</minVersion>
-    </vendor>
     <vendor name="Amazon.com Inc.">
       <minVersion>1.8.0</minVersion>
     </vendor>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index 4e721521b2df..9eab9d832a8f 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -25,8 +25,5 @@
     <vendor name="Sun Microsystems Inc.">
       <minVersion>1.8.0</minVersion>
     </vendor>
-    <vendor name="AdoptOpenJdk">
-      <minVersion>1.8.0</minVersion>
-    </vendor>
   </vendorInfos>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 1e2e1f060c5d..d37db0a16544 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -31,9 +31,6 @@
     <vendor name="Azul Systems, Inc.">
       <minVersion>1.8.0</minVersion>
     </vendor>
-    <vendor name="AdoptOpenJdk">
-      <minVersion>1.8.0</minVersion>
-    </vendor>
     <vendor name="Amazon.com Inc.">
       <minVersion>1.8.0</minVersion>
     </vendor>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index 380a98f8e6cb..96cc051675f9 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -37,7 +37,6 @@ VendorSupportMapEntry const gVendorMap[] ={
 #endif
     VENDOR_MAP_ENTRY<SunInfo>("Sun Microsystems Inc."),
     VENDOR_MAP_ENTRY<SunInfo>("Oracle Corporation"),
-    VENDOR_MAP_ENTRY<SunInfo>("AdoptOpenJdk"),
     VENDOR_MAP_ENTRY<SunInfo>("Amazon.com Inc."),
     VENDOR_MAP_ENTRY<SunInfo>("Azul Systems, Inc."),
 #ifndef MACOSX