You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2012/06/08 22:15:30 UTC
svn commit: r1348226 - in /maven/release/trunk/maven-release-manager/src:
main/java/org/apache/maven/shared/release/phase/
test/java/org/apache/maven/shared/release/phase/
test/resources/org/apache/maven/shared/release/phase/
Author: rfscholte
Date: Fri Jun 8 20:15:29 2012
New Revision: 1348226
URL: http://svn.apache.org/viewvc?rev=1348226&view=rev
Log:
MRELEASE-760: unittest contributed by Antonio Petrelli
Code for branchVersion and developmentVersion is now in sync.
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/resources/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.xml
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=1348226&r1=1348225&r2=1348226&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 Fri Jun 8 20:15:29 2012
@@ -298,14 +298,17 @@ public class MapVersionsPhase
}
else
{
- nextVersion = nextSnapshotVersionInfo.getSnapshotVersionString();
- if ( releaseDescriptor.isInteractive() && !nextSnapshotVersionIsExplicit )
+ if( releaseDescriptor.isUpdateWorkingCopyVersions() )
{
- nextVersion =
- prompter.prompt( "What is the new development version for \"" + project.getName() + "\"? ("
- + projectId + ")", nextVersion );
+ nextVersion = nextSnapshotVersionInfo.getSnapshotVersionString();
+ if ( releaseDescriptor.isInteractive() && !nextSnapshotVersionIsExplicit )
+ {
+ nextVersion =
+ prompter.prompt( "What is the new development version for \"" + project.getName() + "\"? ("
+ + projectId + ")", nextVersion );
+ }
}
- else if ( !releaseDescriptor.isUpdateWorkingCopyVersions() )
+ else
{
nextVersion = project.getVersion();
}
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java?rev=1348226&r1=1348225&r2=1348226&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java Fri Jun 8 20:15:29 2012
@@ -273,6 +273,45 @@ public class MapVersionsPhaseTest
verifyNoMoreInteractions( mockPrompter );
}
+ /**
+ * MRELEASE-760: updateWorkingCopyVersions=false still bumps up pom versions to next development version
+ */
+ public void testMapDevVersionsInteractiveDoNotUpdateWorkingCopy()
+ throws Exception
+ {
+ // prepare
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, "test-map-development-versions" );
+ MavenProject project = createProject( "artifactId", "1.0" );
+
+ Prompter mockPrompter = mock( Prompter.class );
+ phase.setPrompter( mockPrompter );
+
+ List<MavenProject> reactorProjects = Collections.singletonList( project );
+
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setUpdateWorkingCopyVersions( false );
+
+ // execute
+ phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
+
+ // verify
+ assertEquals( "Check mapped versions", Collections.singletonMap( "groupId:artifactId", "1.0" ),
+ releaseDescriptor.getDevelopmentVersions() );
+
+ // prepare
+ releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setUpdateWorkingCopyVersions( false );
+
+ // execute
+ phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
+
+ // verify
+ assertEquals( "Check mapped versions", Collections.singletonMap( "groupId:artifactId", "1.0" ),
+ releaseDescriptor.getDevelopmentVersions() );
+
+ verifyNoMoreInteractions( mockPrompter );
+ }
+
public void testMapDevVersionsNonInteractive()
throws Exception
{
Modified: maven/release/trunk/maven-release-manager/src/test/resources/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.xml?rev=1348226&r1=1348225&r2=1348226&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.xml Fri Jun 8 20:15:29 2012
@@ -35,6 +35,15 @@
<convertToSnapshot>false</convertToSnapshot>
</configuration>
</component>
+ <component>
+ <role>org.apache.maven.shared.release.phase.ReleasePhase</role>
+ <role-hint>test-map-branch-versions</role-hint>
+ <implementation>org.apache.maven.shared.release.phase.MapVersionsPhase</implementation>
+ <configuration>
+ <convertToSnapshot>true</convertToSnapshot>
+ <convertToBranch>true</convertToBranch>
+ </configuration>
+ </component>
<!-- Turn off info messages -->
<component>
<role>org.codehaus.plexus.logging.LoggerManager</role>