Merge branch 'master' into development

Author: bvarner

.gitignore

@@ -1,3 +1,4 @@
+*.versionsBackup
 *.class
 
 *.idea

pom.xml

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

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

@@ -35,10 +35,6 @@ protected void execute(final GitBranchType type, final String gitBranch, final S
                     }
                 }
             }
-        } 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");
-            }
         }
     }
 }