Author: olamy Date: Tue Feb 1 09:19:37 2011 New Revision: 1065954 URL: http://svn.apache.org/viewvc?rev=1065954&view=rev Log: [MRELEASE-641] upgrade to scm 1.5 (hg plugin insists on 'pushing')
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java maven/release/trunk/pom.xml 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=1065954&r1=1065953&r2=1065954&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 Tue Feb 1 09:19:37 2011 @@ -28,7 +28,9 @@ import java.util.List; import org.apache.maven.Maven; import org.apache.maven.project.MavenProject; +import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileSet; +import org.apache.maven.scm.ScmFileStatus; import org.apache.maven.scm.command.add.AddScmResult; import org.apache.maven.scm.manager.ScmManager; import org.apache.maven.scm.manager.ScmManagerStub; @@ -124,9 +126,15 @@ public class GenerateReleasePomsPhaseTes Constraint[] arguments = new Constraint[] { new IsAnything(), new IsScmFileSetEquals( fileSet ) }; - scmProviderMock.expects( new InvokeOnceMatcher() ).method( "add" ).with( arguments ).will( - new ReturnStub( new AddScmResult( "...", Collections.singletonList( Maven.RELEASE_POMv4 ) ) ) ); + scmProviderMock + .expects( new InvokeOnceMatcher() ) + .method( "add" ) + .with( arguments ) + .will( new ReturnStub( new AddScmResult( "...", Collections + .singletonList( new ScmFile( Maven.RELEASE_POMv4, ScmFileStatus.ADDED ) ) ) ) ); + + ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java?rev=1065954&r1=1065953&r2=1065954&view=diff ============================================================================== --- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java (original) +++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java Tue Feb 1 09:19:37 2011 @@ -21,7 +21,9 @@ package org.apache.maven.shared.release. import org.apache.maven.Maven; import org.apache.maven.project.MavenProject; +import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileSet; +import org.apache.maven.scm.ScmFileStatus; import org.apache.maven.scm.command.remove.RemoveScmResult; import org.apache.maven.scm.manager.ScmManager; import org.apache.maven.scm.manager.ScmManagerStub; @@ -70,9 +72,15 @@ public class RemoveReleasePomsPhaseTest Mock scmProviderMock = new Mock( ScmProvider.class ); Constraint[] arguments = new Constraint[] { new IsAnything(), new IsScmFileSetEquals( fileSet ), new IsAnything() }; - scmProviderMock.expects( new InvokeOnceMatcher() ).method( "remove" ).with( arguments ).will( - new ReturnStub( new RemoveScmResult( "...", Collections.singletonList( Maven.RELEASE_POMv4 ) ) ) ); + scmProviderMock + .expects( new InvokeOnceMatcher() ) + .method( "remove" ) + .with( arguments ) + .will( new ReturnStub( new RemoveScmResult( "...", Collections + .singletonList( new ScmFile( Maven.RELEASE_POMv4, ScmFileStatus.DELETED ) ) ) ) ); + + ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); @@ -99,8 +107,12 @@ public class RemoveReleasePomsPhaseTest Mock scmProviderMock = new Mock( ScmProvider.class ); Constraint[] arguments = new Constraint[] { new IsAnything(), new IsScmFileSetEquals( fileSet ), new IsAnything() }; - scmProviderMock.expects( new InvokeOnceMatcher() ).method( "remove" ).with( arguments ).will( - new ReturnStub( new RemoveScmResult( "...", Collections.singletonList( Maven.RELEASE_POMv4 ) ) ) ); + scmProviderMock + .expects( new InvokeOnceMatcher() ) + .method( "remove" ) + .with( arguments ) + .will( new ReturnStub( new RemoveScmResult( "...", Collections + .singletonList( new ScmFile( Maven.RELEASE_POMv4, ScmFileStatus.DELETED ) ) ) ) ); ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java?rev=1065954&r1=1065953&r2=1065954&view=diff ============================================================================== --- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java (original) +++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java Tue Feb 1 09:19:37 2011 @@ -19,8 +19,13 @@ package org.apache.maven.shared.release. * under the License. */ +import java.util.Collections; +import java.util.List; + import org.apache.maven.project.MavenProject; +import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileSet; +import org.apache.maven.scm.ScmFileStatus; import org.apache.maven.scm.command.checkin.CheckInScmResult; import org.apache.maven.scm.manager.ScmManager; import org.apache.maven.scm.manager.ScmManagerStub; @@ -37,9 +42,6 @@ import org.jmock.core.matcher.InvokeOnce import org.jmock.core.matcher.TestFailureMatcher; import org.jmock.core.stub.ReturnStub; -import java.util.Collections; -import java.util.List; - /** * Test the SCM development commit phase. * @@ -125,9 +127,15 @@ public class ScmCommitDevelopmentPhaseTe Mock scmProviderMock = new Mock( ScmProvider.class ); Constraint[] arguments = new Constraint[]{new IsAnything(), new IsScmFileSetEquals( fileSet ), new IsNull(), new IsEqual( message )}; - scmProviderMock.expects( new InvokeOnceMatcher() ).method( "checkIn" ).with( arguments ).will( new ReturnStub( - new CheckInScmResult( "...", Collections.singletonList( rootProject.getFile() ) ) ) ); + scmProviderMock + .expects( new InvokeOnceMatcher() ) + .method( "checkIn" ) + .with( arguments ) + .will( new ReturnStub( new CheckInScmResult( "...", Collections.singletonList( new ScmFile( rootProject + .getFile().getPath(), ScmFileStatus.CHECKED_IN ) ) ) ) ); + + ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); } Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java?rev=1065954&r1=1065953&r2=1065954&view=diff ============================================================================== --- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java (original) +++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java Tue Feb 1 09:19:37 2011 @@ -21,7 +21,9 @@ package org.apache.maven.shared.release. import org.apache.maven.project.MavenProject; import org.apache.maven.scm.ScmException; +import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileSet; +import org.apache.maven.scm.ScmFileStatus; import org.apache.maven.scm.command.checkin.CheckInScmResult; import org.apache.maven.scm.manager.NoSuchScmProviderException; import org.apache.maven.scm.manager.ScmManager; @@ -100,9 +102,15 @@ public class ScmCommitPreparationPhaseTe Mock scmProviderMock = new Mock( ScmProvider.class ); Constraint[] arguments = new Constraint[]{new IsAnything(), new IsScmFileSetEquals( fileSet ), new IsNull(), new IsEqual( PREFIX + "release-label" )}; - scmProviderMock.expects( new InvokeOnceMatcher() ).method( "checkIn" ).with( arguments ).will( new ReturnStub( - new CheckInScmResult( "...", Collections.singletonList( rootProject.getFile() ) ) ) ); + scmProviderMock + .expects( new InvokeOnceMatcher() ) + .method( "checkIn" ) + .with( arguments ) + .will( new ReturnStub( new CheckInScmResult( "...", Collections.singletonList( new ScmFile( rootProject + .getFile().getPath(), ScmFileStatus.CHECKED_IN ) ) ) ) ); + + ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); @@ -133,8 +141,12 @@ public class ScmCommitPreparationPhaseTe Mock scmProviderMock = new Mock( ScmProvider.class ); Constraint[] arguments = new Constraint[]{new IsAnything(), new IsScmFileSetEquals( fileSet ), new IsNull(), new IsEqual( PREFIX + "release-label" )}; - scmProviderMock.expects( new InvokeOnceMatcher() ).method( "checkIn" ).with( arguments ).will( new ReturnStub( - new CheckInScmResult( "...", Collections.singletonList( rootProject.getFile() ) ) ) ); + scmProviderMock + .expects( new InvokeOnceMatcher() ) + .method( "checkIn" ) + .with( arguments ) + .will( new ReturnStub( new CheckInScmResult( "...", Collections.singletonList( new ScmFile( rootProject + .getFile().getPath(), ScmFileStatus.CHECKED_IN ) ) ) ) ); ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); @@ -161,8 +173,12 @@ public class ScmCommitPreparationPhaseTe Mock scmProviderMock = new Mock( ScmProvider.class ); Constraint[] arguments = new Constraint[]{new IsAnything(), new IsScmFileSetEquals( fileSet ), new IsNull(), new IsEqual( "[maven-release-manager] prepare for next development iteration" )}; - scmProviderMock.expects( new InvokeOnceMatcher() ).method( "checkIn" ).with( arguments ).will( new ReturnStub( - new CheckInScmResult( "...", Collections.singletonList( rootProject.getFile() ) ) ) ); + scmProviderMock + .expects( new InvokeOnceMatcher() ) + .method( "checkIn" ) + .with( arguments ) + .will( new ReturnStub( new CheckInScmResult( "...", Collections.singletonList( new ScmFile( rootProject + .getFile().getPath(), ScmFileStatus.CHECKED_IN ) ) ) ) ); ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); @@ -208,8 +224,12 @@ public class ScmCommitPreparationPhaseTe Mock scmProviderMock = new Mock( ScmProvider.class ); Constraint[] arguments = new Constraint[]{new IsAnything(), new IsScmFileSetEquals( fileSet ), new IsNull(), new IsEqual( PREFIX + "release-label" )}; - scmProviderMock.expects( new InvokeOnceMatcher() ).method( "checkIn" ).with( arguments ).will( new ReturnStub( - new CheckInScmResult( "...", Collections.singletonList( rootProject.getFile() ) ) ) ); + scmProviderMock + .expects( new InvokeOnceMatcher() ) + .method( "checkIn" ) + .with( arguments ) + .will( new ReturnStub( new CheckInScmResult( "...", Collections.singletonList( new ScmFile( rootProject + .getFile().getPath(), ScmFileStatus.CHECKED_IN ) ) ) ) ); ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java?rev=1065954&r1=1065953&r2=1065954&view=diff ============================================================================== --- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java (original) +++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java Tue Feb 1 09:19:37 2011 @@ -24,7 +24,9 @@ import java.util.List; import org.apache.maven.project.MavenProject; import org.apache.maven.scm.ScmException; +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.tag.TagScmResult; import org.apache.maven.scm.manager.NoSuchScmProviderException; @@ -86,8 +88,12 @@ public class ScmTagPhaseTest Constraint[] arguments = new Constraint[]{new IsAnything(), new IsScmFileSetEquals( fileSet ), new IsEqual( "release-label" ), new IsScmTagParamtersEquals( new ScmTagParameters( "[my prefix] copy for tag release-label" ) )}; - scmProviderMock.expects( new InvokeOnceMatcher() ).method( "tag" ).with( arguments ).will( - new ReturnStub( new TagScmResult( "...", Collections.singletonList( rootProject.getFile() ) ) ) ); + scmProviderMock + .expects( new InvokeOnceMatcher() ) + .method( "tag" ) + .with( arguments ) + .will( new ReturnStub( new TagScmResult( "...", Collections.singletonList( new ScmFile( rootProject + .getFile().getPath(), ScmFileStatus.TAGGED ) ) ) ) ); ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); @@ -120,8 +126,12 @@ public class ScmTagPhaseTest Constraint[] arguments = new Constraint[]{new IsEqual( repository ), new IsScmFileSetEquals( fileSet ), new IsEqual( "release-label" ), new IsScmTagParamtersEquals( new ScmTagParameters( "[my prefix] copy for tag release-label" ) )}; - scmProviderMock.expects( new InvokeOnceMatcher() ).method( "tag" ).with( arguments ).will( - new ReturnStub( new TagScmResult( "...", Collections.singletonList( rootProject.getFile() ) ) ) ); + scmProviderMock + .expects( new InvokeOnceMatcher() ) + .method( "tag" ) + .with( arguments ) + .will( new ReturnStub( new TagScmResult( "...", Collections.singletonList( new ScmFile( rootProject + .getFile().getPath(), ScmFileStatus.TAGGED ) ) ) ) ); ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); @@ -152,8 +162,12 @@ public class ScmTagPhaseTest Constraint[] arguments = new Constraint[]{new IsEqual( repository ), new IsScmFileSetEquals( fileSet ), new IsEqual( "release-label" ), new IsScmTagParamtersEquals( new ScmTagParameters( "[my prefix] copy for tag release-label" ) )}; - scmProviderMock.expects( new InvokeOnceMatcher() ).method( "tag" ).with( arguments ).will( - new ReturnStub( new TagScmResult( "...", Collections.singletonList( rootProject.getFile() ) ) ) ); + scmProviderMock + .expects( new InvokeOnceMatcher() ) + .method( "tag" ) + .with( arguments ) + .will( new ReturnStub( new TagScmResult( "...", Collections.singletonList( new ScmFile( rootProject + .getFile().getPath(), ScmFileStatus.TAGGED ) ) ) ) ); ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); @@ -179,8 +193,12 @@ public class ScmTagPhaseTest Constraint[] arguments = new Constraint[]{new IsAnything(), new IsScmFileSetEquals( fileSet ), new IsEqual( "release-label" ), new IsScmTagParamtersEquals( new ScmTagParameters( "[my prefix] copy for tag release-label" ) )}; - scmProviderMock.expects( new InvokeOnceMatcher() ).method( "tag" ).with( arguments ).will( - new ReturnStub( new TagScmResult( "...", Collections.singletonList( rootProject.getFile() ) ) ) ); + scmProviderMock + .expects( new InvokeOnceMatcher() ) + .method( "tag" ) + .with( arguments ) + .will( new ReturnStub( new TagScmResult( "...", Collections.singletonList( new ScmFile( rootProject + .getFile().getPath(), ScmFileStatus.TAGGED ) ) ) ) ); ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); Modified: maven/release/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1065954&r1=1065953&r2=1065954&view=diff ============================================================================== --- maven/release/trunk/pom.xml (original) +++ maven/release/trunk/pom.xml Tue Feb 1 09:19:37 2011 @@ -124,7 +124,7 @@ </issueManagement> <properties> - <scmVersion>1.4</scmVersion> + <scmVersion>1.5-SNAPSHOT</scmVersion> <mavenPluginPluginVersion>2.6</mavenPluginPluginVersion> <mavenVersion>2.0.9</mavenVersion> </properties>