Add version detection

Author: injectives

driver/src/test/java/org/neo4j/driver/util/Neo4jRunner.java

@@ -26,6 +26,7 @@
 import java.net.URI;
 import java.nio.channels.SocketChannel;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
@@ -190,7 +191,9 @@ private void installNeo4j() throws IOException
 
             moveFile( new File( tempHomeDir ), targetHomeFile );
             debug( "Installed server at `%s`.", HOME_DIR );
-            executeCommand( "neoctrl-set-initial-password", PASSWORD, HOME_DIR );
+
+            String setPasswordCommand = "5.0".equals( split[split.length - 1] ) ? "neo4j-admin dbms set-initial-password" : "neo4j-admin set-initial-password";
+            executeCommand( Arrays.asList( setPasswordCommand, PASSWORD ), new File( HOME_DIR + "/bin" ) );
         }
     }
 

driver/src/test/java/org/neo4j/driver/util/cc/CommandLineUtil.java

@@ -19,6 +19,7 @@
 package org.neo4j.driver.util.cc;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -53,11 +54,12 @@ public static boolean boltKitAvailable()
         }
     }
 
-    public static String executeCommand( List<String> commands )
+    public static String executeCommand( List<String> commands, File directory )
     {
         try
         {
             ProcessBuilder processBuilder = new ProcessBuilder().command( commands );
+            processBuilder.directory( directory );
             ProcessEnvConfigurator.configure( processBuilder );
             return executeAndGetStdOut( processBuilder );
         }
@@ -72,9 +74,14 @@ public static String executeCommand( List<String> commands )
         }
     }
 
+    public static String executeCommand( List<String> commands )
+    {
+        return executeCommand( commands, null );
+    }
+
     public static String executeCommand( String... command )
     {
-        return executeCommand( asList( command ) );
+        return executeCommand( asList( command ), null );
     }
 
     private static String executeAndGetStdOut( ProcessBuilder processBuilder )