Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java?rev=671288&r1=671287&r2=671288&view=diff ============================================================================== --- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java (original) +++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java Tue Jun 24 11:36:49 2008 @@ -32,6 +32,7 @@ import org.apache.maven.shared.release.ReleaseExecutionException; import org.apache.maven.shared.release.ReleaseFailureException; import org.apache.maven.shared.release.config.ReleaseDescriptor; +import org.apache.maven.shared.release.env.DefaultReleaseEnvironment; import org.apache.maven.shared.release.scm.DefaultScmRepositoryConfigurator; import org.apache.maven.shared.release.scm.ReleaseScmCommandException; import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException; @@ -84,7 +85,7 @@ try { - phase.execute( releaseDescriptor, null, null ); + phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null ); fail( "Status check should have failed" ); } @@ -95,7 +96,7 @@ try { - phase.simulate( releaseDescriptor, null, null ); + phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null ); fail( "Status check should have failed" ); } @@ -123,7 +124,7 @@ try { - phase.execute( releaseDescriptor, null, null ); + phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null ); fail( "Status check should have failed" ); } @@ -134,7 +135,7 @@ try { - phase.simulate( releaseDescriptor, null, null ); + phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null ); fail( "Status check should have failed" ); } @@ -160,7 +161,7 @@ try { - phase.execute( releaseDescriptor, null, null ); + phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null ); fail( "Status check should have failed" ); } @@ -171,7 +172,7 @@ try { - phase.simulate( releaseDescriptor, null, null ); + phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null ); fail( "Status check should have failed" ); } @@ -194,7 +195,7 @@ try { - phase.execute( releaseDescriptor, null, null ); + phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null ); fail( "Status check should have failed" ); } @@ -205,7 +206,7 @@ try { - phase.simulate( releaseDescriptor, null, null ); + phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null ); fail( "Status check should have failed" ); } @@ -222,9 +223,9 @@ setChangedFiles( releaseDescriptor, Collections.EMPTY_LIST ); - phase.execute( releaseDescriptor, null, null ); + phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null ); - phase.simulate( releaseDescriptor, null, null ); + phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null ); // successful execution is verification enough assertTrue( true ); @@ -238,9 +239,9 @@ setChangedFiles( releaseDescriptor, Arrays.asList( new String[] { "release.properties", "pom.xml.backup", "pom.xml.tag", "pom.xml.next" } ) ); - phase.execute( releaseDescriptor, null, null ); + phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null ); - phase.simulate( releaseDescriptor, null, null ); + phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null ); // successful execution is verification enough assertTrue( true ); @@ -255,7 +256,7 @@ try { - phase.execute( releaseDescriptor, null, null ); + phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null ); fail( "Status check should have failed" ); } @@ -266,7 +267,7 @@ try { - phase.simulate( releaseDescriptor, null, null ); + phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null ); fail( "Status check should have failed" ); } @@ -285,7 +286,7 @@ try { - phase.execute( releaseDescriptor, null, null ); + phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null ); fail( "Status check should have failed" ); } @@ -296,7 +297,7 @@ try { - phase.simulate( releaseDescriptor, null, null ); + phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null ); fail( "Status check should have failed" ); } @@ -316,7 +317,7 @@ try { - phase.execute( releaseDescriptor, null, null ); + phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null ); fail( "Status check should have failed" ); } @@ -327,7 +328,7 @@ try { - phase.simulate( releaseDescriptor, null, null ); + phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null ); fail( "Status check should have failed" ); }
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPhaseTest.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPhaseTest.java?rev=671288&r1=671287&r2=671288&view=diff ============================================================================== --- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPhaseTest.java (original) +++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPhaseTest.java Tue Jun 24 11:36:49 2008 @@ -32,6 +32,7 @@ import org.apache.maven.shared.release.ReleaseExecutionException; import org.apache.maven.shared.release.ReleaseFailureException; import org.apache.maven.shared.release.config.ReleaseDescriptor; +import org.apache.maven.shared.release.env.DefaultReleaseEnvironment; import org.apache.maven.shared.release.scm.DefaultScmRepositoryConfigurator; import org.apache.maven.shared.release.scm.ReleaseScmCommandException; import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException; @@ -94,7 +95,7 @@ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); - phase.execute( descriptor, null, reactorProjects ); + phase.execute( descriptor, new DefaultReleaseEnvironment(), reactorProjects ); assertTrue( true ); } @@ -127,7 +128,7 @@ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); - phase.execute( descriptor, null, reactorProjects ); + phase.execute( descriptor, new DefaultReleaseEnvironment(), reactorProjects ); assertTrue( true ); } @@ -155,7 +156,7 @@ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); - phase.execute( descriptor, null, reactorProjects ); + phase.execute( descriptor, new DefaultReleaseEnvironment(), reactorProjects ); assertTrue( true ); } @@ -168,7 +169,7 @@ try { - phase.execute( descriptor, null, reactorProjects ); + phase.execute( descriptor, new DefaultReleaseEnvironment(), reactorProjects ); fail( "Should have thrown an exception" ); } catch ( ReleaseFailureException e ) @@ -192,17 +193,17 @@ files.add( rootProject.getFile() ); files.add( ReleaseUtil.getReleasePom( rootProject ) ); ScmFileSet fileSet = new ScmFileSet( rootProject.getFile().getParentFile(), files ); - + 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() ) ) ) ); - + ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); - phase.execute( descriptor, null, reactorProjects ); + phase.execute( descriptor, new DefaultReleaseEnvironment(), reactorProjects ); assertTrue( true ); } @@ -223,7 +224,7 @@ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); - phase.simulate( descriptor, null, reactorProjects ); + phase.simulate( descriptor, new DefaultReleaseEnvironment(), reactorProjects ); assertTrue( true ); } @@ -236,7 +237,7 @@ try { - phase.simulate( descriptor, null, reactorProjects ); + phase.simulate( descriptor, new DefaultReleaseEnvironment(), reactorProjects ); fail( "Should have thrown an exception" ); } catch ( ReleaseFailureException e ) @@ -262,7 +263,7 @@ try { - phase.execute( releaseDescriptor, null, reactorProjects ); + phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects ); fail( "Status check should have failed" ); } @@ -289,7 +290,7 @@ try { - phase.execute( releaseDescriptor, null, reactorProjects ); + phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects ); fail( "Status check should have failed" ); } @@ -314,7 +315,7 @@ try { - phase.execute( releaseDescriptor, null, reactorProjects ); + phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects ); fail( "Status check should have failed" ); } @@ -338,7 +339,7 @@ try { - phase.execute( releaseDescriptor, null, reactorProjects ); + phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects ); fail( "Commit should have failed" ); } 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=671288&r1=671287&r2=671288&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 Jun 24 11:36:49 2008 @@ -32,6 +32,7 @@ import org.apache.maven.shared.release.ReleaseExecutionException; import org.apache.maven.shared.release.ReleaseFailureException; import org.apache.maven.shared.release.config.ReleaseDescriptor; +import org.apache.maven.shared.release.env.DefaultReleaseEnvironment; import org.apache.maven.shared.release.scm.DefaultScmRepositoryConfigurator; import org.apache.maven.shared.release.scm.ReleaseScmCommandException; import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException; @@ -87,7 +88,7 @@ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); - phase.execute( descriptor, null, reactorProjects ); + phase.execute( descriptor, new DefaultReleaseEnvironment(), reactorProjects ); assertTrue( true ); } @@ -114,7 +115,7 @@ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); - phase.execute( descriptor, null, reactorProjects ); + phase.execute( descriptor, new DefaultReleaseEnvironment(), reactorProjects ); assertTrue( true ); } @@ -127,7 +128,7 @@ try { - phase.execute( descriptor, null, reactorProjects ); + phase.execute( descriptor, new DefaultReleaseEnvironment(), reactorProjects ); fail( "Should have thrown an exception" ); } catch ( ReleaseFailureException e ) @@ -152,7 +153,7 @@ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); - phase.simulate( descriptor, null, reactorProjects ); + phase.simulate( descriptor, new DefaultReleaseEnvironment(), reactorProjects ); assertTrue( true ); } @@ -165,7 +166,7 @@ try { - phase.simulate( descriptor, null, reactorProjects ); + phase.simulate( descriptor, new DefaultReleaseEnvironment(), reactorProjects ); fail( "Should have thrown an exception" ); } catch ( ReleaseFailureException e ) @@ -191,7 +192,7 @@ try { - phase.execute( releaseDescriptor, null, reactorProjects ); + phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects ); fail( "Status check should have failed" ); } @@ -218,7 +219,7 @@ try { - phase.execute( releaseDescriptor, null, reactorProjects ); + phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects ); fail( "Status check should have failed" ); } @@ -243,7 +244,7 @@ try { - phase.execute( releaseDescriptor, null, reactorProjects ); + phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects ); fail( "Status check should have failed" ); } @@ -267,7 +268,7 @@ try { - phase.execute( releaseDescriptor, null, reactorProjects ); + phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects ); fail( "Commit should have failed" ); } Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java?rev=671288&r1=671287&r2=671288&view=diff ============================================================================== --- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java (original) +++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java Tue Jun 24 11:36:49 2008 @@ -28,6 +28,9 @@ import org.apache.maven.settings.Settings; import org.apache.maven.shared.release.ReleaseManager; import org.apache.maven.shared.release.config.ReleaseDescriptor; +import org.apache.maven.shared.release.env.DefaultReleaseEnvironment; +import org.apache.maven.shared.release.env.ReleaseEnvironment; +import org.apache.maven.shared.release.exec.MavenExecutor; import org.codehaus.plexus.util.StringUtils; import java.io.File; @@ -136,12 +139,49 @@ private Map providerImplementations; /** + * The M2_HOME parameter to use for forked Maven invocations. + * + * @parameter default-value="${maven.home}" + */ + protected File mavenHome; + + /** + * The JAVA_HOME parameter to use for forked Maven invocations. + * + * @parameter default-value="${java.home}" + */ + protected File javaHome; + + /** + * The command-line local repository directory in use for this build (if specified). + * + * @parameter default-value="${maven.repo.local}" + */ + protected File localRepoDirectory; + + /** + * Role-hint of the [EMAIL PROTECTED] MavenExecutor} implementation to use. + * + * @parameter + */ + protected String mavenExecutorId; + + /** * The SCM manager. * * @component */ private ScmManager scmManager; + protected ReleaseEnvironment getReleaseEnvironment() + { + return new DefaultReleaseEnvironment().setSettings( settings ) + .setJavaHome( javaHome ) + .setMavenHome( mavenHome ) + .setLocalRepositoryDirectory( localRepoDirectory ) + .setMavenExecutorId( mavenExecutorId ); + } + public void execute() throws MojoExecutionException, MojoFailureException { @@ -248,13 +288,13 @@ */ protected void addArgument( String argument ) { - if (this.arguments != null) + if (arguments != null) { - this.arguments += " " + argument; + arguments += " " + argument; } else { - this.arguments = argument; + arguments = argument; } } } Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java?rev=671288&r1=671287&r2=671288&view=diff ============================================================================== --- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java (original) +++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java Tue Jun 24 11:36:49 2008 @@ -127,7 +127,7 @@ try { - releaseManager.branch( config, settings, reactorProjects, dryRun ); + releaseManager.branch( config, getReleaseEnvironment(), reactorProjects, dryRun ); } catch ( ReleaseExecutionException e ) { Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java?rev=671288&r1=671287&r2=671288&view=diff ============================================================================== --- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java (original) +++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java Tue Jun 24 11:36:49 2008 @@ -24,7 +24,6 @@ import org.apache.maven.shared.release.ReleaseExecutionException; import org.apache.maven.shared.release.ReleaseFailureException; import org.apache.maven.shared.release.config.ReleaseDescriptor; - import org.codehaus.plexus.util.StringUtils; import java.io.File; @@ -54,13 +53,13 @@ private String goals; /** - * Comma separated profiles to enable on deployment, in addition to active profiles + * Comma separated profiles to enable on deployment, in addition to active profiles * for project execution. * * @parameter */ private String releaseProfiles; - + /** * The checkout directory. * @@ -90,19 +89,19 @@ { return releaseProfiles; } - + public void execute() throws MojoExecutionException, MojoFailureException { super.execute(); - // goals may be splitted into multiple line in configuration. + // goals may be splitted into multiple line in configuration. // Let's build a single line command - if ( goals != null ) + if ( goals != null ) { goals = StringUtils.join( StringUtils.split( goals ), " " ); } - + try { // Note that the working directory here is not the same as in the release configuration, so don't reuse that @@ -127,7 +126,7 @@ } releaseDescriptor.setPerformGoals( goals ); - releaseManager.perform( releaseDescriptor, settings, reactorProjects ); + releaseManager.perform( releaseDescriptor, getReleaseEnvironment(), reactorProjects ); } catch ( ReleaseExecutionException e ) { Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java?rev=671288&r1=671287&r2=671288&view=diff ============================================================================== --- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java (original) +++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java Tue Jun 24 11:36:49 2008 @@ -124,14 +124,14 @@ * @parameter expression="${releaseVersion}" */ private String releaseVersion; - + /** * Default version to use for new local working copy. * * @parameter expression="${developmentVersion}" */ private String developmentVersion; - + public void execute() throws MojoExecutionException, MojoFailureException { @@ -148,14 +148,14 @@ config.setAllowTimestampedSnapshots( allowTimestampedSnapshots ); config.setDefaultReleaseVersion( releaseVersion ); config.setDefaultDevelopmentVersion( developmentVersion ); - + // Create a config containing values from the system properties (command line properties). ReleaseDescriptor sysPropertiesConfig = ReleaseUtils.copyPropertiesToReleaseDescriptor( System.getProperties() ); mergeCommandLineConfig( config, sysPropertiesConfig ); - + try { - releaseManager.prepare( config, settings, reactorProjects, resume, dryRun ); + releaseManager.prepare( config, getReleaseEnvironment(), reactorProjects, resume, dryRun ); } catch ( ReleaseExecutionException e ) { @@ -170,13 +170,13 @@ /** * This method takes some of the release configuration picked up from the command line * system properties and copies it into the release config object. - * + * * @param config * @param sysPropertiesConfig */ private void mergeCommandLineConfig( ReleaseDescriptor config, ReleaseDescriptor sysPropertiesConfig ) { - // If the user specifies versions, these should be override the existing versions + // If the user specifies versions, these should be override the existing versions if ( sysPropertiesConfig.getReleaseVersions() != null ) { config.getReleaseVersions().putAll( sysPropertiesConfig.getReleaseVersions() ); Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java?rev=671288&r1=671287&r2=671288&view=diff ============================================================================== --- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java (original) +++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java Tue Jun 24 11:36:49 2008 @@ -21,9 +21,9 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.shared.release.config.ReleaseDescriptor; import org.apache.maven.shared.release.ReleaseExecutionException; import org.apache.maven.shared.release.ReleaseFailureException; +import org.apache.maven.shared.release.config.ReleaseDescriptor; /** * Rollback changes made by a previous release. @@ -46,7 +46,7 @@ try { - releaseManager.rollback( config, settings, reactorProjects ); + releaseManager.rollback( config, getReleaseEnvironment(), reactorProjects ); } catch ( ReleaseExecutionException e ) { Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java?rev=671288&r1=671287&r2=671288&view=diff ============================================================================== --- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java (original) +++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java Tue Jun 24 11:36:49 2008 @@ -24,7 +24,6 @@ import org.apache.maven.shared.release.ReleaseExecutionException; import org.apache.maven.shared.release.ReleaseFailureException; import org.apache.maven.shared.release.config.ReleaseDescriptor; - import org.codehaus.plexus.util.StringUtils; import java.io.File; @@ -140,7 +139,7 @@ releaseDescriptor.setPerformGoals( goals ); - releaseManager.perform( releaseDescriptor, settings, reactorProjects, false ); + releaseManager.perform( releaseDescriptor, getReleaseEnvironment(), reactorProjects, false ); } catch ( ReleaseExecutionException e ) { Modified: maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PerformReleaseMojoTest.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PerformReleaseMojoTest.java?rev=671288&r1=671287&r2=671288&view=diff ============================================================================== --- maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PerformReleaseMojoTest.java (original) +++ maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PerformReleaseMojoTest.java Tue Jun 24 11:36:49 2008 @@ -26,14 +26,15 @@ import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.testing.AbstractMojoTestCase; import org.apache.maven.project.MavenProject; -import org.apache.maven.settings.Settings; import org.apache.maven.shared.release.ReleaseExecutionException; import org.apache.maven.shared.release.ReleaseFailureException; import org.apache.maven.shared.release.ReleaseManager; import org.apache.maven.shared.release.config.ReleaseDescriptor; +import org.apache.maven.shared.release.env.ReleaseEnvironment; import org.jmock.Mock; import org.jmock.core.Constraint; import org.jmock.core.constraint.IsEqual; +import org.jmock.core.constraint.IsInstanceOf; import org.jmock.core.constraint.IsNull; import org.jmock.core.matcher.InvokeOnceMatcher; import org.jmock.core.stub.ThrowStub; @@ -61,11 +62,15 @@ File checkoutDirectory = getTestFile( "target/checkout" ); releaseDescriptor.setCheckoutDirectory( checkoutDirectory.getAbsolutePath() ); releaseDescriptor.setPerformGoals( "deploy site-deploy" ); - Settings settings = mojo.getSettings(); Mock mock = new Mock( ReleaseManager.class ); - Constraint[] constraints = - new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( settings ), new IsNull()}; + + Constraint[] constraints = new Constraint[] { + new IsEqual( releaseDescriptor ), + new IsInstanceOf( ReleaseEnvironment.class ), + new IsNull() + }; + mock.expects( new InvokeOnceMatcher() ).method( "perform" ).with( constraints ); mojo.setReleaseManager( (ReleaseManager) mock.proxy() ); @@ -87,11 +92,15 @@ File checkoutDirectory = getTestFile( "target/checkout" ); releaseDescriptor.setCheckoutDirectory( checkoutDirectory.getAbsolutePath() ); releaseDescriptor.setPerformGoals( "deploy" ); - Settings settings = mojo.getSettings(); Mock mock = new Mock( ReleaseManager.class ); - Constraint[] constraints = - new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( settings ), new IsNull()}; + + Constraint[] constraints = new Constraint[] { + new IsEqual( releaseDescriptor ), + new IsInstanceOf( ReleaseEnvironment.class ), + new IsNull() + }; + mock.expects( new InvokeOnceMatcher() ).method( "perform" ).with( constraints ); mojo.setReleaseManager( (ReleaseManager) mock.proxy() ); @@ -124,11 +133,15 @@ File checkoutDirectory = getTestFile( "target/checkout" ); releaseDescriptor.setCheckoutDirectory( checkoutDirectory.getAbsolutePath() ); releaseDescriptor.setPerformGoals( "deploy site-deploy" ); - Settings settings = mojo.getSettings(); Mock mock = new Mock( ReleaseManager.class ); - Constraint[] constraints = - new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( settings ), new IsNull()}; + + Constraint[] constraints = new Constraint[] { + new IsEqual( releaseDescriptor ), + new IsInstanceOf( ReleaseEnvironment.class ), + new IsNull() + }; + mock.expects( new InvokeOnceMatcher() ).method( "perform" ).with( constraints ).will( new ThrowStub( new ReleaseExecutionException( "..." ) ) ); mojo.setReleaseManager( (ReleaseManager) mock.proxy() ); @@ -155,11 +168,15 @@ File checkoutDirectory = getTestFile( "target/checkout" ); releaseDescriptor.setCheckoutDirectory( checkoutDirectory.getAbsolutePath() ); releaseDescriptor.setPerformGoals( "deploy site-deploy" ); - Settings settings = mojo.getSettings(); Mock mock = new Mock( ReleaseManager.class ); - Constraint[] constraints = - new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( settings ), new IsNull()}; + + Constraint[] constraints = new Constraint[] { + new IsEqual( releaseDescriptor ), + new IsInstanceOf( ReleaseEnvironment.class ), + new IsNull() + }; + mock.expects( new InvokeOnceMatcher() ).method( "perform" ).with( constraints ).will( new ThrowStub( new ReleaseFailureException( "..." ) ) ); mojo.setReleaseManager( (ReleaseManager) mock.proxy() ); @@ -186,12 +203,16 @@ File checkoutDirectory = getTestFile( "target/checkout" ); releaseDescriptor.setCheckoutDirectory( checkoutDirectory.getAbsolutePath() ); releaseDescriptor.setPerformGoals( "deploy site-deploy" ); - Settings settings = mojo.getSettings(); releaseDescriptor.setScmSourceUrl( "scm-url" ); Mock mock = new Mock( ReleaseManager.class ); - Constraint[] constraints = - new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( settings ), new IsNull()}; + + Constraint[] constraints = new Constraint[] { + new IsEqual( releaseDescriptor ), + new IsInstanceOf( ReleaseEnvironment.class ), + new IsNull() + }; + mock.expects( new InvokeOnceMatcher() ).method( "perform" ).with( constraints ); mojo.setReleaseManager( (ReleaseManager) mock.proxy() ); @@ -210,7 +231,6 @@ File checkoutDirectory = getTestFile( "target/checkout" ); releaseDescriptor.setCheckoutDirectory( checkoutDirectory.getAbsolutePath() ); releaseDescriptor.setPerformGoals( "deploy site-deploy" ); - Settings settings = mojo.getSettings(); releaseDescriptor.setAdditionalArguments( "-P prof1,2prof" ); MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" ); @@ -221,8 +241,13 @@ project.setActiveProfiles( Arrays.asList( new Profile[]{profile1, profile2} ) ); Mock mock = new Mock( ReleaseManager.class ); - Constraint[] constraints = - new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( settings ), new IsNull()}; + + Constraint[] constraints = new Constraint[] { + new IsEqual( releaseDescriptor ), + new IsInstanceOf( ReleaseEnvironment.class ), + new IsNull() + }; + mock.expects( new InvokeOnceMatcher() ).method( "perform" ).with( constraints ); mojo.setReleaseManager( (ReleaseManager) mock.proxy() ); @@ -241,7 +266,6 @@ File checkoutDirectory = getTestFile( "target/checkout" ); releaseDescriptor.setCheckoutDirectory( checkoutDirectory.getAbsolutePath() ); releaseDescriptor.setPerformGoals( "deploy site-deploy" ); - Settings settings = mojo.getSettings(); releaseDescriptor.setAdditionalArguments( "-Dmaven.test.skip=true -P prof1,2prof" ); MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" ); @@ -252,8 +276,13 @@ project.setActiveProfiles( Arrays.asList( new Profile[]{profile1, profile2} ) ); Mock mock = new Mock( ReleaseManager.class ); - Constraint[] constraints = - new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( settings ), new IsNull()}; + + Constraint[] constraints = new Constraint[] { + new IsEqual( releaseDescriptor ), + new IsInstanceOf( ReleaseEnvironment.class ), + new IsNull() + }; + mock.expects( new InvokeOnceMatcher() ).method( "perform" ).with( constraints ); mojo.setReleaseManager( (ReleaseManager) mock.proxy() ); @@ -272,11 +301,15 @@ File checkoutDirectory = getTestFile( "target/checkout" ); releaseDescriptor.setCheckoutDirectory( checkoutDirectory.getAbsolutePath() ); releaseDescriptor.setPerformGoals( "deploy site-deploy" ); - Settings settings = mojo.getSettings(); Mock mock = new Mock( ReleaseManager.class ); - Constraint[] constraints = - new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( settings ), new IsNull()}; + + Constraint[] constraints = new Constraint[] { + new IsEqual( releaseDescriptor ), + new IsInstanceOf( ReleaseEnvironment.class ), + new IsNull() + }; + mock.expects( new InvokeOnceMatcher() ).method( "perform" ).with( constraints ); mojo.setReleaseManager( (ReleaseManager) mock.proxy() ); @@ -284,8 +317,8 @@ assertTrue( true ); } - - + + protected void setUp() throws Exception { Modified: maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java?rev=671288&r1=671287&r2=671288&view=diff ============================================================================== --- maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java (original) +++ maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java Tue Jun 24 11:36:49 2008 @@ -26,9 +26,11 @@ import org.apache.maven.shared.release.ReleaseFailureException; import org.apache.maven.shared.release.ReleaseManager; import org.apache.maven.shared.release.config.ReleaseDescriptor; +import org.apache.maven.shared.release.env.ReleaseEnvironment; import org.jmock.Mock; import org.jmock.core.Constraint; import org.jmock.core.constraint.IsEqual; +import org.jmock.core.constraint.IsInstanceOf; import org.jmock.core.constraint.IsNull; import org.jmock.core.matcher.InvokeOnceMatcher; import org.jmock.core.stub.ThrowStub; @@ -53,8 +55,15 @@ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor(); releaseDescriptor.setWorkingDirectory( testFile.getParentFile().getAbsolutePath() ); Mock mock = new Mock( ReleaseManager.class ); - Constraint[] constraints = new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( mojo.getSettings() ), - new IsNull(), new IsEqual( Boolean.TRUE ), new IsEqual( Boolean.FALSE )}; + + Constraint[] constraints = new Constraint[] { + new IsEqual( releaseDescriptor ), + new IsInstanceOf( ReleaseEnvironment.class ), + new IsNull(), + new IsEqual( Boolean.TRUE ), + new IsEqual( Boolean.FALSE ) + }; + mock.expects( new InvokeOnceMatcher() ).method( "prepare" ).with( constraints ); mojo.setReleaseManager( (ReleaseManager) mock.proxy() ); @@ -73,8 +82,15 @@ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor(); releaseDescriptor.setWorkingDirectory( testFile.getParentFile().getAbsolutePath() ); Mock mock = new Mock( ReleaseManager.class ); - Constraint[] constraints = new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( mojo.getSettings() ), - new IsNull(), new IsEqual( Boolean.TRUE ), new IsEqual( Boolean.FALSE )}; + + Constraint[] constraints = new Constraint[] { + new IsEqual( releaseDescriptor ), + new IsInstanceOf( ReleaseEnvironment.class ), + new IsNull(), + new IsEqual( Boolean.TRUE ), + new IsEqual( Boolean.FALSE ) + }; + mock.expects( new InvokeOnceMatcher() ).method( "prepare" ).with( constraints ).will( new ThrowStub( new ReleaseExecutionException( "..." ) ) ); mojo.setReleaseManager( (ReleaseManager) mock.proxy() ); @@ -101,8 +117,15 @@ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor(); releaseDescriptor.setWorkingDirectory( testFile.getParentFile().getAbsolutePath() ); Mock mock = new Mock( ReleaseManager.class ); - Constraint[] constraints = new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( mojo.getSettings() ), - new IsNull(), new IsEqual( Boolean.TRUE ), new IsEqual( Boolean.FALSE )}; + + Constraint[] constraints = new Constraint[] { + new IsEqual( releaseDescriptor ), + new IsInstanceOf( ReleaseEnvironment.class ), + new IsNull(), + new IsEqual( Boolean.TRUE ), + new IsEqual( Boolean.FALSE ) + }; + mock.expects( new InvokeOnceMatcher() ).method( "prepare" ).with( constraints ).will( new ThrowStub( new ReleaseFailureException( "..." ) ) ); mojo.setReleaseManager( (ReleaseManager) mock.proxy() ); Modified: maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/StageReleaseMojoTest.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/StageReleaseMojoTest.java?rev=671288&r1=671287&r2=671288&view=diff ============================================================================== --- maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/StageReleaseMojoTest.java (original) +++ maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/StageReleaseMojoTest.java Tue Jun 24 11:36:49 2008 @@ -20,26 +20,20 @@ */ import org.apache.maven.model.DistributionManagement; -import org.apache.maven.model.Profile; import org.apache.maven.model.Site; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.testing.AbstractMojoTestCase; import org.apache.maven.project.MavenProject; -import org.apache.maven.settings.Settings; -import org.apache.maven.shared.release.ReleaseExecutionException; -import org.apache.maven.shared.release.ReleaseFailureException; import org.apache.maven.shared.release.ReleaseManager; import org.apache.maven.shared.release.config.ReleaseDescriptor; +import org.apache.maven.shared.release.env.ReleaseEnvironment; import org.jmock.Mock; import org.jmock.core.Constraint; import org.jmock.core.constraint.IsEqual; +import org.jmock.core.constraint.IsInstanceOf; import org.jmock.core.constraint.IsNull; import org.jmock.core.matcher.InvokeOnceMatcher; -import org.jmock.core.stub.ThrowStub; import java.io.File; -import java.util.Arrays; /** * Test release:perform. @@ -62,11 +56,16 @@ releaseDescriptor.setCheckoutDirectory( checkoutDirectory.getAbsolutePath() ); releaseDescriptor.setPerformGoals( "deploy site:stage-deploy" ); releaseDescriptor.setAdditionalArguments( "-DaltDeploymentRepository=\"staging\"" ); - Settings settings = mojo.getSettings(); Mock mock = new Mock( ReleaseManager.class ); - Constraint[] constraints = - new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( settings ), new IsNull(), new IsEqual( Boolean.FALSE ) }; + + Constraint[] constraints = new Constraint[] { + new IsEqual( releaseDescriptor ), + new IsInstanceOf( ReleaseEnvironment.class ), + new IsNull(), + new IsEqual( Boolean.FALSE ) + }; + mock.expects( new InvokeOnceMatcher() ).method( "perform" ).with( constraints ); mojo.setReleaseManager( (ReleaseManager) mock.proxy() );
