I had too much fun with this branch name.

Author: bvarner

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

@@ -33,6 +33,9 @@ public abstract class AbstractGitflowBranchMojo extends AbstractMojo {
     @Parameter(defaultValue = "(origin/)?master", property = "masterBranchPattern", required = true)
     private String masterBranchPattern;
 
+    @Parameter(defaultValue = "(origin/)?support/(.*)", property = "supportBranchPattern", required = true)
+    private String supportBranchPattern;
+
     @Parameter(defaultValue = "(origin/)?release/(.*)", property = "releaseBranchPattern", required = true)
     private String releaseBranchPattern;
 
@@ -91,6 +94,8 @@ public void execute() throws MojoExecutionException, MojoFailureException {
              */
             if (gitBranch.matches(masterBranchPattern)) {
                 logExecute(GitBranchType.MASTER, gitBranch, masterBranchPattern);
+            } else if (gitBranch.matches(supportBranchPattern)) {
+                logExecute(GitBranchType.SUPPORT, gitBranch, supportBranchPattern);
             } else if (gitBranch.matches(releaseBranchPattern)) {
                 logExecute(GitBranchType.RELEASE, gitBranch, releaseBranchPattern);
             } else if (gitBranch.matches(hotfixBranchPattern)) {

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

@@ -16,7 +16,9 @@ public class AttachDeployedArtifactsMojo extends AbstractGitflowBasedRepositoryM
     @Override
     protected void execute(GitBranchType type, String gitBranch, String branchPattern) throws MojoExecutionException, MojoFailureException {
         switch (type) {
-            case MASTER: {
+            case MASTER:
+            case SUPPORT:
+            {
                 getLog().info("Attaching artifacts from release repository...");
                 attachExistingArtifacts(releaseDeploymentRepository, true);
                 break;

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

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

@@ -7,11 +7,12 @@
  */
 public enum GitBranchType {
     MASTER,
+    SUPPORT,
     RELEASE,
     HOTFIX,
     DEVELOPMENT,
     OTHER,
     UNDEFINED;
 
-    static final EnumSet<GitBranchType> VERSIONED_TYPES = EnumSet.of(GitBranchType.MASTER, GitBranchType.RELEASE, GitBranchType.HOTFIX);
+    static final EnumSet<GitBranchType> VERSIONED_TYPES = EnumSet.of(GitBranchType.MASTER, GitBranchType.SUPPORT, GitBranchType.RELEASE, GitBranchType.HOTFIX);
 }

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

@@ -65,7 +65,8 @@ public void afterProjectsRead(MavenSession session) throws MavenExecutionExcepti
                 try {
                     pluginsToRetain.add(descriptorCreator.findPluginForPrefix(prefix, session));
                 } catch (NoPluginFoundForPrefixException ex) {
-                    throw new MavenExecutionException("Unable to resolve plugin for prefix: " + prefix, ex);
+                    logger.warn("gitflow-helper-maven-plugin: Unable to resolve project plugin for prefix: " + prefix + " for goal: " + goal);
+//                    throw new MavenExecutionException("Unable to resolve plugin for prefix: " + prefix, ex);
                 }
             }
         }
@@ -128,7 +129,10 @@ public void afterProjectsRead(MavenSession session) throws MavenExecutionExcepti
                 logger.info("gitflow-helper-maven-plugin: Enabling MasterPromoteExtension. GIT_BRANCH: [" + gitBranch + "] matches masterBranchPattern: [" + masterBranchPattern + "]");
 
                 for (MavenProject project : session.getProjects()) {
-                    // Drop all the plugins from the build except for the gitflow-helper-maven-plugin.
+                    // Drop all the plugins from the build except for the gitflow-helper-maven-plugin, or plugins we
+                    // invoked goals for which could be mapped back to plugins in our project build.
+                    // Goals invoked from the commandline which cannot be mapped back to our project, will get warnings, but should still execute.
+                    // If someone is on 'master' and starts executing goals, we need to allow them to do that.
                     project.getBuildPlugins().removeAll(pluginsToDrop.get(project));
                 }
             }

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

@@ -28,6 +28,7 @@ protected void execute(final GitBranchType type, final String gitBranch, final S
                 break;
             }
 
+            case SUPPORT:
             case MASTER: {
                 getLog().info("Resolving & Reattaching existing artifacts from stageDeploymentRepository [" + stageDeploymentRepository + "]");
 

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

@@ -18,6 +18,7 @@ protected void execute(final GitBranchType type, final String gitBranch, final S
         }
 
         switch (type) {
+            case SUPPORT:
             case MASTER: {
                 getLog().info("Setting release artifact repository to: [" + releaseDeploymentRepository + "]");
                 project.setSnapshotArtifactRepository(null);

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

@@ -30,6 +30,18 @@ public class SetPropertiesMojo extends AbstractGitflowBranchMojo {
     @Parameter(property = "masterBranchPropertyFile")
     private File masterBranchPropertyFile;
 
+    /**
+     * Properties to be applied if executing against a support branch
+     */
+    @Parameter(property = "supportBranchProperties")
+    private Properties supportBranchProperties;
+
+    /**
+     * A Property file to load if executing against the support branch
+     */
+    @Parameter(property = "supportBranchPropertyFile")
+    private File supportBranchPropertyFile;
+
     /**
      * Properties to be applied if executing against a release branch
      */
@@ -114,6 +126,11 @@ protected void execute(final GitBranchType type, final String gitBranch, final S
         Properties toInject = null;
         File toLoad = null;
         switch (type) {
+            case SUPPORT: {
+                toInject = supportBranchProperties;
+                toLoad = supportBranchPropertyFile;
+                break;
+            }
             case MASTER: {
                 toInject = masterBranchProperties;
                 toLoad = masterBranchPropertyFile;

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

@@ -27,7 +27,7 @@ public class TagMasterMojo extends AbstractGitflowBranchMojo {
 
     @Override
     protected void execute(final GitBranchType type, final String gitBranch, final String branchPattern) throws MojoExecutionException, MojoFailureException {
-        if (project.isExecutionRoot() && type.equals(GitBranchType.MASTER)) {
+        if (project.isExecutionRoot() && (type.equals(GitBranchType.MASTER) || type.equals(GitBranchType.SUPPORT))) {
             if (gitURLExpression == null) {
                 gitURLExpression = ScmUtils.resolveUrlOrExpression(project, getLog());
             }