Glad I caught this before release

Author: bvarner

README.md

@@ -96,17 +96,17 @@ In practice, the Maven versions should:
 The `enforce-versions` goal asserts these semantics when it can resolve the `gitBranchExpression`.
 
 The goal accomplishes this by checking the Maven pom.xml version value, and asserting the -SNAPSHOT status, as well as matching the current branch name
-against regular expressions, extracting version numbers from the branch names where applicable. If a regex specifies a subgroup 1, the content of that 
-subgroup is asserted to equal the version defined in the pom.xml.
+against regular expressions, extracting version numbers from the branch names where applicable. If a regex specifies subgroups, the content of the 
+last subgroup is asserted to equal the version defined in the pom.xml.
 
 The following properties change the behavior of this goal:
 
 | Property             | Default Value | SNAPSHOT allowed? | Description |
 | -------------------- | ------------- | --------------------------- | ----------- |
 | gitBranchExpression  | current git branch resolved from SCM or ${env.GIT_BRANCH} | n/a | Maven property expression to resolve in order to determine the current git branch |
 | masterBranchPattern  | origin/master | No | Regex. When matched, signals the master branch is being built. Note the lack of a subgroup. |
-| releaseBranchPattern | origin/release/(.*) | No | Regex. When matched, signals a release branch being built. Subgroup 1, if present, must match the Maven project version. |
-| hotfixBranchPattern  | origin/hotfix/(.*) | No | Regex. When matched, signals a hotfix branch is being built. Subgroup 1, if present, must match the Maven project version. |
+| releaseBranchPattern | origin/release/(.*) | No | Regex. When matched, signals a release branch being built. Last subgroup, if present, must match the Maven project version. |
+| hotfixBranchPattern  | origin/hotfix/(.*) | No | Regex. When matched, signals a hotfix branch is being built. Last subgroup, if present, must match the Maven project version. |
 | developmentBranchPattern | origin/develop | Yes | Regex. When matched, signals a development branch is being built. Note the lack of a subgroup. |
 
 ## Goal: `retarget-deploy` (Branch Specific Deploy Targets & Staging)

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

@@ -28,8 +28,8 @@ 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.");
                 }
 
-                // Expect the last group to match (exactly) the current projectVersion.
-                if (gitMatcher.groupCount() > 0) {
+                // Expect the last group on non-master branches to match (exactly) the current projectVersion. (only release / hotfix branches)
+                if (gitMatcher.groupCount() > 0 && !GitBranchType.MASTER.equals(type)) {
                     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() + "]");
                     }