* Updated regex patterns to work for jenkins injected ${env.GIT_BRANCH} and local git HEAD resolution. (origin/) as an optional group match.

* Version enforcement expects the last sub group matched to be the version expression.
* Version enforcement now asserts -SNAPSHOT on development branch. I think this was lost in the change to only assert that releaseable branches are non-snapshot, and undefined branches should never be asserted.
* Updated a log statement so it's a bit more obvious.

Author: bvarner

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

@@ -30,16 +30,16 @@ public abstract class AbstractGitflowBranchMojo extends AbstractMojo {
     @Component
     protected ScmManager scmManager;
 
-    @Parameter(defaultValue = "origin/master", property = "masterBranchPattern", required = true)
+    @Parameter(defaultValue = "(origin/)?master", property = "masterBranchPattern", required = true)
     private String masterBranchPattern;
 
-    @Parameter(defaultValue = "origin/release/(.*)", property = "releaseBranchPattern", required = true)
+    @Parameter(defaultValue = "(origin/)?release/(.*)", property = "releaseBranchPattern", required = true)
     private String releaseBranchPattern;
 
-    @Parameter(defaultValue = "origin/hotfix/(.*)", property = "hotfixBranchPattern", required = true)
+    @Parameter(defaultValue = "(origin/)?hotfix/(.*)", property = "hotfixBranchPattern", required = true)
     private String hotfixBranchPattern;
 
-    @Parameter(defaultValue = "origin/develop", property = "developmentBranchPattern", required = true)
+    @Parameter(defaultValue = "(origin/)?develop", property = "developmentBranchPattern", required = true)
     private String developmentBranchPattern;
 
     // @Parameter tag causes property resolution to fail for patterns containing ${env.}. Default provided in execute();
@@ -84,9 +84,9 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
         if (!eb.hasMoreLegalPlaceholders()) {
             /*
-             * /origin/master goes to the maven 'release' repo.
-             * /origin/release/.* , /origin/hotfix/.* , and /origin/bugfix/.* go to the maven 'stage' repo.
-             * /origin/develop goes to the 'snapshot' repo.
+             * (/origin/)?master goes to the maven 'release' repo.
+             * (/origin/)?release/(.*) , (/origin/)?hotfix/(.*) , and (/origin/)?bugfix/(.*) go to the maven 'stage' repo.
+             * (/origin/)?develop goes to the 'snapshot' repo.
              * All other builds will use the default semantics for 'deploy'.
              */
             if (gitBranch.matches(masterBranchPattern)) {

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

@@ -28,13 +28,15 @@ protected void execute(final GitBranchType type, final String gitBranch, final S
                     throw new MojoFailureException("The current git branch: [" + gitBranch + "] is defined as a release branch. The maven project version: [" + project.getVersion() + "] is currently a snapshot version.");
                 }
 
-                // If there is a group 1, expect it to match (exactly) the current projectVersion.
-                if (gitMatcher.groupCount() >= 1) {
-                    if (!gitMatcher.group(1).trim().equals(project.getVersion().trim())) {
-                        throw new MojoFailureException("The current git branch: [" + gitBranch + "] expected the maven project version to be: [" + gitMatcher.group(1).trim() + "], but the maven project version is: [" + project.getVersion() + "]");
+                // Expect the last group to match (exactly) the current projectVersion.
+                if (gitMatcher.groupCount() > 0) {
+                    if (!gitMatcher.group(gitMatcher.groupCount()).trim().equals(project.getVersion().trim())) {
+                        throw new MojoFailureException("The current git branch: [" + gitBranch + "] expected the maven project version to be: [" + gitMatcher.group(gitMatcher.groupCount()).trim() + "], but the maven project version is: [" + project.getVersion() + "]");
                     }
                 }
             }
+        } else if (GitBranchType.DEVELOPMENT.equals(type) && !ArtifactUtils.isSnapshot(project.getVersion())) {
+            throw new MojoFailureException("The current git branch: [" + gitBranch + "] is detected as the gitflow development branch, and expects a maven project version ending with -SNAPSHOT. The maven project version found was: [" + project.getVersion() + "]");
         }
     }
 }

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

@@ -121,7 +121,7 @@ public void afterProjectsRead(MavenSession session) throws MavenExecutionExcepti
 
             PropertyResolver pr = new PropertyResolver();
             String gitBranch = pr.resolveValue(gitBranchExpression, session.getCurrentProject().getProperties(), systemEnvVars);
-            logger.info("Build Extension Resolved: " + gitBranchExpression + " to: " + gitBranch);
+            logger.info("gitflow-helper-maven-plugin: Build Extension resolved gitBranchExpression: " + gitBranchExpression + " to: " + gitBranch);
 
             // Test to see if the current GIT_BRANCH matches the masterBranchPattern...
             if (gitBranch != null && gitBranch.matches(masterBranchPattern)) {