Merge with default

This commit is contained in:
Rene Pfeuffer
2020-02-17 11:29:03 +01:00
2 changed files with 7 additions and 1 deletions

View File

@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## Unreleased
### Fixed
- Modification for mercurial repositories with enabled XSRF protection
## 2.0.0-rc4 - 2020-02-14
### Added
- Support for Java versions > 8
- Simple ClassLoaderLifeCycle to fix integration tests on Java > 8
@@ -18,7 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Upgrade smp-maven-plugin to version 1.0.0-rc3
### Fixed
- Modification for mercurial repositories with enabled XSRF protection
- Committer of new Git commits set to "SCM-Manager <noreply@scm-manager.org>"
## 2.0.0-rc3 - 2020-01-31
### Fixed

View File

@@ -243,6 +243,7 @@ class AbstractGitCommand
if (!status.isClean() || isInMerge()) {
return of(clone.commit()
.setAuthor(authorToUse.getName(), authorToUse.getMail())
.setCommitter("SCM-Manager", "noreply@scm-manager.org")
.setMessage(message)
.call());
} else {