Skip to content

Commit

Permalink
Issue #14 fix
Browse files Browse the repository at this point in the history
  • Loading branch information
cecom committed Mar 30, 2020
1 parent a051374 commit 7fa86c8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/main/java/de/oppermann/pomutils/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,13 @@ public static void main(String... args) {
int resultValue = 0;
try {
resultValue = mainInternal(args);
logger.debug("Exiting with exit code {}", resultValue);
} catch (Exception e) {
System.err.println("We got an exception on merge: " + StringUtils.join(args, " "));
e.printStackTrace();
System.exit(1);
}
logger.debug("Exiting with exit code {}", resultValue);

System.exit(resultValue);
}

Expand Down Expand Up @@ -93,8 +94,7 @@ protected static int mainInternal(String... args) {

private static int executePomMergeDriver(CommandPomMergeDriver mergeCommand) {
PomMergeDriver pomMergeDriver = new PomMergeDriver(mergeCommand.getRuleSet(), mergeCommand.getBasePom(),
mergeCommand.getOurPom(),
mergeCommand.getTheirPom());
mergeCommand.getOurPom(), mergeCommand.getTheirPom());
return pomMergeDriver.merge();
}

Expand Down

0 comments on commit 7fa86c8

Please sign in to comment.