Merge branch '1.3.x'

vivswam · Jun 16, 2016 · 7a5880c · 7a5880c
2 parents bc66377 + ec7d638
commit 7a5880c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java b/...-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java
@@ -45,7 +45,12 @@ protected void runWithForkedJvm(List<String> args) throws MojoExecutionException
 			RunProcess runProcess = new RunProcess(new JavaExecutable().toString());
 			Runtime.getRuntime()
 					.addShutdownHook(new Thread(new RunProcessKiller(runProcess)));
-			runProcess.run(true, args.toArray(new String[args.size()]));
+			int exitCode = runProcess.run(true, args.toArray(new String[args.size()]));
+
+			if (exitCode != 0) {
+				throw new MojoExecutionException(
+						"Application finished with non-zero exit code: " + exitCode);
+			}
 		}
 		catch (Exception ex) {
 			throw new MojoExecutionException("Could not exec java", ex);