Merge pull request #111 from egineering-llc/release/2.2.0

Release/2.2.0

Author: bvarner

README.md

@@ -110,7 +110,7 @@ All of the solutions to these issues are implemented independently in different
                     <stageDeploymentRepository>localnexus-stage</stageDeploymentRepository>
                     <snapshotDeploymentRepository>localnexus-snapshots</snapshotDeploymentRepository>
                     <!-- Allow branches starting with feature/poc to be published as automagically versioned branch-name-SNAPSHOT artifacts -->
-                    <otherDeploymentBranchPattern>(origin/)feature/poc/.*</otherDeploymentBranchPattern>
+                    <otherDeployBranchPattern>(origin/)feature/poc/.*</otherDeployBranchPattern>
                 </configuration>
                 <executions>
                     <execution>
@@ -203,7 +203,7 @@ plugins in the build process (deploy, site-deploy, etc.) will use the repositori
 | releaseDeploymentRepository | n/a | The repository to use for releases. (Builds with a GIT_BRANCH matching `masterBranchPattern` or `supportBranchPattern`) |
 | stageDeploymentRepository | n/a | The repository to use for staging. (Builds with a GIT_BRANCH matching `releaseBranchPattern` or `hotfixBranchPattern`) | 
 | snapshotDeploymentRepository | n/a | The repository to use for snapshots. (Builds matching `developmentBranchPattern`) |
-| otherDeploymentBranchPattern | n/a | Regex. When matched, the branch name is normalized and any artifacts produced by the build will include the normalized branch name and -SNAPSHOT. Deployment will target the snapshot repository |
+| otherDeployBranchPattern | n/a | Regex. When matched, the branch name is normalized and any artifacts produced by the build will include the normalized branch name and -SNAPSHOT. Deployment will target the snapshot repository |
 
 **The repository properties should follow the following format**, `id::layout::url::uniqueVersion`.
 
@@ -255,7 +255,7 @@ Can be replaced with the following plugin configuration, which also introduces t
 ### Deploying non-release (OTHER) type branches as -SNAPSHOT releases.
 
 In addition to setting up repository targets for release branches, the `retarget-depoy` branch can deploy other branches
-matching the `otherDeploymentBranchPattern` as -SNAPSHOT artifacts which include the branch name as build metadata.
+matching the `otherDeployBranchPattern` as -SNAPSHOT artifacts which include the branch name as build metadata.
 By default this is loosely based on the [semVer](https://semver.org) semantic version scheme, in that the plugin will 
 reversion any artifacts to be produced with `+feature-branch-name-normalized-SNAPSHOT` where any characters not in 
 `[0-9A-Za-z-.]` will be replaced with `-`. In cases where the `+` delimiter is problematic, you can override that default

pom.xml

@@ -8,7 +8,7 @@
 
     <groupId>com.e-gineering</groupId>
     <artifactId>gitflow-helper-maven-plugin</artifactId>
-    <version>2.1.1</version>
+    <version>2.2.0</version>
 
     <packaging>maven-plugin</packaging>
 

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

@@ -80,7 +80,7 @@ public void afterProjectsRead(MavenSession session) throws MavenExecutionExcepti
         for (MavenProject project : session.getProjects()) {
             List<Plugin> dropPlugins = new ArrayList<>();
 
-            for (Plugin plugin : project.getBuildPlugins()) {
+            for (Plugin plugin : project.getModel().getBuild().getPlugins()) {
                 // Don't drop our plugin. Read it's config
                 if (plugin.getKey().equals("com.e-gineering:gitflow-helper-maven-plugin")) {
                     pluginFound = true;
@@ -189,7 +189,7 @@ public void afterProjectsRead(MavenSession session) throws MavenExecutionExcepti
                     // 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));
+                    project.getModel().getBuild().getPlugins().removeAll(pluginsToDrop.get(project));
                 }
             }
         }