[Libreoffice-commits] core.git: odk/config

[Libreoffice Gerrit user]

 odk/config/cfgWin.js    |    2 +-
 odk/config/configure.pl |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 31221c4f8fb1973d246fcf8f50886cf5811e8054
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Wed Feb 13 08:10:55 2019 +0100
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Fri Feb 15 14:36:38 2019 +0100

    Adopt odk configure to new java 6 baseline
    
    Change-Id: I015f439b04ddbc337a1c0b000fa708686d1f83bb
    Reviewed-on: https://gerrit.libreoffice.org/67751
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Jenkins

diff --git a/odk/config/cfgWin.js b/odk/config/cfgWin.js
index fa8961b460d1..1f001cc265e1 100644
--- a/odk/config/cfgWin.js
+++ b/odk/config/cfgWin.js
@@ -654,7 +654,7 @@ function getJavaHome()
     var bSkip = false;
     while(true)
     {
-        stdout.Write("\n Enter JAVA SDK (1.4.1_01 or higher) installation directory (optional) [" + sSuggestedHome + "]:");
+        stdout.Write("\n Enter JAVA SDK (1.6 or higher) installation directory (optional) [" + sSuggestedHome + "]:");
         var sHome = stdin.ReadLine();
         if (sHome.length == 0)
         {
diff --git a/odk/config/configure.pl b/odk/config/configure.pl
index bc56d8782944..f3d0e08b3440 100755
--- a/odk/config/configure.pl
+++ b/odk/config/configure.pl
@@ -75,7 +75,7 @@ $main::OO_SDK_CPP_HOME_SUGGESTION = searchprog($main::cppName);
 
 $main::OO_SDK_JAVA_HOME = "";
 $main::OO_SDK_JAVA_HOME_SUGGESTION = searchprog("javac");
-$main::javaVersion = "1.5.0_01";
+$main::javaVersion = "1.6";
 
 $main::SDK_AUTO_DEPLOYMENT = "";
 $main::SDK_AUTO_DEPLOYMENT_SUGGESTION = "YES";
@@ -393,7 +393,7 @@ while ( (!$main::correctVersion) &&
         ((! -d "$main::OO_SDK_JAVA_HOME" ) ||
          ((-d "$main::OO_SDK_JAVA_HOME") && (! -e "$main::OO_SDK_JAVA_HOME/bin/javac"))) )
 {
-    print " Enter Java SDK (1.5, recommendation is 1.6 or higher) installation directory  (optional) [$main::OO_SDK_JAVA_HOME_SUGGESTION]: ";
+    print " Enter Java SDK (1.6 or higher) installation directory (optional) [$main::OO_SDK_JAVA_HOME_SUGGESTION]: ";
     $main::OO_SDK_JAVA_HOME = readStdIn();
     chop($main::OO_SDK_JAVA_HOME);
     if ( $main::OO_SDK_JAVA_HOME eq "" )