From 7c16246e3ad3f71a00e822c6ca9c9c9c07ed3be8 Mon Sep 17 00:00:00 2001
From: Hans-Peter Schmid <none>
Date: Wed, 3 May 2017 06:13:49 +0200
Subject: [PATCH 1/2] issue #72: honour return value of provider.tag()

---
 .../maven/gitflowhelper/TagMasterMojo.java            | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/e_gineering/maven/gitflowhelper/TagMasterMojo.java b/src/main/java/com/e_gineering/maven/gitflowhelper/TagMasterMojo.java
index f0a4f21..fc0c158 100644
--- a/src/main/java/com/e_gineering/maven/gitflowhelper/TagMasterMojo.java
+++ b/src/main/java/com/e_gineering/maven/gitflowhelper/TagMasterMojo.java
@@ -9,6 +9,7 @@
 import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.ScmTagParameters;
+import org.apache.maven.scm.command.tag.TagScmResult;
 import org.apache.maven.scm.provider.ScmProvider;
 import org.apache.maven.scm.repository.ScmRepository;
 
@@ -51,7 +52,15 @@ protected void execute(final GitBranchType type, final String gitBranch, final S
                     ScmTagParameters tagParams = new ScmTagParameters("Release tag [" + sanitizedTag + "] generated by gitflow-helper-maven-plugin.");
                     tagParams.setRemoteTagging(true);
 
-                    provider.tag(repository, new ScmFileSet(project.getBasedir()), sanitizedTag, tagParams);
+                    final TagScmResult tagScmResult = provider.tag(repository, new ScmFileSet(project.getBasedir()), sanitizedTag, tagParams);
+                    if (!tagScmResult.isSuccess()) {
+                        getLog().error("Provider message:");
+                        getLog().error(tagScmResult.getProviderMessage());
+                        getLog().error("Command output:");
+                        getLog().error(tagScmResult.getCommandOutput());
+
+                        throw new MojoFailureException(tagScmResult.getProviderMessage() );
+                    }
                 } catch (ScmException scme) {
                     throw new MojoFailureException("Unable to tag master branch.", scme);
                 }

From d2eb0e69da0574350e8784ac1d6e4a36668ea3d8 Mon Sep 17 00:00:00 2001
From: bvarner <bryan@varnernet.com>
Date: Wed, 24 May 2017 11:51:02 -0400
Subject: [PATCH 2/2] hotfix release 1.7.2 for the recent tagging improvements
 and issue #74.

---
 pom.xml                                                     | 2 +-
 .../java/com/e_gineering/maven/gitflowhelper/ScmUtils.java  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7aa2247..154012c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     <groupId>com.e-gineering</groupId>
     <artifactId>gitflow-helper-maven-plugin</artifactId>
 
-    <version>1.7.1</version>
+    <version>1.7.2</version>
     <packaging>maven-plugin</packaging>
 
     <name>gitflow-helper-maven-plugin</name>
diff --git a/src/main/java/com/e_gineering/maven/gitflowhelper/ScmUtils.java b/src/main/java/com/e_gineering/maven/gitflowhelper/ScmUtils.java
index 40b18ed..72a669e 100644
--- a/src/main/java/com/e_gineering/maven/gitflowhelper/ScmUtils.java
+++ b/src/main/java/com/e_gineering/maven/gitflowhelper/ScmUtils.java
@@ -35,7 +35,11 @@ public static String resolveUrlOrExpression(final MavenProject project, final Lo
             if (StringUtils.isBlank(connectionUrl)) {
                 connectionUrl = project.getScm().getConnection();
             }
-            return connectionUrl;
+
+            // Issue #74, missing an emtpy / null check before returning.
+            if (!StringUtils.isBlank(connectionUrl)) {
+                return connectionUrl;
+            }
         }
 
         return DEFAULT_URL_EXPRESSION;