PullReqeust for #99 and #63 + logDebugFunction instead of system.out.…

…println
git-commit-id · Mar 6, 2014 · f15999d · f15999d
1 parent e1df953
commit f15999d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java b/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java
@@ -305,8 +305,8 @@ public void execute() throws MojoExecutionException {
       prefixDot = prefix + ".";
 
       loadGitData(properties);
-      filterNot(properties, excludeProperties);
       loadBuildTimeData(properties);
+      filterNot(properties, excludeProperties);
       logProperties(properties);
 
       if (generateGitPropertiesFile) {
@@ -316,7 +316,7 @@ public void execute() throws MojoExecutionException {
       if (injectAllReactorProjects) {
         appendPropertiesToReactorProjects(properties);
       }
-    } catch (IOException e) {
+    } catch (Exception e) {
       handlePluginFailure(e);
     }
 
@@ -340,7 +340,7 @@ public Predicate<CharSequence> apply(String exclude) {
 
     for (String key : properties.stringPropertyNames()) {
       if (shouldExclude.apply(key)) {
-        System.out.println("shouldExclude.apply(" + key +") = " + shouldExclude.apply(key));
+    	loggerBridge.debug("shouldExclude.apply(" + key +") = " + shouldExclude.apply(key));
         properties.remove(key);
       }
     }

diff --git a/src/main/java/pl/project13/maven/git/log/LoggerBridge.java b/src/main/java/pl/project13/maven/git/log/LoggerBridge.java
@@ -20,5 +20,6 @@
 public interface LoggerBridge {
   void log(Object... parts);
   void error(Object... parts);
+  void debug(Object... parts);
   void setVerbose(boolean verbose);
 }
diff --git a/src/main/java/pl/project13/maven/git/log/MavenLoggerBridge.java b/src/main/java/pl/project13/maven/git/log/MavenLoggerBridge.java
@@ -43,6 +43,13 @@ public void error(Object... parts) {
       logger.error(Joiner.on(" ").join(parts));
     }
   }
+
+  @Override
+  public void debug(Object... parts) {
+    if (verbose) {
+      logger.debug(Joiner.on(" ").join(parts));
+    }
+  }
 
   @Override
   public void setVerbose(boolean verbose) {

diff --git a/src/main/java/pl/project13/maven/git/log/StdOutLoggerBridge.java b/src/main/java/pl/project13/maven/git/log/StdOutLoggerBridge.java
@@ -40,6 +40,13 @@ public void error(Object... parts) {
       System.out.println("ERR: " + Joiner.on(" ").join(parts));
     }
   }
+
+  @Override
+  public void debug(Object... parts) {
+    if(verbose) {
+      System.out.println("DBG: " + Joiner.on(" ").join(parts));
+    }
+  }
 
   @Override
   public void setVerbose(boolean verbose) {