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

[Stephan Bergmann (via logerrit)]

 jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml  |    2 +-
 jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml |    2 +-
 jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4e230303a4daf2e3363e8c701ea2962953e812ee
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Mar 26 09:58:19 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Mar 29 16:04:13 2019 +0100

    javavendors_*.xml <updated> should not have been updated...
    
    ...for compatible changes 61c4f96d6ae6a80370774e53287edb27cbce8067 "Support
    AdoptOpenJDK" and 41507db590b24e1b9b45d95cad55c71ba2e4091d "Support Amazon
    Corretto".
    
    Changing <updated> causes jfw_startVM and jfw_getSelectedJRE (both
    jvmfwk/source/framework.cxx) to fail with JFW_E_INVALID_SETTINGS, which in turn
    causes functionality that requires a JVM to issue a GUI error dialog stating
    that the user must select a new JRE in the Options dialog.  While that behavior
    makes sense if a JRE was selected that would no longer be supported by the
    modified javavendors_*.xml, it is just annoying if an already selected JRE is
    still supported.  And a compatible change to javavendors_*.xml implies that an
    already selected JRE will still be supported.
    
    Now, on master towards LO 6.3, javavendors_*.xml have meanwhile been changed
    incompatibly with 49c21e31ce0501044a7d3602379f74c71dabb00b "Javavendors: Set
    minimum version to 1.6", so keep <updated> updated there.  And the updated
    <updated> from 61c4f96d6ae6a80370774e53287edb27cbce8067 "Support AdoptOpenJDK"
    are included in the published LO 6.2.1, so don't change those back.  But the
    updated <updated> from the subsequent 41507db590b24e1b9b45d95cad55c71ba2e4091d
    "Support Amazon Corretto" (cherry-picked to libreoffice-6-2 towards LO 6.2.3 as
    be9c3ff7ac198ae3bc04f2595d373b8711eecbc1) have not yet been included in a
    published LO, so they can be changed back to the previous values.
    
    Change-Id: I59113db8c3c6c449947692597bc9a3b2c4504a26
    Reviewed-on: https://gerrit.libreoffice.org/69730
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 69bed13b94d1..4b35f239b5b9 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
-  <updated>2019-02-02</updated>
+  <updated>2019-01-19</updated>
   <vendorInfos>
     <vendor name="Sun Microsystems Inc.">
       <minVersion>1.5.0</minVersion>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 5244db3a143c..e8015b8de94b 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
-  <updated>2019-02-02</updated>
+  <updated>2019-01-19</updated>
   <vendorInfos>
     <vendor name="Oracle Corporation">
       <minVersion>1.7.0</minVersion>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index c866a3ec1ffb..c134fc83b34a 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
-  <updated>2019-02-02</updated>
+  <updated>2019-01-19</updated>
   <vendorInfos>
     <vendor name="Oracle Corporation">
       <minVersion>1.6.0</minVersion>