Skip to content

Refine the release version log when there is no change since last release #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ForrestCai wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refine the release version log when there is no change since last release #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/main/java/com/github/danielflower/mavenplugins/release/Reactor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public static Reactor fromProjects(BaseMojo mojo, Log log, LocalGitRepo gitRepo,
resolveVersionsDefinedThroughProperties(mojo.getProjects());

AnnotatedTagFinder annotatedTagFinder = new AnnotatedTagFinder(mojo.getVersionNamer());
List<String> moduleReleaseLogMessages = new ArrayList<>();

for (MavenProject project : mojo.getProjects()) {
String relativePathToModule = calculateModulePath(mojo.getProject(), project);
String artifactId = project.getArtifactId();
Expand Down Expand Up @@ -92,29 +94,34 @@ public static Reactor fromProjects(BaseMojo mojo, Log log, LocalGitRepo gitRepo,
String equivalentVersion = null;

if (mojo.getModulesToForceRelease() != null && mojo.getModulesToForceRelease().contains(artifactId)) {
log.info("Releasing " + artifactId + " " + newVersion.releaseVersion() + " as we were asked to force release.");
moduleReleaseLogMessages.add("Releasing " + artifactId + " " + newVersion.releaseVersion() + " as we were asked to force release.");
} else if (oneOfTheDependenciesHasChanged) {
log.info("Releasing " + artifactId + " " + newVersion.releaseVersion() + " as " + changedDependency + " has changed.");
moduleReleaseLogMessages.add("Releasing " + artifactId + " " + newVersion.releaseVersion() + " as " + changedDependency + " has changed.");
} else {
AnnotatedTag previousTagThatIsTheSameAsHEADForThisModule = hasChangedSinceLastRelease(previousTagsForThisModule, detector, project, relativePathToModule);
if (previousTagThatIsTheSameAsHEADForThisModule != null) {
equivalentVersion = previousTagThatIsTheSameAsHEADForThisModule.version() + mojo.getVersionNamer().getDelimiter() + previousTagThatIsTheSameAsHEADForThisModule.buildNumber();
// attempt to resolve
if (resolverWrapper.isResolvable(project.getGroupId(), project.getArtifactId(), equivalentVersion, project.getPackaging(), log)) {
log.info("Will use version " + equivalentVersion + " for " + artifactId + " as it has not been changed since that release.");
moduleReleaseLogMessages.add("Will use version " + equivalentVersion + " for " + artifactId + " as it has not been changed since that release.");
} else {
log.info("Will use version " + newVersion.releaseVersion() + " for " + artifactId + " as although no change was detected, the artifact cannot be resolved!");
moduleReleaseLogMessages.add("Will use version " + newVersion.releaseVersion() + " for " + artifactId + " as although no change was detected, the artifact cannot be resolved!");
equivalentVersion = null;
}
} else {
log.info("Will use version " + newVersion.releaseVersion() + " for " + artifactId + " as it has changed since the last release.");
moduleReleaseLogMessages.add("Will use version " + newVersion.releaseVersion() + " for " + artifactId + " as it has changed since the last release.");
}
}
ReleasableModule module = new ReleasableModule(project, newVersion, equivalentVersion, relativePathToModule, mojo.getTagNameFormat(), log);
modules.add(module);
}

if (!atLeastOneBeingReleased(modules)) {
if (atLeastOneBeingReleased(modules)) {
for (String moduleReleaseLogMessage : moduleReleaseLogMessages) {
log.info(moduleReleaseLogMessage);
}
}
else {
switch (actionWhenNoChangesDetected) {
case ReleaseNone:
log.warn("No changes have been detected in any modules so will not perform release");
Expand All @@ -125,6 +132,7 @@ public static Reactor fromProjects(BaseMojo mojo, Log log, LocalGitRepo gitRepo,
log.warn("No changes have been detected in any modules so will re-release them all");
List<ReleasableModule> newList = new ArrayList<ReleasableModule>();
for (ReleasableModule module : modules) {
log.info("Will use version " + module.getNewVersion() + " for " + module.getArtifactId() + " as it has not been changed since that release.");
newList.add(module.createReleasableVersion(log));
}
modules = newList;
Expand Down
15 changes: 5 additions & 10 deletions src/test/java/e2e/NextMojoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ public void ifThereHaveBeenNoChangesThenReReleaseAllModules() throws Exception {
assertTagDoesNotExist("more-utils-10.0.2");
assertTagDoesNotExist("deep-dependencies-aggregator-1.0.2");

assertThat(output, oneOf(containsString("[INFO] Will use version 1.2.3.1 for parent-module as it has not been changed since that release.")));
assertThat(output, oneOf(containsString("[INFO] Will use version 10.0.1 for more-utils as it has not been changed since that release.")));
assertThat(output, oneOf(containsString("[INFO] Will use version 2.0.1 for core-utils as it has not been changed since that release.")));
assertThat(output, oneOf(containsString("[INFO] Will use version 3.2.1 for console-app as it has not been changed since that release.")));
assertThat(output, oneOf(containsString("[INFO] Will use version 1.0.1 for deep-dependencies-aggregator as it has not been changed since that release.")));
assertThat(output, oneOf(containsString("[WARNING] No changes have been detected in any modules so will re-release them all")));
assertThat(output, oneOf(containsString("[INFO] Will use version 1.2.3.2 for parent-module as it has not been changed since that release.")));
assertThat(output, oneOf(containsString("[INFO] Will use version 10.0.2 for more-utils as it has not been changed since that release.")));
assertThat(output, oneOf(containsString("[INFO] Will use version 2.0.2 for core-utils as it has not been changed since that release.")));
assertThat(output, oneOf(containsString("[INFO] Will use version 3.2.2 for console-app as it has not been changed since that release.")));
assertThat(output, oneOf(containsString("[INFO] Will use version 1.0.2 for deep-dependencies-aggregator as it has not been changed since that release.")));
}

@Test
Expand All @@ -86,11 +86,6 @@ public void ifThereHaveBeenNoChangesCanOptToReleaseNoModules() throws Exception
assertTagDoesNotExist("more-utils-10.0.2");
assertTagDoesNotExist("deep-dependencies-aggregator-1.0.2");

assertThat(output, oneOf(containsString("[INFO] Will use version 1.2.3.1 for parent-module as it has not been changed since that release.")));
assertThat(output, oneOf(containsString("[INFO] Will use version 10.0.1 for more-utils as it has not been changed since that release.")));
assertThat(output, oneOf(containsString("[INFO] Will use version 2.0.1 for core-utils as it has not been changed since that release.")));
assertThat(output, oneOf(containsString("[INFO] Will use version 3.2.1 for console-app as it has not been changed since that release.")));
assertThat(output, oneOf(containsString("[INFO] Will use version 1.0.1 for deep-dependencies-aggregator as it has not been changed since that release.")));
assertThat(output, oneOf(containsString("[WARNING] No changes have been detected in any modules so will not perform release")));
}

Expand Down
8 changes: 7 additions & 1 deletion src/test/java/e2e/SkippingUnchangedModulesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,19 @@ public void ifThereHaveBeenNoChangesThenReReleaseAllModules() throws Exception {
List<String> firstBuildOutput = testProject.mvnRelease("1");
assertThat(firstBuildOutput, noneOf(containsString("No changes have been detected in any modules so will re-release them all")));
List<String> secondBuildOutput = testProject.mvnRelease("2");
assertThat(secondBuildOutput, oneOf(containsString("No changes have been detected in any modules so will re-release them all")));

assertTagExists("console-app-3.2.2");
assertTagExists("parent-module-1.2.3.2");
assertTagExists("core-utils-2.0.2");
assertTagExists("more-utils-10.0.2");
assertTagExists("deep-dependencies-aggregator-1.0.2");

assertThat(secondBuildOutput, oneOf(containsString("[WARNING] No changes have been detected in any modules so will re-release them all")));
assertThat(secondBuildOutput, oneOf(containsString("[INFO] Will use version 1.2.3.2 for parent-module as it has not been changed since that release.")));
assertThat(secondBuildOutput, oneOf(containsString("[INFO] Will use version 10.0.2 for more-utils as it has not been changed since that release.")));
assertThat(secondBuildOutput, oneOf(containsString("[INFO] Will use version 2.0.2 for core-utils as it has not been changed since that release.")));
assertThat(secondBuildOutput, oneOf(containsString("[INFO] Will use version 3.2.2 for console-app as it has not been changed since that release.")));
assertThat(secondBuildOutput, oneOf(containsString("[INFO] Will use version 1.0.2 for deep-dependencies-aggregator as it has not been changed since that release.")));
}

@Test
Expand Down