Minor code cleanup

Author: dobladez

src/main/clojure/buildversion_plugin/mojo.clj

@@ -35,23 +35,24 @@
                   :typename "java.lang.String"}   ]
 
   ;; Goal execution
-  (let [log-debug #(.debug log/*plexus-log* (str "[buildversion-plugin] " %))
-        git-versions (git/infer-project-version base-dir
+  (let [log-fn #(.debug log/*plexus-log* (str "[buildversion-plugin] " %))
+        inferred-props (git/infer-project-version base-dir
                                                 {:tstamp-format tstamp-format
                                                  :git-cmd (or git-cmd "git")
-                                                 :debug-fn log-debug } )
-        custom-versions (if custom-script
-                          (eval-custom-script git-versions custom-script)
-                          {})
-        versions-map (merge git-versions custom-versions)
-        props (.getProperties project)
-        ]
-
-    (log-debug "Setting properties: ")
-    (doseq [[prop value] versions-map]
-      (log-debug (str (name prop) ": " value))
-      (.put props (name prop) value))))
-
-
-    ;; injecting project version does not working well :-(
-    ;; (.setVersion project (:maven-artifact-version versions-map))
+                                                 :debug-fn log-fn } )
+        final-props (if custom-script
+                      (merge inferred-props
+                             (eval-custom-script inferred-props custom-script))
+                      inferred-props)
+        maven-project-props (.getProperties project)]
+
+    (log-fn "Setting properties: ")
+    (doseq [[prop value] final-props]
+      (log-fn (str (name prop) ": " value))
+      (.put maven-project-props (name prop) value))))
+
+
+    ;; injecting project version does not work well :-(
+    ; (if-let [ver (:build-tag final-props)]
+    ;   (.setVersion project))
+