Skip to content

Commit 7fa86c8

Browse files
committed
Issue #14 fix
1 parent a051374 commit 7fa86c8

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

src/main/java/de/oppermann/pomutils/Main.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,13 @@ public static void main(String... args) {
4747
int resultValue = 0;
4848
try {
4949
resultValue = mainInternal(args);
50+
logger.debug("Exiting with exit code {}", resultValue);
5051
} catch (Exception e) {
5152
System.err.println("We got an exception on merge: " + StringUtils.join(args, " "));
5253
e.printStackTrace();
5354
System.exit(1);
5455
}
55-
logger.debug("Exiting with exit code {}", resultValue);
56+
5657
System.exit(resultValue);
5758
}
5859

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

9495
private static int executePomMergeDriver(CommandPomMergeDriver mergeCommand) {
9596
PomMergeDriver pomMergeDriver = new PomMergeDriver(mergeCommand.getRuleSet(), mergeCommand.getBasePom(),
96-
mergeCommand.getOurPom(),
97-
mergeCommand.getTheirPom());
97+
mergeCommand.getOurPom(), mergeCommand.getTheirPom());
9898
return pomMergeDriver.merge();
9999
}
100100

0 commit comments

Comments
 (0)