Change to it doesn't include tag delta and hash when a tag points directly to HEAD

Author: dobladez

README.md

@@ -39,7 +39,7 @@ By default, the plugin runs on Maven's `initialize` phase. Any plugin running af
 * `build-tag-delta`: Number of commits since the closest tag until HEAD. Example: `2`
 * `build-commit`: Full hash of current commit (HEAD). Example: `c154712b8cea9da812c52f269578a458911f24cc`
 * `build-commit-abbrev`: Abbreviated hash of current commit (HEAD). Example: `c154712`
-* `build-version`: Full descriptive version of current build. Includes closest tag, tag delta, and abbreviated commit hash. Example: `1.2.0-SNAPSHOT-2-c154712`
+* `build-version`: Descriptive version of current build. If a tag points to HEAD (that is, build-tag-delta is "0") then `build-version` equals `build-tag`; otherwise, it'll include: the closest tag, tag delta, and abbreviated commit hash. Examples: `1.2.0-SNAPSHOT` (tag points to HEAD),  `1.2.0-SNAPSHOT-2-c154712` (HEAD is two commits ahead of tag)
 * `build-tstamp`: A date and time stamp of the current commit (HEAD). The pattern is configurable. Example: `20120407001823`.
 
 

src/main/clojure/buildversion_plugin/git.clj

@@ -79,15 +79,18 @@
                                  :build-tstamp commit-tstamp-str
                                  :build-commit long-hash
                                  :build-commit-abbrev short-hash }
-          
+
           {:keys [git-tag git-tag-delta] } (git-describe-first-parent dir)]
 
       (if (nil? git-tag)
         versioning-properties
-        
-        (let [maven-artifact-version ((re-find #"v(.*)" git-tag) 1)]
+
+        (let [maven-artifact-version ((re-find #"v(.*)" git-tag) 1)
+              version (replace-first git-tag #"^v" "")]
           (merge versioning-properties
                  {:build-tag maven-artifact-version
-                  :build-version (str (replace-first git-tag #"^v" "") "-"
-                                      git-tag-delta "-" short-hash)
+                  :build-version (if (== git-tag-delta 0)
+                                   version
+                                   (str version "-"
+                                        git-tag-delta "-" short-hash))
                   :build-tag-delta (str git-tag-delta) }))))))

src/test/clojure/buildversion_plugin/test/git.clj

@@ -86,7 +86,7 @@
 (deftest test-infer-project-versions
 
   (assert-for-commit "First tagged commit"
-                     {:build-version    #"^1.0.0-SNAPSHOT-0.*"
+                     {:build-version    #"^1.0.0-SNAPSHOT$"
                       :build-tag #"^1.0.0-SNAPSHOT$"
                       :build-tag-delta      #"0"
                       :build-tstamp         #"\d+"