[Libreoffice-commits] core.git: Branch 'feature/cib_contract57b' - jvmfwk/distributions jvmfwk/plugins

[Samuel Mehrbrodt (via logerrit)]

 jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml |    2 +-
 jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml   |    2 +-
 jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml  |    2 +-
 jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml     |    2 +-
 jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml     |    2 +-
 jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx           |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 7e31680aca4496168d42adfcc2e98050aff3152c
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Tue Sep 3 09:57:20 2019 +0200
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Tue Sep 3 09:57:20 2019 +0200

    Fix spelling of AdoptOpenJDK
    
    Current version (8u222) is not detected.
    
    Change-Id: I50fb32d1836bf2e5c6811300c8584708460089a7

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
index b05b6c797ea8..42244847d0ab 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
@@ -31,7 +31,7 @@
     <vendor name="Free Software Foundation, Inc.">
       <minVersion>1.5.0</minVersion>
     </vendor>
-    <vendor name="AdoptOpenJdk">
+    <vendor name="AdoptOpenJDK">
       <minVersion>1.8.0</minVersion>
     </vendor>
   </vendorInfos>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index b008bb1fc0f7..3ee399d476c2 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -40,7 +40,7 @@
     <vendor name="Azul Systems, Inc.">
       <minVersion>1.6.0</minVersion>
     </vendor>
-    <vendor name="AdoptOpenJdk">
+    <vendor name="AdoptOpenJDK">
       <minVersion>1.8.0</minVersion>
     </vendor>
   </vendorInfos>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 1fe7547d2919..417ed080b5fa 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -31,7 +31,7 @@
     <vendor name="Azul Systems, Inc.">
       <minVersion>1.6.0</minVersion>
     </vendor>
-    <vendor name="AdoptOpenJdk">
+    <vendor name="AdoptOpenJDK">
       <minVersion>1.8.0</minVersion>
     </vendor>
   </vendorInfos>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index 7771d81527df..9f9052469b8a 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -25,7 +25,7 @@
     <vendor name="Sun Microsystems Inc.">
       <minVersion>1.5.0</minVersion>
     </vendor>
-    <vendor name="AdoptOpenJdk">
+    <vendor name="AdoptOpenJDK">
       <minVersion>1.8.0</minVersion>
     </vendor>
   </vendorInfos>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 429831121f7b..34284cabadf9 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -31,7 +31,7 @@
     <vendor name="Azul Systems, Inc.">
       <minVersion>1.6.0</minVersion>
     </vendor>
-    <vendor name="AdoptOpenJdk">
+    <vendor name="AdoptOpenJDK">
       <minVersion>1.8.0</minVersion>
     </vendor>
   </vendorInfos>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index afe51216a334..8a4c47f3155f 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -41,7 +41,7 @@ BEGIN_VENDOR_MAP()
 #endif
     VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo)
     VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo)
-    VENDOR_MAP_ENTRY("AdoptOpenJdk", SunInfo)
+    VENDOR_MAP_ENTRY("AdoptOpenJDK", SunInfo)
 #ifndef MACOSX
     VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo)
     VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo)