commit be9c3ff7ac198ae3bc04f2595d373b8711eecbc1
author Mike Kaganski <mike.kaganski@collabora.com> Sat Feb 02 18:33:37 2019 +0300
committer Stephan Bergmann <sbergman@redhat.com> Tue Mar 26 08:43:48 2019 +0100
tree 61382ab8ce3f6606847aeeb3b1220908f79af63c
parent 49e07e06f99e769ee48a71d9d80765f363f5bbb6

Support Amazon Corretto (tdf#124297)

https://aws.amazon.com/corretto

Change-Id: I7f9ef25e1e81ededce426bad661adc6880feb9d3
Reviewed-on: https://gerrit.libreoffice.org/67289
(cherry picked from commit 41507db590b24e1b9b45d95cad55c71ba2e4091d)
Reviewed-on: https://gerrit.libreoffice.org/69688
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index b008bb1..69bed13 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -17,7 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
  <updated>2019-01-19</updated>
  <updated>2019-02-02</updated>
  <vendorInfos>
    <vendor name="Sun Microsystems Inc.">
      <minVersion>1.5.0</minVersion>
@@ -43,5 +43,8 @@
    <vendor name="AdoptOpenJdk">
      <minVersion>1.8.0</minVersion>
    </vendor>
    <vendor name="Amazon.com Inc.">
      <minVersion>1.8.0</minVersion>
    </vendor>
  </vendorInfos>
</javaSelection>

jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 1fe7547..5244db3 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -17,7 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
  <updated>2019-01-19</updated>
  <updated>2019-02-02</updated>
  <vendorInfos>
    <vendor name="Oracle Corporation">
      <minVersion>1.7.0</minVersion>
@@ -34,5 +34,8 @@
    <vendor name="AdoptOpenJdk">
      <minVersion>1.8.0</minVersion>
    </vendor>
    <vendor name="Amazon.com Inc.">
      <minVersion>1.8.0</minVersion>
    </vendor>
  </vendorInfos>
</javaSelection>

jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 4298311..c866a3e 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -17,7 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
  <updated>2019-01-19</updated>
  <updated>2019-02-02</updated>
  <vendorInfos>
    <vendor name="Oracle Corporation">
      <minVersion>1.6.0</minVersion>
@@ -34,5 +34,8 @@
    <vendor name="AdoptOpenJdk">
      <minVersion>1.8.0</minVersion>
    </vendor>
    <vendor name="Amazon.com Inc.">
      <minVersion>1.8.0</minVersion>
    </vendor>
  </vendorInfos>
</javaSelection>

jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index b4818b1..5cb85ad 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -43,6 +43,7 @@
    VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo)
    VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo)
    VENDOR_MAP_ENTRY("AdoptOpenJdk", SunInfo)
    VENDOR_MAP_ENTRY("Amazon.com Inc.", SunInfo)
#ifndef MACOSX
    VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo)
    VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo)