summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-07-26 10:19:39 +0200
committerAndras Timar <andras.timar@collabora.com>2019-11-19 13:13:13 +0100
commitbfcc312375cf3a5f0b4f67a80a417ec3625f2ca3 (patch)
tree66840088c6130f31c6a8a923aa6cb9daa555761e /jvmfwk
parentb98f67de2ecfa20eff4fd532f4361198676dd491 (diff)
Bump Java baseline to Java 8
...as discussed at <https://lists.freedesktop.org/archives/libreoffice/2019-July/083193.html> "Minutes of ESC call: 2019-07-25". 3d27b2fa9c5a03f78e5145377402f8a88e3da1be "tdf#124503: Support JRE installations with unknown java.vendor property" had added support for JREs with unknown vendor strings without checking that those JREs have a matching version (Java 6 back then, Java 8 now). That check has still not be implemented, assuming that Java 8 is old enough in practice so that any such JRE encountered in the wild will at least be Java 8 anyway. Change-Id: I0205a34955368067c698bcabd24de84205a382bd Reviewed-on: https://gerrit.libreoffice.org/76365 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml10
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml16
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml10
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml6
-rw-r--r--jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml10
5 files changed, 26 insertions, 26 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
index b05b6c797ea8..89ffc08ffc8d 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
@@ -17,19 +17,19 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
- <updated>2019-01-19</updated>
+ <updated>2019-07-26</updated>
<vendorInfos>
<vendor name="Oracle Corporation">
- <minVersion>1.7.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="Sun Microsystems Inc.">
- <minVersion>1.5.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="The FreeBSD Foundation">
- <minVersion>1.6.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="Free Software Foundation, Inc.">
- <minVersion>1.5.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="AdoptOpenJdk">
<minVersion>1.8.0</minVersion>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 4b35f239b5b9..ad9d287a62a7 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -17,28 +17,28 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
- <updated>2019-01-19</updated>
+ <updated>2019-07-26</updated>
<vendorInfos>
<vendor name="Sun Microsystems Inc.">
- <minVersion>1.5.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="Oracle Corporation">
- <minVersion>1.6.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="IBM Corporation">
- <minVersion>1.5.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="Blackdown Java-Linux Team">
- <minVersion>1.5.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="Free Software Foundation, Inc.">
- <minVersion>1.5.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="BEA Systems, Inc.">
- <minVersion>1.5.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="Azul Systems, Inc.">
- <minVersion>1.6.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="AdoptOpenJdk">
<minVersion>1.8.0</minVersion>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index e8015b8de94b..23d6485105c8 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -17,19 +17,19 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
- <updated>2019-01-19</updated>
+ <updated>2019-07-26</updated>
<vendorInfos>
<vendor name="Oracle Corporation">
- <minVersion>1.7.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="Apple Computer, Inc.">
- <minVersion>1.5.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="Apple Inc.">
- <minVersion>1.5.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="Azul Systems, Inc.">
- <minVersion>1.6.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="AdoptOpenJdk">
<minVersion>1.8.0</minVersion>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index 7771d81527df..4e721521b2df 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -17,13 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
- <updated>2019-01-19</updated>
+ <updated>2019-07-26</updated>
<vendorInfos>
<vendor name="Oracle Corporation">
- <minVersion>1.7.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="Sun Microsystems Inc.">
- <minVersion>1.5.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="AdoptOpenJdk">
<minVersion>1.8.0</minVersion>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index c134fc83b34a..1e2e1f060c5d 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -17,19 +17,19 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
- <updated>2019-01-19</updated>
+ <updated>2019-07-26</updated>
<vendorInfos>
<vendor name="Oracle Corporation">
- <minVersion>1.6.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="Sun Microsystems Inc.">
- <minVersion>1.5.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="IBM Corporation">
- <minVersion>1.5.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="Azul Systems, Inc.">
- <minVersion>1.6.0</minVersion>
+ <minVersion>1.8.0</minVersion>
</vendor>
<vendor name="AdoptOpenJdk">
<minVersion>1.8.0</minVersion>