* Updates to the SCM bits. Verified that this works. The default branch patterns are still configured for CI servers to specify the /origin/<branch>, rather than a local branch name which omits the 'origin'

Author: bvarner

README.md

@@ -7,7 +7,7 @@ It does so by:
  * Enforcing [gitflow](http://nvie.com/posts/a-successful-git-branching-model/) version heuristics in [Maven](http://maven.apache.org/) projects.
  * Coercing Maven to gracefully support the gitflow workflow without imposing complex CI job configurations or complex Maven setups.
     * Setting distributionManagement repositories (for things like [maven-deploy-plugin](https://maven.apache.org/plugins/maven-deploy-plugin/)) based upon the current git branch.
-    * SCM tagging builds for the master branch, using the CI server's repository connection information. (Zero Maven scm configuration necessary)
+    * SCM tagging builds for the master branch, using the CI server's repository connection information. (Zero Maven scm configuration necessary, or if you prefer it, you can use the <scm> from maven)
     * Promoting existing tested (staged) artifacts for release, rather than re-building the artifacts. Eliminates the risk of accidental master merges or commits resulting in untested code being released, and provides digest hash traceability for the history of artifacts.
     * Enabling the decoupling of repository deployment and execution environment delivery based on the current git branch.
  * Automated deployment, promotion, and delivery of projects without the [maven-release-plugin](http://maven.apache.org/maven-release/maven-release-plugin/) or some other [*almost there* solution](https://axelfontaine.com/blog/final-nail.html).
@@ -34,7 +34,7 @@ All of the solutions to these issues are implemented independently in different
 
  1. Make sure you have a your Project SCM configured for your git repository, or that your build server sets environment variables for git branches and git URLs.
     Out of the box, the plugin will try to resolve the git branch based upon the SCM definition on your maven project, or fall back to the environment variables set by Jenkins and Hudson.
- 2. Configure the plugin goals and add the build extension to your Maven project. Here's an example that will get you going quickly...
+ 2. Configure the plugin goals and add the build extension to your Maven project. Here's an example that will get you going quickly with all the features...
 
 ```
 <project>
@@ -53,7 +53,7 @@ All of the solutions to these issues are implemented independently in different
                     <releaseDeploymentRepository>${release.repository}</releaseDeploymentRepository>
                     <stageDeploymentRepository>${stage.repository}</stageDeploymentRepository>
                     <snapshotDeploymentRepository>${snapshot.repository}</snapshotDeploymentRepository>
-                    <!-- The plugin will read the git branch ang git url by resolving these properties at run-time -->
+                    <!-- The plugin will read the git branch and git url by resolving these properties at run-time -->
                     <gitBranchExpression/>
                 </configuration>
                 <executions>

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

@@ -102,10 +102,6 @@ public void afterProjectsRead(MavenSession session) throws MavenExecutionExcepti
                 }
             }
 
-            if (gitBranchExpression == null) {
-                gitBranchExpression = ScmUtils.resolveBranchOrExpression(scmManager, project, new DefaultLog(logger));
-            }
-
             pluginsToDrop.put(project, dropPlugins);
         }
 
@@ -117,8 +113,8 @@ public void afterProjectsRead(MavenSession session) throws MavenExecutionExcepti
             logger.debug("Master Branch Pattern: " + masterBranchPattern);
 
             if (gitBranchExpression == null) {
-                logger.debug("Using default gitBranchExpression.");
-                gitBranchExpression = "${env.GIT_BRANCH}";
+                logger.debug("Using default branch expression resolver.");
+                gitBranchExpression = ScmUtils.resolveBranchOrExpression(scmManager, session.getTopLevelProject(), new DefaultLog(logger));
             }
             logger.debug("Git Branch Expression: " + gitBranchExpression);
 

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

@@ -21,12 +21,11 @@ public abstract class ScmUtils {
      * Given the ScmManager for the current execution cycle, and the MavenProject structure, determine the SCM URL or
      * an expression we can resolve the URL from.
      *
-     * @param scmManager The current maven ScmManager
      * @param project    The Current maven Project
      * @param log        A Log to write to
      * @return The developerConnection, if none set, the connection, if none set, then the expression, <code>"${env.GIT_URL}"</code>
      */
-    public static String resolveUrlOrExpression(final ScmManager scmManager, final MavenProject project, final Log log) {
+    public static String resolveUrlOrExpression(final MavenProject project, final Log log) {
         String connectionUrl = null;
 
         // Some projects don't specify SCM Blocks, and instead rely upon the CI server to provide an '${env.GIT_BRANCH}'
@@ -53,7 +52,7 @@ public static String resolveUrlOrExpression(final ScmManager scmManager, final M
      * @throws ScmException
      */
     public static String resolveBranchOrExpression(final ScmManager scmManager, final MavenProject project, final Log log) {
-        String connectionUrl = resolveUrlOrExpression(scmManager, project, log);
+        String connectionUrl = resolveUrlOrExpression(project, log);
 
         // If a connectionURL other than the default expression was resolved, try to resolve the branch.
         if (!StringUtils.equals(connectionUrl, DEFAULT_URL_EXPRESSION)) {

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

@@ -29,7 +29,7 @@ public class TagMasterMojo extends AbstractGitflowBranchMojo {
     protected void execute(final GitBranchType type, final String gitBranch, final String branchPattern) throws MojoExecutionException, MojoFailureException {
         if (project.isExecutionRoot() && type.equals(GitBranchType.MASTER)) {
             if (gitURLExpression == null) {
-                gitURLExpression = ScmUtils.resolveUrlOrExpression(scmManager, project, getLog());
+                gitURLExpression = ScmUtils.resolveUrlOrExpression(project, getLog());
             }
             String gitURL = resolveExpression(gitURLExpression);
             getLog().debug("gitURLExpression: '" + gitURLExpression + "' resolved to: '" + gitURL + "'");