summaryrefslogtreecommitdiff
path: root/jvmfwk/distributions
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-05-29 14:25:23 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-05-29 14:27:00 +0200
commit4498247e20492103c30b3a3a10891b9184fc41ad (patch)
tree83e63c5e066955feb088c87d1b8acc9eae8d0858 /jvmfwk/distributions
parentda0f3ca21ec55a8a94b7818233ea1a8af4c2d560 (diff)
Support Azul Zulu JRE on Linux and Mac OS X, too
Change-Id: I317506319b91daf006a0ba79874ff265ba6ed4da (cherry picked from commit 8541b178f4155c8d72a876245433a1aaf3d2634f)
Diffstat (limited to 'jvmfwk/distributions')
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml3
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml5
2 files changed, 7 insertions, 1 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 1c8c8bd32cdc..943b2ce1bf45 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -41,6 +41,9 @@
<vendor name="BEA Systems, Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
+ <vendor name="Azul Systems, Inc.">
+ <minVersion>1.6.0</minVersion>
+ </vendor>
</vendorInfos>
</javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index e2925ee8aaaa..ee5d093055b0 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -32,6 +32,9 @@
<vendor name="Oracle Corporation">
<minVersion>1.7.0</minVersion>
</vendor>
- </vendorInfos>
+ <vendor name="Azul Systems, Inc.">
+ <minVersion>1.6.0</minVersion>
+ </vendor>
+</vendorInfos>
</javaSelection>