Test cases are all adjusted, and they found some thing.

Author: bvarner

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

@@ -11,7 +11,6 @@
 import org.apache.maven.model.Parent;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.model.io.ModelReader;
 import org.apache.maven.model.io.ModelWriter;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.component.annotations.Component;
@@ -25,9 +24,6 @@
 @Component(role = AbstractMavenLifecycleParticipant.class, hint = "other-branch-version")
 public class OtherBranchVersionExtension extends AbstractBranchDetectingExtension {
 
-    @Requirement(role = ModelReader.class)
-    ModelReader modelReader;
-    
     @Requirement(role = ModelWriter.class)
     ModelWriter modelWriter;
 

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

@@ -37,8 +37,9 @@ protected void execute(final GitBranchInfo gitBranchInfo) throws MojoExecutionEx
                 String otherBranchesToDeploy = resolveExpression(otherDeployBranchPattern);
 	            if (!"".equals(otherBranchesToDeploy) && gitBranchInfo.getName().matches(otherBranchesToDeploy)) {
                     setTargetSnapshots();
+                    // Only break if we set something!
+                    break;
                 }
-	            break;
             }
             default: {
                 unsetRepos();

src/test/java/com/e_gineering/maven/gitflowhelper/OtherBranchIT.java

@@ -16,7 +16,7 @@ public void featureSnapshotSemVer() throws Exception {
 			verifier.addCliOption("-Dexpression=project.version");
 			verifier.executeGoal("help:evaluate");
 
-			verifier.verifyTextInLog("Artifact versions updated with build metadata: +origin-feature-poc-my-feature-branch-SNAPSHOT");
+			verifier.verifyTextInLog("Updating project com.e-gineering:gitflow-helper-maven-plugin-test-stub:5.0.0-SNAPSHOT to: 5.0.0+origin-feature-poc-my-feature-branch-SNAPSHOT");
 			verifier.verifyErrorFreeLog();
 		} finally {
 			verifier.resetStreams();
@@ -28,8 +28,8 @@ public void featureSemVer() throws Exception {
 		Verifier verifier = createVerifier("/project-stub", "origin/feature/poc/my-feature-branch.with.other.identifiers", "5.0.1");
 		try {
 			verifier.executeGoal("initialize");
-
-			verifier.verifyTextInLog("Artifact versions updated with build metadata: +origin-feature-poc-my-feature-branch.with.other.identifiers-SNAPSHOT");
+			
+			verifier.verifyTextInLog("Updating project com.e-gineering:gitflow-helper-maven-plugin-test-stub:5.0.1 to: 5.0.1+origin-feature-poc-my-feature-branch.with.other.identifiers-SNAPSHOT");
 			verifier.verifyErrorFreeLog();
 		} finally {
 			verifier.resetStreams();
@@ -55,8 +55,8 @@ public void automagicVersionDependenciesResolve() throws Exception {
 		Verifier verifier = createVerifier("/project-stub", "origin/feature/poc/long-running", "2.0.0");
 		try {
 			verifier.executeGoal("deploy");
-
-			verifier.verifyTextInLog("Artifact versions updated with build metadata: +origin-feature-poc-long-running-SNAPSHOT");
+			
+			verifier.verifyTextInLog("Updating project com.e-gineering:gitflow-helper-maven-plugin-test-stub:2.0.0 to: 2.0.0+origin-feature-poc-long-running-SNAPSHOT");
 			verifier.verifyErrorFreeLog();
 		} finally {
 			verifier.resetStreams();
@@ -70,7 +70,8 @@ public void automagicVersionDependenciesResolve() throws Exception {
 			verifier.getCliOptions().add("-Dplugin.stub.version=2.0.0+origin-feature-poc-long-running-SNAPSHOT");
 
 			verifier.executeGoal("deploy");
-			verifier.verifyTextInLog("Artifact versions updated with build metadata: -origin-feature-poc-long-running-SNAPSHOT");
+			// the alt project uses the `-` as the version delimiter, rather than `+`
+			verifier.verifyTextInLog("Updating project com.e-gineering:gitflow-helper-maven-plugin-test-stub-alt:2.0.0 to: 2.0.0-origin-feature-poc-long-running-SNAPSHOT");
 			verifier.verifyErrorFreeLog();
 		} finally {
 			verifier.resetStreams();
@@ -82,8 +83,7 @@ public void attachDeployed() throws Exception {
 		Verifier verifier = createVerifier("/project-stub", "origin/feature/poc/reattach", "5.0.0-SNAPSHOT");
 		try {
 			verifier.executeGoal("deploy");
-
-			verifier.verifyTextInLog("Artifact versions updated with build metadata: +origin-feature-poc-reattach-SNAPSHOT");
+			verifier.verifyTextInLog("Updating project com.e-gineering:gitflow-helper-maven-plugin-test-stub:5.0.0-SNAPSHOT to: 5.0.0+origin-feature-poc-reattach-SNAPSHOT");
 			verifier.verifyErrorFreeLog();
 		} finally {
 			verifier.resetStreams();
@@ -92,6 +92,7 @@ public void attachDeployed() throws Exception {
 		verifier = createVerifier("/project-stub", "origin/feature/poc/reattach", "5.0.0-SNAPSHOT");
 		try {
 			verifier.executeGoals(Arrays.asList("validate", "gitflow-helper:attach-deployed"));
+			verifier.verifyTextInLog("Updating project com.e-gineering:gitflow-helper-maven-plugin-test-stub:5.0.0-SNAPSHOT to: 5.0.0+origin-feature-poc-reattach-SNAPSHOT");
 			verifier.verifyErrorFreeLog();
 		} finally {
 			verifier.resetStreams();

src/test/java/com/e_gineering/maven/gitflowhelper/RetargetDeployIT.java

@@ -123,7 +123,6 @@ public void masterTargetsReleases() throws Exception {
 
 	@Test
 	public void othersUnsetRepos() throws Exception {
-		// Deploy a hotfix to the test-releases.
 		Verifier verifier = createVerifier("/project-stub", "feature/undeployable", "3.5.0-SNAPSHOT");
 		try {
 			verifier.executeGoal("deploy");