SpringCloud/spring-cloud-release-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hopefully fixed the issue with wrong version bumping

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-04-11 10:16:14 +02:00
parent 51872f0b27
commit 4c6fae8424
2 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java
View File

@@ -55,13 +55,8 @@ public class Releaser {
}
public void rollbackReleaseVersion(File project, ProjectVersion originalVersion, ProjectVersion changedVersion) {
ProjectVersion version = new ProjectVersion(project);
if (version.isSnapshot()) {
log.info("\nCurrent pom contains snapshot version [{}]. Will not proceed with rollback", version.toString());
return;
}
this.projectGitUpdater.revertChangesIfApplicable(project, changedVersion);
if (changedVersion.isRelease()) {
if (changedVersion.isRelease() && originalVersion.isSnapshot()) {
this.projectBuilder.bumpVersions(originalVersion.bumpedVersion());
this.projectGitUpdater.commitAfterBumpingVersions(project, originalVersion);
log.info("\nSuccessfully reverted the commit and bumped snapshot versions");

33
spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/ReleaserTests.java
View File

@@ -12,9 +12,12 @@ import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.cloud.release.internal.git.ProjectGitUpdater;
import org.springframework.cloud.release.internal.pom.ProjectPomUpdater;
import org.springframework.cloud.release.internal.pom.ProjectVersion;
import org.springframework.cloud.release.internal.project.ProjectBuilder;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.BDDMockito.then;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.never;
/**
* @author Marcin Grzejszczak
@@ -35,12 +38,30 @@ public class ReleaserTests {
}
@Test
public void rollbackReleaseVersion() throws Exception {
this.releaser.rollbackReleaseVersion(this.pom, null, null);
public void should_not_bump_versions_for_original_release_project() throws Exception {
this.releaser.rollbackReleaseVersion(this.pom,
new ProjectVersion("original", "1.0.0.RELEASE"),
new ProjectVersion("changed", "1.0.0.RELEASE"));
verifyZeroInteractions(this.projectPomUpdater);
verifyZeroInteractions(this.projectBuilder);
verifyZeroInteractions(this.projectGitUpdater);
then(this.projectBuilder).should(never()).bumpVersions(anyString());
}
@Test
public void should_not_bump_versions_for_original_snapshot_project_and_current_snapshot() throws Exception {
this.releaser.rollbackReleaseVersion(this.pom,
new ProjectVersion("original", "1.0.0.BUILD-SNAPSHOT"),
new ProjectVersion("changed", "1.0.0.BUILD-SNAPSHOT"));
then(this.projectBuilder).should(never()).bumpVersions(anyString());
}
@Test
public void should_bump_versions_for_original_snapshot_project() throws Exception {
this.releaser.rollbackReleaseVersion(this.pom,
new ProjectVersion("original", "1.0.0.BUILD-SNAPSHOT"),
new ProjectVersion("changed", "1.0.0.RELEASE"));
then(this.projectBuilder).should().bumpVersions(anyString());
}
}