diff --git a/README.md b/README.md index dc9724f1d7dea94f535ca2686ad6791a933041f9..b485b743b5a72c77f22ad1e2274a2b2ef09e616d 100644 --- a/README.md +++ b/README.md @@ -179,7 +179,9 @@ They are bound to the `publish` stage, and use the following variables: | `MAVEN_DEPLOY_FROM_UNPROTECTED_DISABLED`| Set to `true` to limit snapshot publication to protected branches | _none_ (disabled) | | `MAVEN_DEPLOY_ARGS` | Maven arguments for the `mvn-deploy` job | `deploy -Dmaven.test.skip=true` | | `MAVEN_RELEASE_ARGS` | Maven arguments for the `mvn-release` job | `release:prepare -DtagNameFormat=@{project.version} -Darguments=-Dmaven.test.skip=true` | -| `MAVEN_RELEASE_SCM_COMMENT_PREFIX` | Maven release plugin [scmCommentPrefix](https://maven.apache.org/maven-release/maven-release-plugin/prepare-mojo.html#scmCommentPrefix) parameter | `chore(maven-release): ` | +| `MAVEN_RELEASE_SCM_COMMENT_PREFIX` | Maven release plugin [scmCommentPrefix](https://maven.apache.org/maven-release/maven-release-plugin/prepare-mojo.html#scmCommentPrefix) parameter | `chore(maven-release): ` | +| `MAVEN_RELEASE_SCM_RELEASE_COMMENT` | Maven release plugin [scmReleaseCommitComment](https://maven.apache.org/maven-release/maven-release-plugin/prepare-mojo.html#scmReleaseCommitComment) parameter (since Maven `3.0.0-M1`) | _none_ (Maven default) | +| `MAVEN_RELEASE_SCM_DEV_COMMENT` | Maven release plugin [scmDevelopmentCommitComment](https://maven.apache.org/maven-release/maven-release-plugin/prepare-mojo.html#scmDevelopmentCommitComment) parameter (since Maven `3.0.0-M1`) | _none_ (Maven default) | | `MVN_SEMREL_RELEASE_DISABLED` | Set to `true` to disable [semantic-release integration](#semantic-release-integration) | _none_ (disabled) | More info: diff --git a/kicker.json b/kicker.json index 3f04db8ad73211952b851bd58dcf2e6772004f09..22e1460ebf211b75dcbb2f530672ba42270cff21 100644 --- a/kicker.json +++ b/kicker.json @@ -150,6 +150,16 @@ "default": "chore(maven-release): ", "advanced": true }, + { + "name": "MAVEN_RELEASE_SCM_RELEASE_COMMENT", + "description": "Maven release plugin [scmReleaseCommitComment](https://maven.apache.org/maven-release/maven-release-plugin/prepare-mojo.html#scmReleaseCommitComment) parameter\n\n(since Maven `3.0.0-M1`)", + "advanced": true + }, + { + "name": "MAVEN_RELEASE_SCM_DEV_COMMENT", + "description": "Maven release plugin [scmDevelopmentCommitComment](https://maven.apache.org/maven-release/maven-release-plugin/prepare-mojo.html#scmDevelopmentCommitComment) parameter\n\n(since Maven `3.0.0-M1`)", + "advanced": true + }, { "name": "MVN_SEMREL_RELEASE_DISABLED", "description": "Disable semantic-release integration", diff --git a/templates/gitlab-ci-maven.yml b/templates/gitlab-ci-maven.yml index 9c19ca8dcd9083cb30d54eb08dabf8b8402f3bf9..23e22918cde236650bcbe6bb63dc8f2756a159f0 100644 --- a/templates/gitlab-ci-maven.yml +++ b/templates/gitlab-ci-maven.yml @@ -564,7 +564,13 @@ mvn-release: semrel_args="-DreleaseVersion=${SEMREL_INFO_NEXT_VERSION}" fi fi - - mvn ${TRACE+-X} $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args $scm_auth_args ${MAVEN_RELEASE_ARGS} ${semrel_args} -DscmCommentPrefix="$MAVEN_RELEASE_SCM_COMMENT_PREFIX" + - >- + mvn ${TRACE+-X} $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args + ${scm_auth_args} ${semrel_args} + ${MAVEN_RELEASE_SCM_COMMENT_PREFIX+-DscmCommentPrefix="$MAVEN_RELEASE_SCM_COMMENT_PREFIX"} + ${MAVEN_RELEASE_SCM_RELEASE_COMMENT+-DscmReleaseCommitComment="$MAVEN_RELEASE_SCM_RELEASE_COMMENT"} + ${MAVEN_RELEASE_SCM_DEV_COMMENT+-DscmDevelopmentCommitComment="$MAVEN_RELEASE_SCM_DEV_COMMENT"} + ${MAVEN_RELEASE_ARGS} rules: # exclude if $MAVEN_DEPLOY_ENABLED not set - if: '$MAVEN_DEPLOY_ENABLED != "true"'