summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-11-01 21:17:48 +0100
committerTor Lillqvist <tml@collabora.com>2016-11-13 11:01:14 +0200
commita5efbf42d8aa1f3f75608caf792622a93370d850 (patch)
tree7fe63e98a1a00426454f20d6680e52223e8e566b
parentd9b7f6716c1bf547221179b4197f0dacf46124b2 (diff)
quickfix: Automatic selection of Oracle Java runtime on macOS
same issue as 36f637f7f21906fa3f37223e69b044db52036fb1 "tdf#103507 quickfix: Automatic selection of Oracle Java runtime on Windows" Change-Id: I3239bbf52263fb53bcd0ed54e8e983bda3b19182 (cherry picked from commit f537e561c7f61487253a07b76e6b8a1a87d30a27) Reviewed-on: https://gerrit.libreoffice.org/30475 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index ee5d093055b0..61ab2e29a846 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -23,15 +23,15 @@
<updated>2013-04-09</updated>
<vendorInfos>
+ <vendor name="Oracle Corporation">
+ <minVersion>1.7.0</minVersion>
+ </vendor>
<vendor name="Apple Computer, Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
<vendor name="Apple Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
- <vendor name="Oracle Corporation">
- <minVersion>1.7.0</minVersion>
- </vendor>
<vendor name="Azul Systems, Inc.">
<minVersion>1.6.0</minVersion>
</vendor>