Merge pull request #200 from TheSnoozer/master

Re enable Tests and update Readme to the latest version

Author: TheSnoozer

.java-version

@@ -38,7 +38,7 @@ A detailed description of using the plugin is available in the <a href="https://
 
 Versions
 --------
-The current version is **2.1.14** ([changelist](https://github.com/ktoso/maven-git-commit-id-plugin/issues?q=milestone%3A2.1.14)).
+The current version is **2.1.15** ([changelist](https://github.com/ktoso/maven-git-commit-id-plugin/issues?q=milestone%3A2.1.15)).
 
 You can check the available versions by visiting [search.maven.org](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22pl.project13.maven%22%20AND%20a%3A%22git-commit-id-plugin%22), though using the newest is obviously the best choice.
 
@@ -101,7 +101,7 @@ It's really simple to setup this plugin; below is a sample pom that you may base
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
-                <version>2.1.14</version>
+                <version>2.1.15</version>
                 <executions>
                     <execution>
                         <goals>

README.md

@@ -60,6 +60,14 @@ public enum AvailableGitTestRepo {
   WITH_LIGHTWEIGHT_TAG_BEFORE_ANNOTATED_TAG("src/test/resources/_git_lightweight_tag_before_annotated_tag"),
   WITH_TAG_ON_DIFFERENT_BRANCH("src/test/resources/_git_with_tag_on_different_branch"),
   WITH_ONE_COMMIT_WITH_SPECIAL_CHARACTERS("src/test/resources/_git_one_commit_with_umlaut"),
+  /**
+    * <pre>
+    * b0c6d28b3b83bf7b905321bae67d9ca4c75a203f 2015-06-04 00:50:18 +0200  (HEAD, master)
+    * 0e3495783c56589213ee5f2ae8900e2dc1b776c4 2015-06-03 23:59:10 +0200  (tag: v2.0)
+    * f830b5f85cad3d33ba50d04c3d1454e1ae469057 2015-06-03 23:57:53 +0200  (tag: v1.0)
+    * </pre>
+    */
+  WITH_THREE_COMMITS_AND_TWO_TAGS_CURRENTLY_ON_COMMIT_WITHOUT_TAG("src/test/resources/_git_three_commits_and_two_tags_currently_on_commit_without_tag"),
   MAVEN_GIT_COMMIT_ID_PLUGIN(".git");
 
   private String dir;

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

@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with git-commit-id-plugin.  If not, see <http://www.gnu.org/licenses/>.
- */
+ */	
 
 package pl.project13.maven.git;
 
@@ -624,15 +624,16 @@ public void runGitDescribeWithMatchOption(boolean useNativeGit) throws Exception
     // given
     mavenSandbox.withParentProject("my-plugin-project", "jar")
                 .withNoChildProject()
-                .withGitRepoInParent(AvailableGitTestRepo.MAVEN_GIT_COMMIT_ID_PLUGIN)
+                .withGitRepoInParent(AvailableGitTestRepo.WITH_THREE_COMMITS_AND_TWO_TAGS_CURRENTLY_ON_COMMIT_WITHOUT_TAG)
                 .create(CleanUp.CLEANUP_FIRST);
     MavenProject targetProject = mavenSandbox.getParentProject();
 
     setProjectToExecuteMojoIn(targetProject);
 
+    String headCommitId = "b0c6d28b3b83bf7b905321bae67d9ca4c75a203f";
     Map<String,String> gitTagMap = new HashMap<String,String>();
-    gitTagMap.put("v2.1.11", "56c5a491720ce35ae8f8626be1d3414728f1b953");
-    gitTagMap.put("v2.1.12", "e9879658209ee81d7bf50ceedd028737f0b1cd0c");
+    gitTagMap.put("v1.0", "f830b5f85cad3d33ba50d04c3d1454e1ae469057");
+    gitTagMap.put("v2.0", "0e3495783c56589213ee5f2ae8900e2dc1b776c4");
 
     for (Map.Entry<String,String> entry : gitTagMap.entrySet()) {
       String gitDescribeMatchNeedle = entry.getKey();
@@ -654,6 +655,7 @@ public void runGitDescribeWithMatchOption(boolean useNativeGit) throws Exception
 
       assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.commit.id");
       assertThat(targetProject.getProperties().get("git.commit.id")).isNotEqualTo(commitIdOfMatchNeedle);
+      assertThat(targetProject.getProperties().get("git.commit.id")).isEqualTo(headCommitId);
     }
   }
 

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

@@ -27,7 +27,6 @@
 
 import org.apache.maven.project.MavenProject;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import pl.project13.maven.git.FileSystemMavenSandbox.CleanUp;
@@ -55,7 +54,6 @@ public class NativeAndJGitProviderTest extends GitIntegrationTest
   public static final String ISO8601_FORMAT_STRING = "yyyy-MM-dd'T'HH:mm:ssZZ";
 
   @Test
-  @Ignore
   public void testCompareBasic() throws Exception
   {
     // Test on all available basic repos to ensure that the output is identical.
@@ -67,7 +65,6 @@ public void testCompareBasic() throws Exception
   }
 
   @Test
-  @Ignore
   public void testCompareSubrepoInRoot() throws Exception
   {
     for (AvailableGitTestRepo testRepo : AvailableGitTestRepo.values()) {
@@ -81,7 +78,6 @@ public void testCompareSubrepoInRoot() throws Exception
   }
 
   @Test
-  @Ignore
   public void testCompareSubrepoInChild() throws Exception
   {
     for (AvailableGitTestRepo testRepo : AvailableGitTestRepo.values()) {
@@ -95,7 +91,6 @@ public void testCompareSubrepoInChild() throws Exception
   }
 
   @Test
-  @Ignore
   public void testCompareISO8601Time() throws Exception
   {
     // Test on all available basic repos to ensure that the output is identical.

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

@@ -0,0 +1 @@
+Third line

src/test/resources/_git_three_commits_and_two_tags_currently_on_commit_without_tag/COMMIT_EDITMSG

@@ -0,0 +1 @@
+ref: refs/heads/master

src/test/resources/_git_three_commits_and_two_tags_currently_on_commit_without_tag/HEAD

@@ -0,0 +1,8 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+[user]
+	name = S L
+	email = s.lange@mailbox.tu-berlin.de

src/test/resources/_git_three_commits_and_two_tags_currently_on_commit_without_tag/config

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

src/test/resources/_git_three_commits_and_two_tags_currently_on_commit_without_tag/description

@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+	exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+: