Merge branch 'master-upstream' into 906-init-compatibility

# Conflicts:
#	cli/tests/functional/src/test/java/io/helidon/build/cli/tests/CliDistributionTest.java

Author: aserkes

cli/tests/functional/src/test/java/io/helidon/build/cli/tests/CliDistributionTest.java

@@ -20,6 +20,9 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -120,18 +123,23 @@ private void runVersionTest(String cliExecutable) throws IOException {
     }
 
     private void runCreateProjectTest(String cliExecutable) throws IOException {
-        Path dir = Files.createTempDirectory("project");
-        Process process = new ProcessBuilder()
-                .directory(dir.toFile())
-                .command(cliExecutable, "init", "--reset", "--batch")
-                .start();
-        String result = String.join("\n", InputStreams.toLines(process.getInputStream()));
-        LOGGER.info("errors : " + String.join("\n", InputStreams.toLines(process.getErrorStream())));
-        LOGGER.info("result output : " + result);
-        process.destroy();
-
-        LOGGER.info("exitValue - " + process.exitValue());
-        assertThat(result, containsString("Switch directory to"));
-        assertThat(list(dir).size(), is(not(0)));
+        try {
+            Path dir = Files.createTempDirectory("project");
+            Process process = new ProcessBuilder()
+                    .directory(dir.toFile())
+                    .command(cliExecutable, "init", "--reset", "--batch")
+                    .start()
+                    .onExit()
+                    .get(5, TimeUnit.MINUTES);
+            String result = String.join("", InputStreams.toLines(process.getInputStream()));
+            LOGGER.info("errors - " + InputStreams.toLines(process.getErrorStream()));
+            process.destroy();
+            LOGGER.info("exitValue - " + process.exitValue());
+            LOGGER.info(result);
+            assertThat(result, containsString("Switch directory to"));
+            assertThat(list(dir).size(), is(not(0)));
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
+            throw new RuntimeException(e);
+        }
     }
 }