Skip to content

Commit 45547b5

Browse files
committed
make compatible with lastest master branch
1 parent 1c97e42 commit 45547b5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowFeatureFinishMojo.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,9 @@ public void execute() throws MojoExecutionException, MojoFailureException {
167167
if (incrementVersionAtFinish) {
168168
// prevent incrementing feature name which can hold numbers
169169
String ver = featureVersion.replaceFirst("-" + featName, "");
170-
GitFlowVersionInfo nextVersionInfo = new GitFlowVersionInfo(ver);
170+
GitFlowVersionInfo nextVersionInfo = new GitFlowVersionInfo(ver, getVersionPolicy());
171171
ver = nextVersionInfo.nextSnapshotVersion();
172-
GitFlowVersionInfo featureVersionInfo = new GitFlowVersionInfo(ver);
172+
GitFlowVersionInfo featureVersionInfo = new GitFlowVersionInfo(ver, getVersionPolicy());
173173
featureVersion = featureVersionInfo.featureVersion(featName);
174174

175175
mvnSetVersions(featureVersion);

src/test/java/com/amashchenko/maven/plugin/gitflow/NextHotfixVersionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,6 @@ public static Collection<Object[]> data() {
6363

6464
@Test
6565
public void testNextSnapshotVersion() throws Exception {
66-
Assert.assertEquals(expectedVersion, new GitFlowVersionInfo(version).hotfixVersion(false, index));
66+
Assert.assertEquals(expectedVersion, new GitFlowVersionInfo(version, null).hotfixVersion(false, index));
6767
}
6868
}

0 commit comments

Comments
 (0)