[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - jvmfwk/distributions

[Stephan Bergmann]

 jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4db3156d112fa236ec3ada11d5322b4c95a9d1ee
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 1 21:17:48 2016 +0100

    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 at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index ee5d093..61ab2e2 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>