Merge pull request #705 from git-commit-id/701

#701: Fix an issue with submodules

Author: TheSnoozer

pom.xml

@@ -63,7 +63,7 @@
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>git-commit-id-plugin-core</artifactId>
-                <version>6.0.0-rc.6</version>
+                <version>6.0.0-rc.7</version>
             </dependency>
             <dependency>
                 <groupId>com.google.code.findbugs</groupId>

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

@@ -1207,24 +1207,10 @@ public void error(String msg, Throwable t) {
         return;
       }
 
-      dotGitDirectory = lookupGitDirectory();
-      if (failOnNoGitDirectory && !directoryExists(dotGitDirectory)) {
-        throw new GitCommitIdExecutionException(
-            ".git directory is not found! Please specify a valid [dotGitDirectory] in your"
-                + " pom.xml");
-      }
-
       if (gitDescribe == null) {
         gitDescribe = new GitDescribeConfig();
       }
 
-      if (dotGitDirectory != null) {
-        log.info("dotGitDirectory '" + dotGitDirectory.getAbsolutePath() + "'");
-      } else {
-        log.info("dotGitDirectory is null, aborting execution!");
-        return;
-      }
-
       try {
         commitIdGenerationModeEnum =
             CommitIdGenerationMode.valueOf(commitIdGenerationMode.toUpperCase());
@@ -1411,6 +1397,11 @@ public Charset getPropertiesSourceCharset() {
             public boolean shouldPropertiesEscapeUnicode() {
               return generateGitPropertiesFileWithEscapedUnicode;
             }
+
+            @Override
+            public boolean shouldFailOnNoGitDirectory() {
+              return failOnNoGitDirectory;
+            }
           };
 
       GitCommitIdPlugin.runPlugin(cb, properties);
@@ -1503,16 +1494,6 @@ private void appendPropertiesToReactorProjects(LogInterface log, Properties prop
     log.info("Added properties to '" + reactorProjects.size() + "' projects");
   }
 
-  /**
-   * Find the git directory of the currently used project. If it's not already specified, this
-   * method will try to find it.
-   *
-   * @return the File representation of the .git directory
-   */
-  private File lookupGitDirectory() throws GitCommitIdExecutionException {
-    return new GitDirLocator(project, reactorProjects).lookupGitDirectory(dotGitDirectory);
-  }
-
   private void logProperties(LogInterface log, Properties propertiesToPublish) {
     for (String propertyName : propertiesToPublish.stringPropertyNames()) {
       log.info("including property '" + propertyName + "' in results");
@@ -1522,8 +1503,4 @@ private void logProperties(LogInterface log, Properties propertiesToPublish) {
   private boolean isPomProject(@Nonnull MavenProject project) {
     return project.getPackaging().equalsIgnoreCase("pom");
   }
-
-  private boolean directoryExists(@Nullable File fileLocation) {
-    return fileLocation != null && fileLocation.exists() && fileLocation.isDirectory();
-  }
 }

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

@@ -585,7 +585,8 @@ public void shouldSkipWithoutFailOnNoGitDirectoryWhenNoGitRepoFound(boolean useN
     mojo.execute();
 
     // then
-    assertThat(targetProject.getProperties()).isEmpty();
+    assertThat(targetProject.getProperties().keySet()).containsOnly(
+        "git.build.time", "git.build.version", "git.build.host");
   }
 
   @Test