Skip to content

Commit 3b90ffd

Browse files
committed
1.17.0 release
1 parent 54d31d9 commit 3b90ffd

File tree

5 files changed

+27
-10
lines changed

5 files changed

+27
-10
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## v1.17.0 (2021-12-07)
4+
5+
* Fixed and improved error messages in `feature-start` goal - [#306](https://github.com/aleksandr-m/gitflow-maven-plugin/issues/306)
6+
* Added ability to use different commit message on feature squash - [#287](https://github.com/aleksandr-m/gitflow-maven-plugin/issues/287)
7+
* Added ability to increment different digit in hotfix version - [#186](https://github.com/aleksandr-m/gitflow-maven-plugin/issues/186)
8+
* Added ability to disable update of `project.build.outputTimestamp` property - [#310](https://github.com/aleksandr-m/gitflow-maven-plugin/pull/310)
9+
* Added support to automatically use Maven wrapper for internal commands - [#246](https://github.com/aleksandr-m/gitflow-maven-plugin/pull/246)
10+
* Added ability to use `gitFlowConfig` and `commitMessages` properties from the command line - [#284](https://github.com/aleksandr-m/gitflow-maven-plugin/issues/284)
11+
312
## v1.16.0 (2021-03-23)
413

514
* Fixed wrong incrementing of feature name - [#288](https://github.com/aleksandr-m/gitflow-maven-plugin/issues/288)

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The plugin is available from Maven Central.
2323
<plugin>
2424
<groupId>com.amashchenko.maven.plugin</groupId>
2525
<artifactId>gitflow-maven-plugin</artifactId>
26-
<version>1.16.0</version>
26+
<version>1.17.0</version>
2727
<configuration>
2828
<!-- optional configuration -->
2929
</configuration>
@@ -61,6 +61,9 @@ To configure this plugin to use single branch model, such as GitHub Flow, just s
6161

6262
That's it!
6363

64+
# Maven Wrapper support
65+
66+
The plugin will automatically use Maven Wrapper for internal Maven goals if plugin is started with the wrapper.
6467

6568
# Eclipse Plugins build with Tycho
6669

@@ -168,6 +171,7 @@ Since `1.2.1` commit messages can be changed in plugin's configuration section i
168171
<releaseFinishDevMergeMessage></releaseFinishDevMergeMessage>
169172

170173
<featureFinishDevMergeMessage></featureFinishDevMergeMessage>
174+
<featureSquashMessage></featureSquashMessage>
171175

172176
<hotfixFinishMergeMessage></hotfixFinishMergeMessage>
173177
<hotfixFinishDevMergeMessage></hotfixFinishDevMergeMessage>
@@ -272,6 +276,8 @@ The `gitflow:hotfix-finish` goal supports the parameter `skipMergeDevBranch` whi
272276

273277
The `gitflow:hotfix-finish` goal supports the parameter `skipMergeProdBranch` which prevents merging the hotfix branch into the production branch and deletes the hotfix branch leaving only the tagged commit. Useful, along with `skipMergeDevBranch`, to allow hotfixes to very old code that are not applicable to current development.
274278

279+
The `gitflow:hotfix-start` goal has `hotfixVersionDigitToIncrement` parameter which controls which digit to increment in the hotfix version. Starts from zero.
280+
275281
Version update of all modules ignoring groupId and artifactId can be forced by setting `versionsForceUpdate` parameter to `true`. The default value is `false`.
276282

277283
### Remote interaction

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<artifactId>gitflow-maven-plugin</artifactId>
2222
<packaging>maven-plugin</packaging>
2323
<name>gitflow-maven-plugin</name>
24-
<version>1.16.1-SNAPSHOT</version>
24+
<version>1.17.0</version>
2525

2626
<description>The Git-Flow Maven Plugin supports various Git workflows, including Vincent Driessen's successful Git branching model and GitHub Flow. This plugin runs Git and Maven commands from the command line. Supports Eclipse Plugins build with Tycho.</description>
2727

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,15 @@ public abstract class AbstractGitFlowMojo extends AbstractMojo {
166166
@Parameter(property = "commitMessagePrefix")
167167
private String commitMessagePrefix;
168168

169+
/**
170+
* Whether to update the <code>project.build.outputTimestamp</code> property
171+
* automatically or not.
172+
*
173+
* @since 1.17.0
174+
*/
175+
@Parameter(property = "updateOutputTimestamp", defaultValue = "true")
176+
private boolean updateOutputTimestamp = true;
177+
169178
/**
170179
* The path to the Maven executable. Defaults to "mvn".
171180
*/
@@ -181,14 +190,6 @@ public abstract class AbstractGitFlowMojo extends AbstractMojo {
181190
@Parameter(defaultValue = "${session}", readonly = true)
182191
protected MavenSession mavenSession;
183192

184-
/**
185-
* Whether to update the <code>project.build.outputTimestamp</code> property automatically or not.
186-
*
187-
* @since 1.16.1
188-
*/
189-
@Parameter(property = "updateOutputTimestamp", defaultValue = "true")
190-
private boolean updateOutputTimestamp = true;
191-
192193
@Component
193194
protected ProjectBuilder projectBuilder;
194195

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ public class GitFlowHotfixStartMojo extends AbstractGitFlowMojo {
7474
/**
7575
* Which digit to increment in the next hotfix version. Starts from zero.
7676
*
77+
* @since 1.17.0
7778
*/
7879
@Parameter(property = "hotfixVersionDigitToIncrement")
7980
private Integer hotfixVersionDigitToIncrement;

0 commit comments

Comments
 (0)