minor upgrade/downgrade detection is implemented

Author: host6

src/main/java/org/scm4j/releaser/ExtendedStatusBuilder.java

@@ -8,6 +8,7 @@
 import org.scm4j.releaser.branch.ReleaseBranchFactory;
 import org.scm4j.releaser.branch.ReleaseBranchPatch;
 import org.scm4j.releaser.conf.*;
+import org.scm4j.releaser.exceptions.EMinorUpgradeDowngrade;
 import org.scm4j.releaser.exceptions.ENoReleaseBranchForPatch;
 import org.scm4j.releaser.exceptions.ENoReleases;
 import org.scm4j.releaser.exceptions.EReleaseMDepsNotLocked;
@@ -106,7 +107,7 @@ private ExtendedStatus getMinorStatus(Component comp, CachedStatuses cache, IPro
 			status = BuildStatus.LOCK;
 		} else if (hasMDepsNotInDONEStatus(rb.getMDeps(), cache)) {
 			status = BuildStatus.BUILD_MDEPS;
-		} else if (!areMDepsPatchesActual(rb.getMDeps(), cache)) {
+		} else if (!areMDepsPatchesActual(comp, repo, rb.getMDeps(), cache)) {
 			status = BuildStatus.ACTUALIZE_PATCHES;
 		} else {
 			status = BuildStatus.BUILD;
@@ -152,7 +153,7 @@ private ExtendedStatus getPatchStatus(Component comp, CachedStatuses cache, IPro
 
 		if (hasMDepsNotInDONEStatus(rb.getMDeps(), cache)) {
 			buildStatus = BuildStatus.BUILD_MDEPS;
-		} else if (!areMDepsPatchesActual(rb.getMDeps(), cache)) {
+		} else if (!areMDepsPatchesActual(comp, repo, rb.getMDeps(), cache)) {
 			buildStatus = BuildStatus.ACTUALIZE_PATCHES;
 		} else if (reportDuration(() -> noValueableCommitsAfterLastTag(repo, rb), "is release branch modified check", comp, progress)) {
 			buildStatus = BuildStatus.DONE;
@@ -217,15 +218,34 @@ private <T> T walkOnCommits(VCSRepository repo, ReleaseBranchPatch rb, Function<
 		return null;
 	}
 
-	private boolean areMDepsPatchesActual(List<Component> mDeps, CachedStatuses cache) {
+	private boolean areMDepsPatchesActual(Component rootComp, VCSRepository repo, List<Component> mDeps, CachedStatuses cache) {
 		for (Component mDep : mDeps) {
 			String url = repoFactory.getUrl(mDep);
 			Version nextMDepVersion = cache.get(url).getNextVersion();
-			if (!nextMDepVersion.equals(mDep.getVersion().toNextPatch())) {
-				DelayedTagsFile mdf = new DelayedTagsFile();
-				if (!(nextMDepVersion.getPatch().equals(ZERO_PATCH) && mdf.getDelayedTagByUrl(url) != null)) {
-					return false;
-				}
+			if (!nextMDepVersion.toReleaseNoPatch().equals(mDep.getVersion().toReleaseNoPatch())) {
+				cache.remove(repo.getUrl());
+				throw new EMinorUpgradeDowngrade(rootComp, mDep, nextMDepVersion.toPreviousPatch());
+			}
+			DelayedTagsFile mdf = new DelayedTagsFile();
+			Integer cachedMDepPatch;
+			if (!(nextMDepVersion.getPatch().equals(ZERO_PATCH) && mdf.getDelayedTagByUrl(url) != null)) {
+				cachedMDepPatch = Integer.parseInt(nextMDepVersion.toPreviousPatch().getPatch());
+			} else {
+				cachedMDepPatch = Integer.parseInt(nextMDepVersion.getPatch());
+			}
+			 
+			Integer mDepPatch = Integer.parseInt(mDep.getVersion().getPatch());
+			if (cachedMDepPatch == mDepPatch) {
+				continue;
+			}
+			
+			if (cachedMDepPatch < mDepPatch) {
+				cache.remove(repo.getUrl());
+				throw new EMinorUpgradeDowngrade(rootComp, mDep, nextMDepVersion.toPreviousPatch());
+			}
+				
+			if (!(nextMDepVersion.getPatch().equals(ZERO_PATCH) && mdf.getDelayedTagByUrl(url) != null)) {
+				return false;
 			}
 		}
 		return true;

src/main/java/org/scm4j/releaser/exceptions/EMinorUpgradeDowngrade.java

@@ -0,0 +1,32 @@
+package org.scm4j.releaser.exceptions;
+
+import org.scm4j.commons.Version;
+import org.scm4j.releaser.conf.Component;
+
+public class EMinorUpgradeDowngrade extends EReleaserException {
+
+	private static final long serialVersionUID = 1L;
+
+	private final Version changeToVersion;
+	private final Component problematicMDep;
+	private final Component rootComp;
+
+	public EMinorUpgradeDowngrade(Component rootComp, Component problematicMDep, Version changeToVersion) {
+		super(String.format("minor upgrade/downgrade detected for mdep %s of root comp %s: attempt to change to %s", problematicMDep, rootComp, changeToVersion));
+		this.changeToVersion = changeToVersion;
+		this.problematicMDep = problematicMDep;
+		this.rootComp = rootComp;
+	}
+
+	public Version getChangeToVersion() {
+		return changeToVersion;
+	}
+
+	public Component getProblematicMDep() {
+		return problematicMDep;
+	}
+
+	public Component getRootComp() {
+		return rootComp;
+	}
+}

src/test/java/org/scm4j/releaser/WorkflowBuildTest.java

@@ -98,6 +98,21 @@ public void testActualizePatches() {
 		// check UBL actualized unTillDb version
 		checkUBLMDepsVersions(1);
 	}
+	
+	@Test
+	public void testNoActualizePatchesIfHasNewReleases() {
+		forkAndBuild(compUnTill);
+		
+		// release next 2.60 unTillDb minor
+		env.generateFeatureCommit(env.getUnTillDbVCS(), repoUnTillDb.getDevelopBranch(), "feature added");
+		forkAndBuild(compUnTillDb, 2);
+		
+		ReleaseBranchCurrent crb = ReleaseBranchFactory.getCRB(repoUnTill);
+		IAction action = execAndGetActionBuild(compUnTill.clone(crb.getVersion()));
+		assertActionDoesNothing(action, compUnTill);
+		assertActionDoesNothing(action, compUBL);
+		assertActionDoesNothing(action, compUnTillDb);
+	}
 
 	@Test
 	public void testLockMDeps() {