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/12/01 20:08:42 UTC
svn commit: r1416042 - in /maven/release/trunk/maven-release-manager/src:
main/java/org/apache/maven/shared/release/phase/
test/java/org/apache/maven/shared/release/phase/
Author: rfscholte
Date: Sat Dec 1 19:08:41 2012
New Revision: 1416042
URL: http://svn.apache.org/viewvc?rev=1416042&view=rev
Log:
[MRELEASE-787] release:prepare-with-pom fails when suppressCommitBeforeTag is used (SVN)
Added:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhaseTest.java
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
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/AbstractScmCommitPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java?rev=1416042&r1=1416041&r2=1416042&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java Sat Dec 1 19:08:41 2012
@@ -198,7 +198,7 @@ public abstract class AbstractScmCommitP
pomFiles.add( ReleaseUtil.getStandardPom( project ) );
- if ( releaseDescriptor.isGenerateReleasePoms() )
+ if ( releaseDescriptor.isGenerateReleasePoms() && !releaseDescriptor.isSuppressCommitBeforeTagOrBranch() )
{
pomFiles.add( ReleaseUtil.getReleasePom( project ) );
}
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=1416042&r1=1416041&r2=1416042&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 Sat Dec 1 19:08:41 2012
@@ -129,10 +129,7 @@ public class GenerateReleasePomsPhase
simulate, result ) );
}
- if ( !releaseDescriptor.isSuppressCommitBeforeTagOrBranch() )
- {
- addReleasePomsToScm( releaseDescriptor, releaseEnvironment, reactorProjects, simulate, result, releasePoms );
- }
+ addReleasePomsToScm( releaseDescriptor, releaseEnvironment, reactorProjects, simulate, result, releasePoms );
}
private File generateReleasePom( MavenProject project, ReleaseDescriptor releaseDescriptor,
Added: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhaseTest.java?rev=1416042&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhaseTest.java (added)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhaseTest.java Sat Dec 1 19:08:41 2012
@@ -0,0 +1,98 @@
+package org.apache.maven.shared.release.phase;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.util.List;
+
+import org.apache.maven.model.Model;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.junit.Test;
+
+public class AbstractScmCommitPhaseTest
+{
+ @Test
+ public void testDefaultCreatePomFiles()
+ throws Exception
+ {
+ List<File> files =
+ AbstractScmCommitPhase.createPomFiles( new ReleaseDescriptor(),
+ createProject( "artifactId", "1.0-SNAPSHOT", new File( "pom.xml" ) ) );
+ assertEquals( "Number of created files", files.size(), 1 );
+ assertTrue( files.contains( new File( "pom.xml" ) ) );
+ }
+
+
+ @Test
+ public void testCreatePomFilesSuppressCommitBeforeTag()
+ throws Exception
+ {
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setSuppressCommitBeforeTagOrBranch( true );
+ List<File> files =
+ AbstractScmCommitPhase.createPomFiles( releaseDescriptor,
+ createProject( "artifactId", "1.0-SNAPSHOT", new File( "pom.xml" ) ) );
+ assertEquals( "Number of created files", files.size(), 1 );
+ assertTrue( files.contains( new File( "pom.xml" ) ) );
+ }
+
+ @Test
+ public void testCreatePomFilesWithReleasePom()
+ throws Exception
+ {
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setGenerateReleasePoms( true );
+ List<File> files =
+ AbstractScmCommitPhase.createPomFiles( releaseDescriptor,
+ createProject( "artifactId", "1.0-SNAPSHOT", new File( "pom.xml" ) ) );
+ assertEquals( "Number of created files", files.size(), 2 );
+ assertTrue( files.contains( new File( "pom.xml" ) ) );
+ assertTrue( files.contains( new File( "release-pom.xml" ) ) );
+ }
+
+ @Test
+ public void testCreatePomFilesWithReleasePomAndSuppressCommitBeforeTag()
+ throws Exception
+ {
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setGenerateReleasePoms( true );
+ releaseDescriptor.setSuppressCommitBeforeTagOrBranch( true );
+ List<File> files =
+ AbstractScmCommitPhase.createPomFiles( releaseDescriptor,
+ createProject( "artifactId", "1.0-SNAPSHOT", new File( "pom.xml" ) ) );
+ assertEquals( "Number of created files", files.size(), 1 );
+ assertTrue( files.contains( new File( "pom.xml" ) ) );
+ }
+
+ private static MavenProject createProject( String artifactId, String version, File file )
+ {
+ Model model = new Model();
+ model.setGroupId( "groupId" );
+ model.setArtifactId( artifactId );
+ model.setVersion( version );
+ MavenProject project = new MavenProject( model );
+ project.setFile( file );
+ return project;
+ }
+}
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=1416042&r1=1416041&r2=1416042&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 Sat Dec 1 19:08:41 2012
@@ -38,6 +38,7 @@ import org.apache.maven.project.MavenPro
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmFileStatus;
+import org.apache.maven.scm.ScmTagParameters;
import org.apache.maven.scm.command.add.AddScmResult;
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.manager.ScmManagerStub;
@@ -98,12 +99,32 @@ public class GenerateReleasePomsPhaseTes
ReleaseDescriptor config = new ReleaseDescriptor();
config.setGenerateReleasePoms( true );
config.setSuppressCommitBeforeTagOrBranch( true );
+ config.setRemoteTagging( false );
mapNextVersion( config, "groupId:artifactId" );
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ verify( scmProviderMock ).add( isA(ScmRepository.class), isA(ScmFileSet.class) );
verifyNoMoreInteractions( scmProviderMock );
}
+
+ public void testSuppressCommitBeforeTagOrBranchAndReomoteTagging() throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
+ ReleaseDescriptor config = new ReleaseDescriptor();
+ config.setGenerateReleasePoms( true );
+ config.setSuppressCommitBeforeTagOrBranch( true );
+ config.setRemoteTagging( true );
+ mapNextVersion( config, "groupId:artifactId" );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ verify( scmProviderMock ).add( isA(ScmRepository.class), isA(ScmFileSet.class) );
+
+ verifyNoMoreInteractions( scmProviderMock );
+ }
+
/*
* @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#createDescriptorFromProjects(java.util.List)