From 022931033e6cbd00c930141d9135502858991d2d Mon Sep 17 00:00:00 2001 From: rfscholte Date: Sat, 10 Feb 2018 17:21:50 +0100 Subject: [PATCH] [MRELEASE-998] Add ability to create custom phases --- .../src/main/mdo/release-descriptor.mdo | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/maven-release-manager/src/main/mdo/release-descriptor.mdo b/maven-release-manager/src/main/mdo/release-descriptor.mdo index 44c83357..962e5a44 100644 --- a/maven-release-manager/src/main/mdo/release-descriptor.mdo +++ b/maven-release-manager/src/main/mdo/release-descriptor.mdo @@ -751,6 +751,7 @@ ModelloReleaseDescriptor that = (ModelloReleaseDescriptor) obj; +<<<<<<< HEAD if ( updateDependencies != that.isUpdateDependencies() || useReleaseProfile != that.isUseReleaseProfile() || autoVersionSubmodules != that.isAutoVersionSubmodules() || @@ -766,6 +767,23 @@ localCheckout != that.isLocalCheckout() || pushChanges != that.isPushChanges() || autoResolveSnapshotDependencies != that.autoResolveSnapshotDependencies || +======= + if ( updateDependencies != that.isUpdateDependencies() || + useReleaseProfile != that.isUseReleaseProfile() || + autoVersionSubmodules != that.isAutoVersionSubmodules() || + snapshotReleasePluginAllowed != that.isSnapshotReleasePluginAllowed() || + commitByProject != that.isCommitByProject() || + branchCreation != that.isBranchCreation() || + updateBranchVersions != that.isUpdateBranchVersions() || + updateWorkingCopyVersions != that.isUpdateWorkingCopyVersions() || + suppressCommitBeforeTagOrBranch != that.isSuppressCommitBeforeTagOrBranch() || + updateVersionsToSnapshot != that.isUpdateVersionsToSnapshot() || + allowTimestampedSnapshots != that.isAllowTimestampedSnapshots() || + remoteTagging != that.isRemoteTagging() || + localCheckout != that.isLocalCheckout() || + pushChanges != that.isPushChanges() || + autoResolveSnapshotDependencies != that.autoResolveSnapshotDependencies || +>>>>>>> [MRELEASE-998] Add ability to create custom phases autoResolveSnapshotDependenciesMode != that.autoResolveSnapshotDependenciesMode ) {