Kaydet (Commit) 4e230303 authored tarafından Stephan Bergmann's avatar Stephan Bergmann Kaydeden (comit) Caolán McNamara

javavendors_*.xml <updated> should not have been updated...

...for compatible changes 61c4f96d "Support
AdoptOpenJDK" and 41507db5 "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 49c21e31 "Javavendors: Set
minimum version to 1.6", so keep <updated> updated there.  And the updated
<updated> from 61c4f96d "Support AdoptOpenJDK"
are included in the published LO 6.2.1, so don't change those back.  But the
updated <updated> from the subsequent 41507db5
"Support Amazon Corretto" (cherry-picked to libreoffice-6-2 towards LO 6.2.3 as
be9c3ff7) 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: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 75571c29
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--> -->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"> <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
<updated>2019-02-02</updated> <updated>2019-01-19</updated>
<vendorInfos> <vendorInfos>
<vendor name="Sun Microsystems Inc."> <vendor name="Sun Microsystems Inc.">
<minVersion>1.5.0</minVersion> <minVersion>1.5.0</minVersion>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--> -->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"> <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
<updated>2019-02-02</updated> <updated>2019-01-19</updated>
<vendorInfos> <vendorInfos>
<vendor name="Oracle Corporation"> <vendor name="Oracle Corporation">
<minVersion>1.7.0</minVersion> <minVersion>1.7.0</minVersion>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--> -->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"> <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
<updated>2019-02-02</updated> <updated>2019-01-19</updated>
<vendorInfos> <vendorInfos>
<vendor name="Oracle Corporation"> <vendor name="Oracle Corporation">
<minVersion>1.6.0</minVersion> <minVersion>1.6.0</minVersion>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment