summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml5
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml5
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml5
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx1
4 files changed, 13 insertions, 3 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index b008bb1fc0f7..69bed13b94d1 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>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 1fe7547d2919..5244db3a143c 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>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 429831121f7b..c866a3ec1ffb 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>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index f5d82f63fe51..c9195fb4730f 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -43,6 +43,7 @@ BEGIN_VENDOR_MAP()
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)