summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml3
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml3
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml3
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml3
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml3
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx1
6 files changed, 0 insertions, 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