Merge pull request #23 from egineering-llc/hotfix/1.2.2

Don't fail the build when GIT_BRANCH is unset and it's a non-snapshot build.

Author: bvarner

pom.xml

@@ -9,7 +9,7 @@
     <groupId>com.e-gineering</groupId>
     <artifactId>gitflow-helper-maven-plugin</artifactId>
 
-    <version>1.2.1</version>
+    <version>1.2.2</version>
     <packaging>maven-plugin</packaging>
 
     <name>gitflow-helper-maven-plugin</name>

src/main/java/com/e_gineering/maven/gitflowhelper/AbstractGitflowBranchMojo.java

@@ -102,7 +102,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                 logExecute(GitBranchType.OTHER, gitBranch, null);
             }
         } else {
-            logExecute(GitBranchType.OTHER, gitBranch, null);
+            logExecute(GitBranchType.UNDEFINED, gitBranch, null);
         }
     }
 }

src/main/java/com/e_gineering/maven/gitflowhelper/EnforceVersionsMojo.java

@@ -38,7 +38,7 @@ protected void execute(final GitBranchType type, final String gitBranch, final S
                     }
                 }
             }
-        } else { // Unversioned branch type. Must be -SNAPSHOT.
+        } else if (!type.equals(GitBranchType.UNDEFINED)) { // Unversioned branch type. Must be -SNAPSHOT.
             if (!ArtifactUtils.isSnapshot(project.getVersion())) {
                 throw new MojoFailureException("Builds from non-release git branches must end with -SNAPSHOT");
             }

src/main/java/com/e_gineering/maven/gitflowhelper/GitBranchType.java

@@ -9,5 +9,6 @@ public enum GitBranchType {
     HOTFIX,
     BUGFIX,
     DEVELOPMENT,
-    OTHER;
+    OTHER,
+    UNDEFINED;
 }