Always use Java target version 1.5

It has been way too common for people to accidentally have a javac
from JDK 7 create class files that are of the newest version, which
older JREs and Android's dex then don't understand.

As many of the distro-configs files specified
--with-java-target-version=1.5 anyway, let's just hardcode that for
now.

Change-Id: I0853820dc56a062f053b5c2c30097bf1ff3798c1

9 files changed, 2 insertions, 37 deletions

diff --git a/README.cross b/README.cross
index 22f434aa152c..474b65cda181 100644
--- a/README.cross
+++ b/README.cross
@@ -356,7 +356,6 @@ And here is an autogen.lastrun for Android when cross-compiling from Linux:
 --with-android-ndk=/home/tml/android-ndk-r8b
 --with-android-ndk-toolchain-version=4.6
 --with-android-sdk=/home/tml/android-sdk-linux
---with-java-target-version=1.5
 
 And here is an autogen.lastrun for Android when cross-compiling to x86 from Linux:
 
diff --git a/configure.ac b/configure.ac
index c40e5232b387..de685d69bdaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1724,18 +1724,6 @@ AC_ARG_WITH(java,
     [ with_java=java ]
 )
 
-AC_ARG_WITH(java-target-version,
-    AS_HELP_STRING([--with-java-target-version],
-        [Generate class files that will work on JVMs with the specified version.
-         For example, use --with-java-target-version=1.5 to make sure that the
-         application will work with JVM 1.5 even when compiled with JDK 1.6.])
-    [
-                          This option is ignored when you compile with gcj/gij.
-
-                          Usage:     --with-java-target-version=<jvm version>
-    ],
-,)
-
 AC_ARG_WITH(jvm-path,
     AS_HELP_STRING([--with-jvm-path],
         [Use a specific JVM search path at runtime.])
@@ -5979,25 +5967,10 @@ else
 fi
 
 dnl ===================================================================
-dnl Check for target Java bytecode version
+dnl Set target Java bytecode version
 dnl ===================================================================
 if test "$SOLAR_JAVA" != ""; then
-    AC_MSG_CHECKING([for target Java bytecode version])
-    if test "$JDK" = "gcj" -o "$JDK" = "kaffe"; then
-        _java_target_ver="1.5"
-        AC_MSG_RESULT([default by $JDK])
-        if test -n "$with_java_target_version" -a "$with_java_target_version" != "no"; then
-            AC_MSG_WARN([Value defined by --with-java-target-version is ignored!])
-        fi
-    elif test -n "$with_java_target_version" -a "$with_java_target_version" != "no"; then
-        _java_target_ver="$with_java_target_version"
-        AC_MSG_RESULT([$_java_target_ver])
-    elif test $_jdk_ver -gt 10000; then
-        _java_target_ver=`echo "$_jdk_ver" | $AWK '{ maj=substr($0,1,1); min=substr($0,2,2); print int(maj)"."int(min) }'`
-        AC_MSG_RESULT([$_java_target_ver])
-    else
-        AC_MSG_ERROR([Unable to guess Java bytecode version from Java version!])
-    fi
+    _java_target_ver="1.5"
 
     JAVA_SOURCE_VER="$_java_target_ver"
     JAVA_TARGET_VER="$_java_target_ver"
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index 14b31dfd1af4..0758a8ac4328 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -23,4 +23,3 @@
 --without-helppack-integration
 --without-myspell-dicts
 --with-build-platform-configure-options=--disable-liblangtag
---with-java-target-version=1.5
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
index 43f1c0be5262..a453fa34f016 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -23,4 +23,3 @@
 --without-helppack-integration
 --without-myspell-dicts
 --with-build-platform-configure-options=--disable-liblangtag
---with-java-target-version=1.5
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 0ffc31c96e1e..244bffd3f957 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -15,7 +15,6 @@
 --without-junit
 --without-helppack-integration
 --with-linker-hash-style=both
---with-java-target-version=1.5
 --with-fonts
 --with-external-thes-dir=/usr/share/mythes
 --with-external-hyph-dir=/usr/share/hyphen
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index 686f5fe424ae..2ca107018a07 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -1,6 +1,5 @@
 --with-vendor=The Document Foundation
 --enable-epm
---with-java-target-version=1.5
 --enable-scripting-beanshell
 --enable-scripting-javascript
 --enable-ext-presenter-minimizer
diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf
index 52ba333fd8c4..a56c09735d56 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf
+++ b/distro-configs/LibreOfficeOpenBSD.conf
@@ -21,7 +21,6 @@
 --enable-extension-integration
 --with-fonts
 --with-java
---with-java-target-version=1.5
 --with-jdk-home=/usr/local/jdk-1.5.0
 --with-myspell-dicts
 --with-system-boost
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
index 7c92efe53288..b4529a6cc63d 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -5,7 +5,6 @@
 --without-helppack-integration
 --without-agfa-monotype-fonts
 --enable-extension-integration
---with-java-target-version=1.5
 --disable-gtk
 --enable-scripting-beanshell
 --enable-scripting-javascript
diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf
index 8db7f58f246c..35ca06140c1d 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -1,6 +1,5 @@
 --with-vendor=The Document Foundation
 --without-agfa-monotype-fonts
---with-java-target-version=1.5
 --enable-cl-x64
 --disable-gtk
 --enable-scripting-beanshell