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/11/19 20:55:41 UTC
svn commit: r1411374 - in /maven/release/trunk/maven-release-manager/src:
main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
Author: rfscholte
Date: Mon Nov 19 19:55:40 2012
New Revision: 1411374
URL: http://svn.apache.org/viewvc?rev=1411374&view=rev
Log:
[MRELEASE-787] release:prepare-with-pom fails when suppressCommitBeforeTag is used (SVN)
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java?rev=1411374&r1=1411373&r2=1411374&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java Mon Nov 19 19:55:40 2012
@@ -129,7 +129,10 @@ public class GenerateReleasePomsPhase
simulate, result ) );
}
- addReleasePomsToScm( releaseDescriptor, releaseEnvironment, reactorProjects, simulate, result, releasePoms );
+ if ( !releaseDescriptor.isSuppressCommitBeforeTagOrBranch() )
+ {
+ addReleasePomsToScm( releaseDescriptor, releaseEnvironment, reactorProjects, simulate, result, releasePoms );
+ }
}
private File generateReleasePom( MavenProject project, ReleaseDescriptor releaseDescriptor,
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java?rev=1411374&r1=1411373&r2=1411374&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java Mon Nov 19 19:55:40 2012
@@ -91,6 +91,20 @@ public class GenerateReleasePomsPhaseTes
comparePomFiles( reactorProjects );
}
+ // MRELEASE-787
+ public void testSuppressCommitBeforeTagOrBranch() throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
+ ReleaseDescriptor config = new ReleaseDescriptor();
+ config.setGenerateReleasePoms( true );
+ config.setSuppressCommitBeforeTagOrBranch( true );
+ mapNextVersion( config, "groupId:artifactId" );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ verifyNoMoreInteractions( scmProviderMock );
+ }
+
/*
* @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#createDescriptorFromProjects(java.util.List)
*/