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>

1 files changed, 10 insertions, 10 deletions

diff --git a/configure.ac b/configure.ac
index 79423e1d5365..f423018d574f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1977,7 +1977,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.]),
 ,)
@@ -7167,7 +7167,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
@@ -7267,8 +7267,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([found (IBM JDK $_jdk)])
@@ -7286,10 +7286,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
 
@@ -7305,7 +7305,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
@@ -7318,8 +7318,8 @@ dnl Checks for javac
 dnl ===================================================================
 if test "$ENABLE_JAVA" != ""; then
     javacompiler="javac"
-    : ${JAVA_SOURCE_VER=1.6}
-    : ${JAVA_TARGET_VER=1.6}
+    : ${JAVA_SOURCE_VER=8}
+    : ${JAVA_TARGET_VER=8}
     if test -z "$with_jdk_home"; then
         AC_PATH_PROG(JAVACOMPILER, $javacompiler)
     else