Merge pull request #125 from TheSnoozer/master

Fix for #124

Author: ktoso

src/main/java/pl/project13/maven/git/GitCommitIdMojo.java

@@ -486,21 +486,19 @@ void loadGitDataWithJGit(@NotNull Properties properties) throws IOException, Moj
     jGitProvider.loadGitData(properties);
   }
 
-  static int counter;
-
   void generatePropertiesFile(@NotNull Properties properties, File base, String propertiesFilename) throws IOException {
     FileWriter fileWriter = null;
-    File gitPropsFile = new File(base, propertiesFilename);
+    File gitPropsFile = craftPropertiesOutputFile(base, propertiesFilename);
     try {
       Files.createParentDirs(gitPropsFile);
 
       fileWriter = new FileWriter(gitPropsFile);
       if ("json".equalsIgnoreCase(format)) {
-        log("Writing json file to [", gitPropsFile.getAbsolutePath(), "] (for module ", project.getName() + (++counter), ")...");
+        log("Writing json file to [", gitPropsFile.getAbsolutePath(), "] (for module ", project.getName(), ")...");
         ObjectMapper mapper = new ObjectMapper();
         mapper.writeValue(fileWriter, properties);
       } else {
-        log("Writing properties file to [", gitPropsFile.getAbsolutePath(), "] (for module ", project.getName() + (++counter), ")...");
+        log("Writing properties file to [", gitPropsFile.getAbsolutePath(), "] (for module ", project.getName(), ")...");
         properties.store(fileWriter, "Generated by Git-Commit-Id-Plugin");
       }
 
@@ -511,6 +509,19 @@ void generatePropertiesFile(@NotNull Properties properties, File base, String pr
     }
   }
 
+  @VisibleForTesting
+  File craftPropertiesOutputFile(File base, String propertiesFilename){
+    File returnPath = new File(base, propertiesFilename);
+
+    File currentPropertiesFilepath = new File(propertiesFilename);
+    if(currentPropertiesFilepath.isAbsolute()){
+       returnPath = currentPropertiesFilepath;
+    }
+
+    return returnPath;
+  }
+
+
   boolean isPomProject(@NotNull MavenProject project) {
     return project.getPackaging().equalsIgnoreCase("pom");
   }

src/test/java/pl/project13/maven/git/GitCommitIdMojoTest.java

@@ -211,4 +211,27 @@ private void assertShortDescribe(String commitDescribe, String expectedShortDesc
     commitIdMojo.loadShortDescribe(prop);
     assertThat(prop.getProperty(GitCommitIdMojo.COMMIT_SHORT_DESCRIBE)).isEqualTo(expectedShortDescribe);
   }
+
+  @Test
+  public void testCraftPropertiesOutputFileWithRelativePath() throws IOException {
+    GitCommitIdMojo commitIdMojo = new GitCommitIdMojo();
+    File baseDir = new File(".");
+    String targetDir = baseDir.getCanonicalPath() + "/";
+    String generateGitPropertiesFilename = "target/classes/git.properties";
+    
+    File result = commitIdMojo.craftPropertiesOutputFile(baseDir, generateGitPropertiesFilename);
+    assertThat(result.getCanonicalPath()).isEqualTo(targetDir + generateGitPropertiesFilename);
+  }
+
+  @Test
+  public void testCraftPropertiesOutputFileWithFullPath() throws IOException {
+    GitCommitIdMojo commitIdMojo = new GitCommitIdMojo();
+    File baseDir = new File(".");
+    String targetDir = baseDir.getCanonicalPath() + "/";
+    String generateGitPropertiesFilename = targetDir + "target/classes/git.properties";
+
+    File result = commitIdMojo.craftPropertiesOutputFile(baseDir, generateGitPropertiesFilename);
+    assertThat(result.getCanonicalPath()).isEqualTo(generateGitPropertiesFilename);
+  }
+
 }