Merge tag 'v1.0.2'

[maven-release-plugin]  copy for tag v1.0.2

Author: dobladez

README.md

@@ -23,7 +23,7 @@ Simply add `buildversion-plugin` to your pom, executing the `set-properties` goa
       <plugin>
         <groupId>com.code54.mojo</groupId>
         <artifactId>buildversion-plugin</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
         <executions>
           <execution>
             <goals><goal>set-properties</goal></goals>
@@ -100,7 +100,7 @@ Example:
   <plugin>
     <groupId>com.code54.mojo</groupId>
     <artifactId>buildversion-plugin</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <executions>
       <execution>
         <goals><goal>set-properties</goal></goals>

ReleaseNotes.md

@@ -1,5 +1,11 @@
 # Release Notes - buildversion-plugin
 
+## v1.0.2
+
+* [issue #4] Ignore newline from git --format's output
+
+* Improve release scripts
+
 ## v1.0.1 
 
 * New gitCmd option let's you specify location of 'git' command to use
@@ -8,7 +14,7 @@
 
 * Better error handling and logging when invoking git
 
-* Fix: use ${basedir} instead of "." as location for git repo.
+* [issue #2] Use ${basedir} instead of "." as location for git repo.
   This resolves problem when calling maven from within Eclipse.
 
 

finish-release.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# finish the release after updating release notes
+# Finish the release
 
 if [[ $# -lt 1 ]]; then
   echo "usage: $(basename $0) new-version" >&2
@@ -11,14 +11,15 @@ version=$1
 
 echo "finish release of $version"
 
-echo -n "commiting release notes and readme.  enter to continue:" && read x \
-&& git add ReleaseNotes.md README.md \
-&& git commit -m "Updated release notes and readme for $version" \
-&& echo -n "Peform release.  enter to continue:" && read x \
+echo -n "Peform release.  enter to continue:" && read x \
 && mvn release:clean \
 && mvn release:prepare -Dgpg.keyname=02FCB552 \
+&& git checkout develop; git merge "release-${version}" \
+&& git checkout master; git merge "v${version}" \
 && mvn release:perform -Dgpg.keyname=02FCB552 \
-#&& mvn nexus:staging-close \
-#&& mvn nexus:staging-promote \
-&& git flow release finish -n $version
+&& mvn nexus:staging-close \
+&& mvn nexus:staging-promote
+
+
+#&& git flow release finish -n $version
 

pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>com.code54.mojo</groupId>
   <artifactId>buildversion-plugin</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
   <packaging>maven-plugin</packaging>
 
   <name>buildversion-plugin</name>
@@ -35,7 +35,7 @@
     <connection>scm:git:git://github.com/code54/buildversion-plugin.git</connection>
     <developerConnection>scm:git:ssh://[email protected]:code54/buildversion-plugin.git</developerConnection>
     <url>https://github.com/code54/buildversion-plugin</url>
-    <tag>v1.0.1</tag>
+    <tag>v1.0.2</tag>
   </scm>
 
   <properties>

src/main/clojure/buildversion_plugin/git.clj

@@ -71,7 +71,7 @@
           [short-hash long-hash]  (split
                                    (run-git-wait dir
                                                  ["log" "-n" "1" "--format=%h %H"])
-                                   #" ")
+                                   #"\s+")
 
           versioning-properties {:build-tag "N/A"
                                  :build-version "N/A"

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

@@ -62,7 +62,7 @@
 
     (is checkout-OK (str "Checkout failure " (checkout :err) ))
 
-    (doall (map (fn [key] (is (re-find (expected-patterns key) (actual-versions key))
+    (doall (map (fn [key] (is (re-matches (expected-patterns key) (actual-versions key))
                               (str "Testing " key " for commit '" commit-descr "'")))
                 (keys expected-patterns)))))
 
@@ -94,7 +94,7 @@
                       })
 
   (assert-for-commit "dev commit 5"
-                     {:build-version      #"1.1.0-SNAPSHOT-3"
+                     {:build-version      #"1.1.0-SNAPSHOT-3.*"
                       :build-tag   #"^1.1.0-SNAPSHOT$"
                       :build-tag-delta        #"3"
                       :build-tstamp           #"\d+"

start-release.sh

@@ -15,15 +15,19 @@ echo "Start release of $version, previous version is $previous_version"
 echo ""
 echo ""
 
-git flow release start $version || exit 1
+git co -b "release-$version" || exit 1
+
+#git flow release start $version || exit 1
 
 echo ""
 echo ""
 echo "Changes since $previous_version"
-git log --online  v$previous_version..
+git log --oneline  v$previous_version..
 echo ""
 echo ""
-echo "Now edit ReleaseNotes and README"
+echo "Press [enter] to edit ReleaseNotes and README..."
+read
+
 
 $EDITOR ReleaseNotes.md
 $EDITOR README.md