Eliminates all reliance upon ${env.GIT_BRANCH}, but allows for it's use.

* Refactored SCM tagging to use the SCMManager component.
** No longer requires another plugin to run another maven instance inside of our build.
** No longer needs the scm:tag mojo, since we now interact with the SCM manager and execute tagging directly.

* Changed the standard 'development' branch to 'orgin/develop' to be more in-line with the expected defaults from 'gitflow'.
** (Some opinionated people will just have to change their defaults, exposing that their opinions are 'non-standard') ;-D

Author: bvarner

pom.xml

@@ -64,17 +64,6 @@
     </distributionManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>org.twdata.maven</groupId>
-            <artifactId>mojo-executor</artifactId>
-            <version>2.2.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.maven</groupId>
-                    <artifactId>maven-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>

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

@@ -39,7 +39,7 @@ public abstract class AbstractGitflowBranchMojo extends AbstractMojo {
     @Parameter(defaultValue = "origin/hotfix/(.*)", property = "hotfixBranchPattern", required = true)
     private String hotfixBranchPattern;
 
-    @Parameter(defaultValue = "origin/development", 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();
@@ -86,7 +86,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             /*
              * /origin/master goes to the maven 'release' repo.
              * /origin/release/.* , /origin/hotfix/.* , and /origin/bugfix/.* go to the maven 'stage' repo.
-             * /origin/development goes to the 'snapshot' 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/TagMasterMojo.java

@@ -1,45 +1,30 @@
 package com.e_gineering.maven.gitflowhelper;
 
 import com.e_gineering.maven.gitflowhelper.properties.ExpansionBuffer;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugin.BuildPluginManager;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
-
-import static org.twdata.maven.mojoexecutor.MojoExecutor.*;
+import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmTagParameters;
+import org.apache.maven.scm.provider.ScmProvider;
+import org.apache.maven.scm.repository.ScmRepository;
 
 /**
  * Invokes configures the builds SCM settings based on environment variables from a CI Server, and does an scm:tag for builds from Master.
  */
 @Mojo(name = "tag-master", defaultPhase = LifecyclePhase.INSTALL)
 public class TagMasterMojo extends AbstractGitflowBranchMojo {
 
-    // @Parameter tag causes property resolution to fail for patterns containing ${env.}. Default provided in execute();
+    // @Parameter tag causes property resolution to fail for patterns containing ${env.}. Default value is resolved in execute()
     @Parameter(property = "gitURLExpression")
     private String gitURLExpression;
 
     @Parameter(defaultValue = "${project.version}", property = "tag", required = true)
     private String tag;
 
-    @Parameter(defaultValue = "org.apache.maven.plugins", property = "tag.plugin.groupId", required = true)
-    private String tagGroupId;
-
-    @Parameter(defaultValue = "maven-scm-plugin", property = "tag.plugin.artifactId", required = true)
-    private String tagArtifactId;
-
-    @Parameter(defaultValue = "1.9.4", property = "tag.plugin.version", required = true)
-    private String tagVersion;
-
-    @Component
-    private MavenSession mavenSession;
-
-    @Component
-    private BuildPluginManager pluginManager;
-
     @Override
     protected void execute(final GitBranchType type, final String gitBranch, final String branchPattern) throws MojoExecutionException, MojoFailureException {
         if (project.isExecutionRoot() && type.equals(GitBranchType.MASTER)) {
@@ -51,26 +36,22 @@ protected void execute(final GitBranchType type, final String gitBranch, final S
             ExpansionBuffer eb = new ExpansionBuffer(gitURL);
             if (!eb.hasMoreLegalPlaceholders()) {
 
-                getLog().info("Invoking scm:tag for CI build matching branchPattern: [" + branchPattern + "]");
+                getLog().info("Tagging SCM for CI build matching branchPattern: [" + branchPattern + "]");
+
+                try {
+                    ScmRepository repository = scmManager.makeScmRepository(gitURL);
+                    ScmProvider provider = scmManager.getProviderByRepository(repository);
+
+                    String sanitizedTag = provider.sanitizeTagName(tag);
+                    getLog().info("Sanitized tag: '" + sanitizedTag + "'");
+
+                    ScmTagParameters tagParams = new ScmTagParameters("Release tag [" + sanitizedTag + "] generated by gitflow-helper-maven-plugin.");
+                    tagParams.setRemoteTagging(true);
 
-                // Use the execute mojo to run the maven-scm-plugin...
-                executeMojo(
-                        plugin(
-                                groupId(tagGroupId),
-                                artifactId(tagArtifactId),
-                                version(tagVersion)
-                        ),
-                        goal("tag"),
-                        configuration(
-                                element(name("tag"), tag),
-                                element(name("developerConnectionUrl"), "scm:git:" + gitURL)
-                        ),
-                        executionEnvironment(
-                                project,
-                                mavenSession,
-                                pluginManager
-                        )
-                );
+                    provider.tag(repository, new ScmFileSet(project.getBasedir()), sanitizedTag, tagParams);
+                } catch (ScmException scme) {
+                    throw new MojoFailureException("Unable to tag master branch.", scme);
+                }
             } else {
                 throw new MojoFailureException("Unable to resolve gitURLExpression: " + gitURLExpression + ". Leaving build configuration unaltered.");
             }