From f15999d29c46a78108c96717c3d8fc638470a795 Mon Sep 17 00:00:00 2001
From: S L <s.lange@mailbox.tu-berlin.de>
Date: Fri, 7 Mar 2014 00:54:18 +0100
Subject: [PATCH] PullReqeust for #99 and #63 + logDebugFunction instead of
 system.out.println

---
 src/main/java/pl/project13/maven/git/GitCommitIdMojo.java  | 6 +++---
 src/main/java/pl/project13/maven/git/log/LoggerBridge.java | 1 +
 .../java/pl/project13/maven/git/log/MavenLoggerBridge.java | 7 +++++++
 .../pl/project13/maven/git/log/StdOutLoggerBridge.java     | 7 +++++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java b/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java
index 8f88366c..bc777c00 100644
--- 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
index 8b53582b..403bee67 100644
--- 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
index 55e68df3..718f7bab 100644
--- 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
index 3963e91b..b8fafb46 100644
--- 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) {