From 0d9f73c7227cba8df0f41890f822dbfc093345b8 Mon Sep 17 00:00:00 2001 From: Aleksandr Mashchenko Date: Thu, 13 Oct 2022 21:55:22 +0300 Subject: [PATCH] 1.19.0 release --- CHANGELOG.md | 9 +++++++++ README.md | 8 +++++++- pom.xml | 2 +- .../maven/plugin/gitflow/AbstractGitFlowMojo.java | 3 ++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1aaef90..ee058323 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## v1.19.0 (2022-10-13) + +* Fixed snapshot checking with up-to-date project info - [#345](https://github.com/aleksandr-m/gitflow-maven-plugin/issues/345) +* Improved remote branch fetching comparing and checking out +* Added ability to update git submodules before commit - [#348](https://github.com/aleksandr-m/gitflow-maven-plugin/issues/348) +* Added tag push on hotfix if it isn't pushed with the branch - [#349](https://github.com/aleksandr-m/gitflow-maven-plugin/issues/349) +* Added fetching of remote release branch on hotfix-finish goal - [#318](https://github.com/aleksandr-m/gitflow-maven-plugin/issues/318) +* Added more logs for verbose mode - [#331](https://github.com/aleksandr-m/gitflow-maven-plugin/issues/331) + ## v1.18.0 (2022-02-20) ### Breaking changes diff --git a/README.md b/README.md index c185fe8f..14591e43 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The plugin is available from Maven Central. com.amashchenko.maven.plugin gitflow-maven-plugin - 1.18.0 + 1.19.0 @@ -81,6 +81,12 @@ mvn gitflow: -DargLine='-DprocessAllModules' ``` +# Git Submodules + +The plugin looks for the `.gitmodules` file and if it exists the `git submodule update` command will be executed before each Git commit. This is needed to avoid leaving working copy in dirty state which can happen when switching between branches. +To explicitly control whether Git submodules will be updated before commit the `updateGitSubmodules` parameter can be used. Setting it to `true` will enable Git submodules update and `false` will disable it even if `.gitmodules` file exists. The default value is not set, meaning the plugin tries to automatically determine if update is needed. + + # Eclipse Plugins build with Tycho Since version `1.1.0` this plugin supports Eclipse plugin projects which are build with [Tycho](https://eclipse.org/tycho/). diff --git a/pom.xml b/pom.xml index d584fc4b..87d1d19e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ gitflow-maven-plugin maven-plugin gitflow-maven-plugin - 1.18.1-SNAPSHOT + 1.19.0 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. diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java index faaf7f45..835aa49e 100644 --- a/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java +++ b/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java @@ -230,10 +230,11 @@ public abstract class AbstractGitFlowMojo extends AbstractMojo { private String gitPushOptions; /** - * Explicitly enable or disable executing submodule update before commit. By + * Explicitly enable or disable executing Git submodule update before commit. By * default plugin tries to automatically determine if update of the Git * submodules is needed. * + * @since 1.19.0 */ @Parameter(property = "updateGitSubmodules") private Boolean updateGitSubmodules;