Author: rfscholte
Date: Sat Jun 16 23:04:51 2012
New Revision: 1351024
URL: http://svn.apache.org/viewvc?rev=1351024&view=rev
Log:
Remember initial suggested version, required to fix MRELEASE-269
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java?rev=1351024&r1=1351023&r2=1351024&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
Sat Jun 16 23:04:51 2012
@@ -262,12 +262,13 @@ public class MapVersionsPhase
if ( releaseDescriptor.isUpdateBranchVersions()
&& ( ArtifactUtils.isSnapshot(
project.getVersion() ) || releaseDescriptor.isUpdateVersionsToSnapshot() ) )
{
- nextVersion =
releaseVersionInfo.getSnapshotVersionString();
+ String suggestedVersion =
releaseVersionInfo.getSnapshotVersionString();
+
if ( !releaseVersionIsExplicit &&
releaseDescriptor.isInteractive() )
{
nextVersion = prompter.prompt(
"What is the branch version for \"" +
project.getName() + "\"? (" + projectId + ")",
- nextVersion );
+ suggestedVersion );
}
}
else
@@ -282,12 +283,13 @@ public class MapVersionsPhase
if ( ArtifactUtils.isSnapshot( project.getVersion() )
&& releaseDescriptor.isUpdateWorkingCopyVersions()
)
{
- nextVersion =
nextSnapshotVersionInfo.getSnapshotVersionString();
+ String suggestedVersion =
nextSnapshotVersionInfo.getSnapshotVersionString();
+
if ( releaseDescriptor.isInteractive() &&
!nextSnapshotVersionIsExplicit )
{
nextVersion =
prompter.prompt( "What is the new working
copy version for \"" + project.getName()
- + "\"? (" + projectId + ")",
nextVersion );
+ + "\"? (" + projectId + ")",
suggestedVersion );
}
}
else
@@ -300,12 +302,13 @@ public class MapVersionsPhase
{
if( releaseDescriptor.isUpdateWorkingCopyVersions() )
{
- nextVersion =
nextSnapshotVersionInfo.getSnapshotVersionString();
+ String suggestedVersion =
nextSnapshotVersionInfo.getSnapshotVersionString();
+
if ( releaseDescriptor.isInteractive() &&
!nextSnapshotVersionIsExplicit )
{
nextVersion =
prompter.prompt( "What is the new development
version for \"" + project.getName() + "\"? ("
- + projectId + ")", nextVersion );
+ + projectId + ")", suggestedVersion );
}
}
else
@@ -318,13 +321,13 @@ public class MapVersionsPhase
{
if ( ArtifactUtils.isSnapshot( project.getVersion() ) )
{
- nextVersion = releaseVersionInfo.getReleaseVersionString();
+ String suggestedVersion =
releaseVersionInfo.getReleaseVersionString();
if ( releaseDescriptor.isInteractive() &&
!releaseVersionIsExplicit )
{
nextVersion = prompter.prompt(
"What is the release version for \"" +
project.getName() + "\"? (" + projectId + ")",
- nextVersion );
+ suggestedVersion );
}
}
else
