This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch MRELEASE-1079
in repository https://gitbox.apache.org/repos/asf/maven-release.git
discard 1c6f2c3f [MRELEASE-1079] add edge case support: root pom inherits scm
discard 1d5a846a [MRELEASE-1079] first try fixing, even if it breaks some UTs
discard a58a0622 [MRELEASE-1079] new integration test
add dbdae87e Use System.lineSeparator()
add e4abd0ff Use class-based lookup
new e8acf3a6 [MRELEASE-1079] new integration test
new 6a6ac839 [MRELEASE-1079] restore test as it was before MRELEASE-998
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (1c6f2c3f)
\
N -- N -- N refs/heads/MRELEASE-1079 (6a6ac839)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../shared/release/config/ReleaseDescriptor.java | 11 ++++++++-
.../release/phase/AbstractRewritePomsPhase.java | 26 ++++++++++------------
.../release/phase/RewritePomVersionsPhase.java | 5 ++---
.../release/phase/RewritePomsForBranchPhase.java | 9 ++++----
.../phase/RewritePomsForDevelopmentPhase.java | 7 +++---
.../release/phase/RewritePomsForReleasePhase.java | 9 ++++----
.../src/main/mdo/release-descriptor.mdo | 14 ++++++++++--
.../release/phase/AbstractReleaseTestCase.java | 9 ++++----
.../phase/RewritePomsForReleasePhaseTest.java | 4 ++++
.../phase/ScmCommitPreparationPhaseTest.java | 6 ++---
10 files changed, 58 insertions(+), 42 deletions(-)
