configure.ac | 18 +++++++------ jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml | 10 +++---- jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml | 16 +++++------ jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml | 10 +++---- jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml | 6 ++-- jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml | 10 +++---- 6 files changed, 36 insertions(+), 34 deletions(-)
New commits: commit e69896aff0ed221a94b16b9ede385b307945a473 Author: Stephan Bergmann <[email protected]> AuthorDate: Fri Jul 26 10:19:39 2019 +0200 Commit: Andras Timar <[email protected]> CommitDate: Tue Nov 19 12:56:13 2019 +0100 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 <[email protected]> diff --git a/configure.ac b/configure.ac index 77d709caf7f8..6048434da877 100644 --- a/configure.ac +++ b/configure.ac @@ -1962,7 +1962,7 @@ AC_ARG_WITH(linker-hash-style, AC_ARG_WITH(jdk-home, AS_HELP_STRING([--with-jdk-home=<absolute path to JDK home>], - [If you have installed JDK 1.6 or later on your system please supply the + [If you have installed JDK 8 or later on your system please supply the path here. Note that this is not the location of the java command but the location of the entire distribution.]), ,) @@ -6895,7 +6895,7 @@ if test "$ENABLE_JAVA" != ""; then _jdk_home=$regvalue fi if test -z "$with_jdk_home"; then - for ver in 1.8 1.7 1.6; do + for ver in 1.8; do reg_get_value "$bitness" "HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java Development Kit/$ver/JavaHome" if test -n "$regvalue"; then _jdk_home=$regvalue @@ -6996,8 +6996,8 @@ if test "$ENABLE_JAVA" != ""; then _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//` _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'` - if test "$_jdk_ver" -lt 10600; then - AC_MSG_ERROR([IBM JDK is too old, you need at least 1.6]) + if test "$_jdk_ver" -lt 10800; then + AC_MSG_ERROR([IBM JDK is too old, you need at least 8]) fi AC_MSG_RESULT([checked (IBM JDK $_jdk)]) @@ -7015,10 +7015,10 @@ you must use the "--with-jdk-home" configure option explicitly]) _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED '/^$/d' | $SED s/[[-A-Za-z]]*//` _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'` - if test "$_jdk_ver" -lt 10600; then - AC_MSG_ERROR([JDK is too old, you need at least 1.6]) + if test "$_jdk_ver" -lt 10800; then + AC_MSG_ERROR([JDK is too old, you need at least 8]) fi - if test "$_jdk_ver" -gt 10600; then + if test "$_jdk_ver" -gt 10800; then JAVA_CLASSPATH_NOT_SET=TRUE fi if test "$_jdk_ver" -ge 10900; then @@ -7037,7 +7037,7 @@ you must use the "--with-jdk-home" configure option explicitly]) JAVAFLAGS=-J-Xmx128M fi else - AC_MSG_ERROR([Java not found. You need at least jdk-1.6]) + AC_MSG_ERROR([Java not found. You need at least JDK 8]) fi else dnl Java disabled @@ -7063,6 +7063,8 @@ dnl Checks for javac dnl =================================================================== if test "$ENABLE_JAVA" != ""; then javacompiler="javac" + : ${JAVA_SOURCE_VER=8} + : ${JAVA_TARGET_VER=8} if test -z "$with_jdk_home"; then AC_PATH_PROG(JAVACOMPILER, $javacompiler) else 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> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
