|
 |
2b3429 |
From 3d4ae8919e4134cf5f7af4832d516329d06203c4 Mon Sep 17 00:00:00 2001
|
|
|
2b3429 |
From: Stephan Bergmann <sbergman@redhat.com>
|
|
|
2b3429 |
Date: Tue, 1 Dec 2020 13:05:50 +0100
|
|
|
2b3429 |
Subject: [PATCH] Resolves: rhbz#1900004 Support Red Hat, Inc. as Java vendor
|
|
|
2b3429 |
|
|
|
2b3429 |
(Backporting
|
|
|
2b3429 |
c4aa8b366fb879b0dd37241e70c5842825305620%5E%21> "tdf#124503: Support JRE
|
|
|
2b3429 |
installations with unknown java.vendor property" would have caused lots of merge
|
|
|
2b3429 |
conflicts, so just add "Red Hat, Inc." as a cheap fix.)
|
|
|
2b3429 |
|
|
|
2b3429 |
Change-Id: I343dd50a1d5ecfea478c66d58a5a72a09d5aa65b
|
|
|
2b3429 |
---
|
|
|
2b3429 |
jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml | 3 +++
|
|
|
2b3429 |
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx | 1 +
|
|
|
2b3429 |
2 files changed, 4 insertions(+)
|
|
|
2b3429 |
|
|
|
2b3429 |
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
|
|
|
2b3429 |
index 969ed01c6c21..d0a5bd114ace 100644
|
|
|
2b3429 |
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
|
|
|
2b3429 |
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
|
|
|
2b3429 |
@@ -40,5 +40,8 @@
|
|
|
2b3429 |
<vendor name="Azul Systems, Inc.">
|
|
|
2b3429 |
<minVersion>1.6.0</minVersion>
|
|
|
2b3429 |
</vendor>
|
|
|
2b3429 |
+ <vendor name="Red Hat, Inc.">
|
|
|
2b3429 |
+ <minVersion>1.6.0</minVersion>
|
|
|
2b3429 |
+ </vendor>
|
|
|
2b3429 |
</vendorInfos>
|
|
|
2b3429 |
</javaSelection>
|
|
|
2b3429 |
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
|
|
|
2b3429 |
index a08b237b62cd..b000684242a2 100644
|
|
|
2b3429 |
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
|
|
|
2b3429 |
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
|
|
|
2b3429 |
@@ -49,6 +49,7 @@ BEGIN_VENDOR_MAP()
|
|
|
2b3429 |
VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo)
|
|
|
2b3429 |
#endif
|
|
|
2b3429 |
VENDOR_MAP_ENTRY("Azul Systems, Inc.", OtherInfo)
|
|
|
2b3429 |
+ VENDOR_MAP_ENTRY("Red Hat, Inc.", OtherInfo)
|
|
|
2b3429 |
END_VENDOR_MAP()
|
|
|
2b3429 |
|
|
|
2b3429 |
|
|
|
2b3429 |
--
|
|
|
2b3429 |
2.28.0
|
|
|
2b3429 |
|