You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/06/24 20:36:51 UTC
svn commit: r671288 [2/4] - in /maven/release/trunk: maven-release-manager/
maven-release-manager/src/main/java/org/apache/maven/shared/release/
maven-release-manager/src/main/java/org/apache/maven/shared/release/env/
maven-release-manager/src/main/jav...
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java Tue Jun 24 11:36:49 2008
@@ -32,11 +32,11 @@
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
-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.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
@@ -87,19 +87,19 @@
*/
private String pomSuffix;
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
- transform( releaseDescriptor, settings, reactorProjects, false, result );
+ transform( releaseDescriptor, releaseEnvironment, reactorProjects, false, result );
result.setResultCode( ReleaseResult.SUCCESS );
return result;
}
- private void transform( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects,
+ private void transform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects,
boolean simulate, ReleaseResult result )
throws ReleaseExecutionException, ReleaseFailureException
{
@@ -109,11 +109,11 @@
logInfo( result, "Transforming '" + project.getName() + "'..." );
- transformProject( project, releaseDescriptor, settings, reactorProjects, simulate, result );
+ transformProject( project, releaseDescriptor, releaseEnvironment, reactorProjects, simulate, result );
}
}
- private void transformProject( MavenProject project, ReleaseDescriptor releaseDescriptor, Settings settings,
+ private void transformProject( MavenProject project, ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
List reactorProjects, boolean simulate, ReleaseResult result )
throws ReleaseExecutionException, ReleaseFailureException
{
@@ -164,7 +164,7 @@
"(?:(?:" + SPACE + ")|(?:" + XML + ")|(?:" + DOCTYPE + ")|(?:" + COMMENT + ")|(?:" + PI + "))*";
final String OUTRO = "(?:(?:" + SPACE + ")|(?:" + COMMENT + ")|(?:" + PI + "))*";
final String POM = "(?s)(" + INTRO + ")(.*?)(" + OUTRO + ")";
-
+
Matcher matcher = Pattern.compile( POM ).matcher( content );
if ( matcher.matches() )
{
@@ -186,7 +186,7 @@
ScmProvider provider;
try
{
- scmRepository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, settings );
+ scmRepository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings() );
provider = scmRepositoryConfigurator.getRepositoryProvider( scmRepository );
}
@@ -297,7 +297,7 @@
/**
* Updates the text value of the given element. The primary purpose of this method is to preserve any whitespace and
* comments around the original text value.
- *
+ *
* @param element The element to update, must not be <code>null</code>.
* @param value The text string to set, must not be <code>null</code>.
*/
@@ -760,12 +760,12 @@
}
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
- transform( releaseDescriptor, settings, reactorProjects, true, result );
+ transform( releaseDescriptor, releaseEnvironment, reactorProjects, true, result );
result.setResultCode( ReleaseResult.SUCCESS );
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java Tue Jun 24 11:36:49 2008
@@ -22,11 +22,15 @@
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseResult;
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.apache.maven.shared.release.exec.MavenExecutorException;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
/**
* Run the integration tests for the project to verify that it builds before committing.
@@ -39,14 +43,25 @@
/**
* Component to assist in executing Maven.
*
- * @plexus.requirement
+ * @plexus.requirement role="org.apache.maven.shared.release.exec.MavenExecutor"
*/
- private MavenExecutor mavenExecutor;
+ private Map mavenExecutors;
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, File workingDirectory,
+ /**
+ * @deprecated Use {@link AbstractRunGoalsPhase#execute(ReleaseDescriptor, ReleaseEnvironment, File, String)} instead.
+ */
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor,
+ File workingDirectory,
String additionalArguments )
throws ReleaseExecutionException
{
+ return execute( releaseDescriptor, new DefaultReleaseEnvironment(), workingDirectory, additionalArguments );
+ }
+
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ File workingDirectory, String additionalArguments )
+ throws ReleaseExecutionException
+ {
ReleaseResult result = new ReleaseResult();
try
@@ -56,9 +71,17 @@
{
logInfo( result, "Executing goals '" + goals + "'..." );
+ MavenExecutor mavenExecutor = (MavenExecutor) mavenExecutors.get( releaseEnvironment.getMavenExecutorId() );
+
+ if ( mavenExecutor == null )
+ {
+ throw new ReleaseExecutionException( "Cannot find Maven executor with id: " + releaseEnvironment.getMavenExecutorId() );
+ }
+
mavenExecutor.executeGoals( determineWorkingDirectory( workingDirectory,
releaseDescriptor.getScmRelativePathProjectDirectory() ),
- goals, releaseDescriptor.isInteractive(), additionalArguments, result );
+ goals, releaseEnvironment, releaseDescriptor.isInteractive(),
+ additionalArguments, result );
}
}
catch ( MavenExecutorException e )
@@ -71,9 +94,22 @@
return result;
}
+ /**
+ * @deprecated Use {@link AbstractRunGoalsPhase#setMavenExecutor(String, MavenExecutor)} instead.
+ */
public void setMavenExecutor( MavenExecutor mavenExecutor )
{
- this.mavenExecutor = mavenExecutor;
+ setMavenExecutor( ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID, mavenExecutor );
+ }
+
+ public void setMavenExecutor( String id, MavenExecutor executor )
+ {
+ if ( mavenExecutors == null )
+ {
+ mavenExecutors = new HashMap();
+ }
+
+ mavenExecutors.put( id, executor );
}
protected abstract String getGoals( ReleaseDescriptor releaseDescriptor );
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckCompletedPreparePhasesPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckCompletedPreparePhasesPhase.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckCompletedPreparePhasesPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckCompletedPreparePhasesPhase.java Tue Jun 24 11:36:49 2008
@@ -19,11 +19,11 @@
* under the License.
*/
-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.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import java.util.List;
@@ -35,17 +35,19 @@
public class CheckCompletedPreparePhasesPhase
extends AbstractReleasePhase
{
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment,
+ List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
// if we stopped mid-way through preparation - don't perform
- if ( releaseDescriptor.getCompletedPhase() != null &&
- !"end-release".equals( releaseDescriptor.getCompletedPhase() ) )
+ if ( releaseDescriptor.getCompletedPhase() != null
+ && !"end-release".equals( releaseDescriptor.getCompletedPhase() ) )
{
- String message = "Cannot perform release - the preparation step was stopped mid-way. Please re-run " +
- "release:prepare to continue, or perform the release from an SCM tag.";
+ String message = "Cannot perform release - the preparation step was stopped mid-way. Please re-run "
+ + "release:prepare to continue, or perform the release from an SCM tag.";
result.setResultCode( ReleaseResult.ERROR );
@@ -70,9 +72,11 @@
return result;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor,
+ ReleaseEnvironment releaseEnvironment,
+ List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
- return execute( releaseDescriptor, settings, reactorProjects );
+ return execute( releaseDescriptor, releaseEnvironment, reactorProjects );
}
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java Tue Jun 24 11:36:49 2008
@@ -24,11 +24,11 @@
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-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.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.versions.DefaultVersionInfo;
import org.apache.maven.shared.release.versions.VersionInfo;
import org.apache.maven.shared.release.versions.VersionParseException;
@@ -90,7 +90,7 @@
*/
private ArtifactFactory artifactFactory;
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
@@ -115,7 +115,7 @@
throws ReleaseFailureException, ReleaseExecutionException
{
Map artifactMap = ArtifactUtils.artifactMapByVersionlessId( project.getArtifacts() );
-
+
Set snapshotDependencies = new HashSet();
Set snapshotReportDependencies = new HashSet();
Set snapshotExtensionsDependencies = new HashSet();
@@ -249,15 +249,15 @@
{
String versionlessId = ArtifactUtils.versionlessKey( artifact );
Artifact checkArtifact = (Artifact) artifactMapByVersionlessId.get( versionlessId );
-
+
if ( checkArtifact == null)
{
checkArtifact = artifact;
}
-
+
return checkArtifact( checkArtifact, originalVersions, releaseDescriptor );
}
-
+
private static boolean checkArtifact( Artifact artifact, Map originalVersions, ReleaseDescriptor releaseDescriptor )
{
String versionlessArtifactKey = ArtifactUtils.versionlessKey( artifact.getGroupId(), artifact.getArtifactId() );
@@ -277,11 +277,11 @@
return result;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
// It makes no modifications, so simulate is the same as execute
- return execute( releaseDescriptor, settings, reactorProjects );
+ return execute( releaseDescriptor, releaseEnvironment, reactorProjects );
}
public void setPrompter( Prompter prompter )
@@ -397,7 +397,7 @@
VersionInfo versionInfo = new DefaultVersionInfo( currentArtifact.getVersion() );
VersionInfo nextVersionInfo = versionInfo.getNextVersion();
-
+
String nextVersion;
if ( nextVersionInfo != null )
{
@@ -407,12 +407,12 @@
{
nextVersion = "1.0-SNAPSHOT";
}
-
+
result = prompter.prompt( "What is the next development version?",
Collections.singletonList( nextVersion ), nextVersion );
VersionInfo nextDevelopmentVersion = new DefaultVersionInfo( result );
-
+
Map versionMap = new HashMap();
versionMap.put( ReleaseDescriptor.ORIGINAL_VERSION, versionInfo.toString() );
versionMap.put( ReleaseDescriptor.DEVELOPMENT_KEY, nextDevelopmentVersion.getSnapshotVersionString() );
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java Tue Jun 24 11:36:49 2008
@@ -23,11 +23,11 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.manager.NoSuchScmProviderException;
import org.apache.maven.scm.repository.ScmRepositoryException;
-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.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.shared.release.util.ReleaseUtil;
@@ -52,7 +52,7 @@
*/
private ScmRepositoryConfigurator scmRepositoryConfigurator;
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
@@ -81,7 +81,7 @@
try
{
- scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, settings );
+ scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings() );
}
catch ( ScmRepositoryException e )
{
@@ -116,10 +116,10 @@
return result;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
// It makes no modifications, so simulate is the same as execute
- return execute( releaseDescriptor, settings, reactorProjects );
+ return execute( releaseDescriptor, releaseEnvironment, reactorProjects );
}
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java Tue Jun 24 11:36:49 2008
@@ -27,11 +27,11 @@
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
-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.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
@@ -58,7 +58,7 @@
*/
private ScmRepositoryConfigurator scmRepositoryConfigurator;
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
@@ -70,7 +70,7 @@
try
{
- repository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, settings );
+ repository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings() );
provider = scmRepositoryConfigurator.getRepositoryProvider( repository );
}
@@ -148,9 +148,9 @@
return result;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
- return simulate( releaseDescriptor, settings, reactorProjects );
+ return simulate( releaseDescriptor, releaseEnvironment, reactorProjects );
}
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java Tue Jun 24 11:36:49 2008
@@ -20,11 +20,11 @@
*/
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.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.util.ReleaseUtil;
import org.codehaus.plexus.util.FileUtils;
@@ -39,7 +39,7 @@
public class CreateBackupPomsPhase
extends AbstractBackupPomsPhase
{
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
@@ -75,10 +75,10 @@
return result;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
- return execute( releaseDescriptor, settings, reactorProjects );
+ return execute( releaseDescriptor, releaseEnvironment, reactorProjects );
}
private void createPomBackup( MavenProject project )
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/EndReleasePhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/EndReleasePhase.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/EndReleasePhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/EndReleasePhase.java Tue Jun 24 11:36:49 2008
@@ -19,11 +19,11 @@
* under the License.
*/
-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.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import java.util.List;
@@ -36,7 +36,7 @@
public class EndReleasePhase
extends AbstractReleasePhase
{
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
@@ -48,7 +48,7 @@
return result;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
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=671288&r1=671287&r2=671288&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 Tue Jun 24 11:36:49 2008
@@ -37,11 +37,11 @@
import org.apache.maven.scm.command.add.AddScmResult;
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.repository.ScmRepository;
-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.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
import org.apache.maven.shared.release.scm.ScmTranslator;
import org.apache.maven.shared.release.util.ReleaseUtil;
@@ -60,7 +60,7 @@
/**
* Generate release POMs.
- *
+ *
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
* @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase" role-hint="generate-release-poms"
@@ -69,15 +69,15 @@
extends AbstractReleasePomsPhase
{
/**
- *
- *
+ *
+ *
* @plexus.requirement
*/
private PathTranslator pathTranslator;
/**
* SCM URL translators mapped by provider name.
- *
+ *
* @plexus.requirement role="org.apache.maven.shared.release.scm.ScmTranslator"
*/
private Map scmTranslators;
@@ -86,13 +86,13 @@
* @see org.apache.maven.shared.release.phase.ReleasePhase#execute(org.apache.maven.shared.release.config.ReleaseDescriptor,
* org.apache.maven.settings.Settings, java.util.List)
*/
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
- return execute( releaseDescriptor, settings, reactorProjects, false );
+ return execute( releaseDescriptor, releaseEnvironment, reactorProjects, false );
}
- private ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects,
+ private ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects,
boolean simulate )
throws ReleaseExecutionException, ReleaseFailureException
{
@@ -102,7 +102,7 @@
{
logInfo( result, "Generating release POMs..." );
- generateReleasePoms( releaseDescriptor, settings, reactorProjects, simulate, result );
+ generateReleasePoms( releaseDescriptor, releaseEnvironment, reactorProjects, simulate, result );
}
else
{
@@ -114,7 +114,7 @@
return result;
}
- private void generateReleasePoms( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects,
+ private void generateReleasePoms( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects,
boolean simulate, ReleaseResult result )
throws ReleaseExecutionException, ReleaseFailureException
{
@@ -126,19 +126,19 @@
logInfo( result, "Generating release POM for '" + project.getName() + "'..." );
- releasePoms.add( generateReleasePom( project, releaseDescriptor, settings, reactorProjects, simulate, result ) );
+ releasePoms.add( generateReleasePom( project, releaseDescriptor, releaseEnvironment, reactorProjects, simulate, result ) );
}
- addReleasePomsToScm( releaseDescriptor, settings, reactorProjects, simulate, result, releasePoms );
+ addReleasePomsToScm( releaseDescriptor, releaseEnvironment, reactorProjects, simulate, result, releasePoms );
}
- private File generateReleasePom( MavenProject project, ReleaseDescriptor releaseDescriptor, Settings settings,
+ private File generateReleasePom( MavenProject project, ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
List reactorProjects, boolean simulate, ReleaseResult result )
throws ReleaseExecutionException, ReleaseFailureException
{
// create release pom
- Model releasePom = createReleaseModel( project, releaseDescriptor, settings, reactorProjects, result );
+ Model releasePom = createReleaseModel( project, releaseDescriptor, releaseEnvironment, reactorProjects, result );
// write release pom to file
@@ -166,7 +166,7 @@
return releasePomFile;
}
- private void addReleasePomsToScm( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects, boolean simulate, ReleaseResult result, List releasePoms )
+ private void addReleasePomsToScm( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects, boolean simulate, ReleaseResult result, List releasePoms )
throws ReleaseFailureException, ReleaseExecutionException
{
if ( simulate )
@@ -175,7 +175,7 @@
}
else
{
- ScmRepository scmRepository = getScmRepository( releaseDescriptor, settings );
+ ScmRepository scmRepository = getScmRepository( releaseDescriptor, releaseEnvironment );
ScmProvider scmProvider = getScmProvider( scmRepository );
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
@@ -198,7 +198,7 @@
}
}
- private Model createReleaseModel( MavenProject project, ReleaseDescriptor releaseDescriptor, Settings settings,
+ private Model createReleaseModel( MavenProject project, ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
List reactorProjects, ReleaseResult result )
throws ReleaseFailureException, ReleaseExecutionException
{
@@ -238,7 +238,7 @@
if ( scm != null )
{
- ScmRepository scmRepository = getScmRepository( releaseDescriptor, settings );
+ ScmRepository scmRepository = getScmRepository( releaseDescriptor, releaseEnvironment );
ScmTranslator scmTranslator = getScmTranslator( scmRepository );
if ( scmTranslator != null )
@@ -272,10 +272,10 @@
return releaseModel;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
- return execute( releaseDescriptor, settings, reactorProjects, true );
+ return execute( releaseDescriptor, releaseEnvironment, reactorProjects, true );
}
protected Map getOriginalVersionMap( ReleaseDescriptor releaseDescriptor, List reactorProjects )
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java Tue Jun 24 11:36:49 2008
@@ -25,10 +25,10 @@
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
-import org.apache.maven.settings.Settings;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.shared.release.util.ReleaseUtil;
@@ -65,12 +65,12 @@
this.prompter = prompter;
}
- protected ScmProvider getScmProvider( ReleaseDescriptor releaseDescriptor, Settings settings )
+ protected ScmProvider getScmProvider( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment )
throws ReleaseScmRepositoryException, ReleaseExecutionException
{
try
{
- ScmRepository repository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, settings );
+ ScmRepository repository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings() );
return scmRepositoryConfigurator.getRepositoryProvider( repository );
}
@@ -85,7 +85,7 @@
}
}
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException
{
ReleaseResult result = new ReleaseResult();
@@ -110,7 +110,7 @@
ScmProvider provider = null;
try
{
- provider = getScmProvider( releaseDescriptor, settings );
+ provider = getScmProvider( releaseDescriptor, releaseEnvironment );
}
catch ( ReleaseScmRepositoryException e )
{
@@ -145,13 +145,13 @@
return result;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException
{
ReleaseResult result = new ReleaseResult();
// It makes no modifications, so simulate is the same as execute
- execute( releaseDescriptor, settings, reactorProjects );
+ execute( releaseDescriptor, releaseEnvironment, reactorProjects );
result.setResultCode( ReleaseResult.SUCCESS );
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=671288&r1=671287&r2=671288&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 Tue Jun 24 11:36:49 2008
@@ -21,10 +21,10 @@
import org.apache.maven.artifact.ArtifactUtils;
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.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.util.ReleaseUtil;
import org.apache.maven.shared.release.versions.DefaultVersionInfo;
import org.apache.maven.shared.release.versions.VersionInfo;
@@ -64,7 +64,7 @@
this.prompter = prompter;
}
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException
{
ReleaseResult result = new ReleaseResult();
@@ -171,14 +171,14 @@
VersionInfo currentVersionInfo = null;
VersionInfo releaseVersionInfo = null;
VersionInfo nextSnapshotVersionInfo = null;
-
+
try
{
currentVersionInfo = new DefaultVersionInfo( project.getVersion() );
// The release version defaults to currentVersionInfo.getReleaseVersionString()
releaseVersionInfo = currentVersionInfo;
-
+
// Check if the user specified a release version
if ( releaseDescriptor.getDefaultReleaseVersion() != null )
{
@@ -197,7 +197,7 @@
{
nextSnapshotVersionInfo = releaseVersionInfo.getNextVersion();
}
-
+
// Check if the user specified a new snapshot version
if ( releaseDescriptor.getDefaultDevelopmentVersion() != null )
{
@@ -211,7 +211,7 @@
nextSnapshotVersionInfo = new DefaultVersionInfo( nextDevVersion );
}
}
-
+
}
catch ( VersionParseException e )
{
@@ -372,13 +372,13 @@
return nextVersion;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException
{
ReleaseResult result = new ReleaseResult();
// It makes no modifications, so simulate is the same as execute
- execute( releaseDescriptor, settings, reactorProjects );
+ execute( releaseDescriptor, releaseEnvironment, reactorProjects );
result.setResultCode( ReleaseResult.SUCCESS );
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java Tue Jun 24 11:36:49 2008
@@ -24,6 +24,7 @@
import org.apache.maven.shared.release.ReleaseFailureException;
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import java.util.List;
@@ -43,10 +44,36 @@
* Execute the phase.
*
* @param releaseDescriptor the configuration to use
+ * @param releaseEnvironment the environmental configuration, such as Maven settings, Maven home, etc.
+ * @param reactorProjects the reactor projects
+ * @throws ReleaseExecutionException an exception during the execution of the phase
+ * @throws ReleaseFailureException a failure during the execution of the phase
+ */
+ ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
+ throws ReleaseExecutionException, ReleaseFailureException;
+
+ /**
+ * Simulate the phase, but don't make any changes to the project.
+ *
+ * @param releaseDescriptor the configuration to use
+ * @param releaseEnvironment the environmental configuration, such as Maven settings, Maven home, etc.
+ * @param reactorProjects the reactor projects
+ * @throws ReleaseExecutionException an exception during the execution of the phase
+ * @throws ReleaseFailureException a failure during the execution of the phase
+ */
+ ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
+ throws ReleaseExecutionException, ReleaseFailureException;
+
+ /**
+ * Execute the phase.
+ *
+ * @param releaseDescriptor the configuration to use
* @param settings the settings.xml configuration
* @param reactorProjects the reactor projects
* @throws ReleaseExecutionException an exception during the execution of the phase
* @throws ReleaseFailureException a failure during the execution of the phase
+ *
+ * @deprecated Use {@link ReleasePhase#execute(ReleaseDescriptor, ReleaseEnvironment, List)} instead.
*/
ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException;
@@ -59,6 +86,8 @@
* @param reactorProjects the reactor projects
* @throws ReleaseExecutionException an exception during the execution of the phase
* @throws ReleaseFailureException a failure during the execution of the phase
+ *
+ * @deprecated Use {@link ReleasePhase#simulate(ReleaseDescriptor, ReleaseEnvironment, List)} instead.
*/
ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException;
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java Tue Jun 24 11:36:49 2008
@@ -19,28 +19,28 @@
* under the License.
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.remove.RemoveScmResult;
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.repository.ScmRepository;
-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.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
import org.apache.maven.shared.release.util.ReleaseUtil;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
/**
* Remove release POMs.
- *
+ *
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
* @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase" role-hint="remove-release-poms"
@@ -48,19 +48,19 @@
public class RemoveReleasePomsPhase
extends AbstractReleasePomsPhase
{
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseFailureException, ReleaseExecutionException
{
- return execute( releaseDescriptor, settings, reactorProjects, false );
+ return execute( releaseDescriptor, releaseEnvironment, reactorProjects, false );
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseFailureException, ReleaseExecutionException
{
- return execute( releaseDescriptor, settings, reactorProjects, true );
+ return execute( releaseDescriptor, releaseEnvironment, reactorProjects, true );
}
- private ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects,
+ private ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects,
boolean simulate )
throws ReleaseFailureException, ReleaseExecutionException
{
@@ -70,7 +70,7 @@
{
logInfo( result, "Removing release POMs..." );
- removeReleasePoms( releaseDescriptor, settings, simulate, result, reactorProjects );
+ removeReleasePoms( releaseDescriptor, releaseEnvironment, simulate, result, reactorProjects );
}
else
{
@@ -82,7 +82,7 @@
return result;
}
- private void removeReleasePoms( ReleaseDescriptor releaseDescriptor, Settings settings, boolean simulate,
+ private void removeReleasePoms( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, boolean simulate,
ReleaseResult result, List projects )
throws ReleaseFailureException, ReleaseExecutionException
{
@@ -97,10 +97,10 @@
releasePoms.add( ReleaseUtil.getReleasePom( project ) );
}
- removeReleasePomsFromScm( releaseDescriptor, settings, simulate, result, releasePoms );
+ removeReleasePomsFromScm( releaseDescriptor, releaseEnvironment, simulate, result, releasePoms );
}
-
- private void removeReleasePomsFromScm( ReleaseDescriptor releaseDescriptor, Settings settings, boolean simulate,
+
+ private void removeReleasePomsFromScm( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, boolean simulate,
ReleaseResult result, List releasePoms )
throws ReleaseFailureException, ReleaseExecutionException
{
@@ -110,7 +110,7 @@
}
else
{
- ScmRepository scmRepository = getScmRepository( releaseDescriptor, settings );
+ ScmRepository scmRepository = getScmRepository( releaseDescriptor, releaseEnvironment );
ScmProvider scmProvider = getScmProvider( scmRepository );
ScmFileSet scmFileSet = new ScmFileSet( new File( releaseDescriptor.getWorkingDirectory() ), releasePoms );
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveScmTagPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveScmTagPhase.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveScmTagPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveScmTagPhase.java Tue Jun 24 11:36:49 2008
@@ -1,10 +1,10 @@
package org.apache.maven.shared.release.phase;
-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.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import java.util.List;
@@ -34,7 +34,7 @@
public class RemoveScmTagPhase
extends AbstractReleasePhase
{
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
@@ -46,9 +46,9 @@
return result;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
- return execute( releaseDescriptor, settings, reactorProjects );
+ return execute( releaseDescriptor, releaseEnvironment, reactorProjects );
}
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java Tue Jun 24 11:36:49 2008
@@ -27,11 +27,11 @@
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
-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.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
@@ -57,7 +57,7 @@
*/
private ScmRepositoryConfigurator scmRepositoryConfigurator;
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
@@ -66,7 +66,7 @@
{
MavenProject project = (MavenProject) projects.next();
- restorePomBackup( releaseDescriptor, settings, project );
+ restorePomBackup( releaseDescriptor, releaseEnvironment, project );
}
result.setResultCode( ReleaseResult.SUCCESS );
@@ -74,13 +74,13 @@
return result;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
- return execute( releaseDescriptor, settings, reactorProjects );
+ return execute( releaseDescriptor, releaseEnvironment, reactorProjects );
}
- protected void restorePomBackup( ReleaseDescriptor releaseDescriptor, Settings settings, MavenProject project )
+ protected void restorePomBackup( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, MavenProject project )
throws ReleaseExecutionException, ReleaseFailureException
{
File pomBackup = getPomBackup( project );
@@ -97,7 +97,7 @@
ScmProvider provider;
try
{
- scmRepository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, settings );
+ scmRepository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings() );
provider = scmRepositoryConfigurator.getRepositoryProvider( scmRepository );
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java Tue Jun 24 11:36:49 2008
@@ -19,10 +19,10 @@
* under the License.
*/
-import org.apache.maven.settings.Settings;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
@@ -37,7 +37,7 @@
public class RunPerformGoalsPhase
extends AbstractRunGoalsPhase
{
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException
{
String additionalArguments = releaseDescriptor.getAdditionalArguments();
@@ -53,7 +53,7 @@
additionalArguments = "-DperformRelease=true";
}
}
-
+
// ensure we don't use the release pom for the perform goals
if ( !StringUtils.isEmpty( additionalArguments ) )
{
@@ -64,17 +64,17 @@
additionalArguments = "-f pom.xml";
}
- return execute( releaseDescriptor, new File( releaseDescriptor.getCheckoutDirectory() ), additionalArguments );
+ return execute( releaseDescriptor, releaseEnvironment, new File( releaseDescriptor.getCheckoutDirectory() ), additionalArguments );
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException
{
ReleaseResult result = new ReleaseResult();
logInfo( result, "Executing perform goals" );
- execute( releaseDescriptor, settings, reactorProjects );
+ execute( releaseDescriptor, releaseEnvironment, reactorProjects );
return result;
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java Tue Jun 24 11:36:49 2008
@@ -19,10 +19,10 @@
* under the License.
*/
-import org.apache.maven.settings.Settings;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import java.io.File;
import java.util.List;
@@ -36,14 +36,14 @@
public class RunPrepareGoalsPhase
extends AbstractRunGoalsPhase
{
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException
{
- return execute( releaseDescriptor, new File( releaseDescriptor.getWorkingDirectory() ),
+ return execute( releaseDescriptor, releaseEnvironment, new File( releaseDescriptor.getWorkingDirectory() ),
releaseDescriptor.getAdditionalArguments() );
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException
{
ReleaseResult result = new ReleaseResult();
@@ -51,7 +51,7 @@
logInfo( result, "Executing preparation goals - since this is simulation mode it is running against the " +
"original project, not the rewritten ones" );
- execute( releaseDescriptor, settings, reactorProjects );
+ execute( releaseDescriptor, releaseEnvironment, reactorProjects );
return result;
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java Tue Jun 24 11:36:49 2008
@@ -26,11 +26,11 @@
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
-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.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
@@ -54,7 +54,7 @@
*/
private ScmRepositoryConfigurator scmRepositoryConfigurator;
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult relResult = new ReleaseResult();
@@ -67,7 +67,7 @@
ScmProvider provider;
try
{
- repository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, settings );
+ repository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings() );
provider = scmRepositoryConfigurator.getRepositoryProvider( repository );
}
@@ -103,7 +103,7 @@
return relResult;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java Tue Jun 24 11:36:49 2008
@@ -27,11 +27,11 @@
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
-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.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
@@ -67,7 +67,7 @@
private Set excludedFiles = new HashSet( Arrays.asList( new String[] { "pom.xml.backup", "pom.xml.tag",
"pom.xml.next", "release.properties", "pom.xml.releaseBackup" } ) );
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult relResult = new ReleaseResult();
@@ -78,7 +78,7 @@
ScmProvider provider;
try
{
- repository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, settings );
+ repository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings() );
provider = scmRepositoryConfigurator.getRepositoryProvider( repository );
}
@@ -147,10 +147,10 @@
return relResult;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
// It makes no modifications, so simulate is the same as execute
- return execute( releaseDescriptor, settings, reactorProjects );
+ return execute( releaseDescriptor, releaseEnvironment, reactorProjects );
}
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPhase.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPhase.java Tue Jun 24 11:36:49 2008
@@ -28,11 +28,11 @@
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
-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.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
@@ -63,7 +63,7 @@
*/
private String messageFormat;
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult relResult = new ReleaseResult();
@@ -76,7 +76,7 @@
ScmProvider provider;
try
{
- repository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, settings );
+ repository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings() );
provider = scmRepositoryConfigurator.getRepositoryProvider( repository );
}
@@ -134,7 +134,7 @@
}
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java Tue Jun 24 11:36:49 2008
@@ -26,11 +26,11 @@
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
-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.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
@@ -54,7 +54,7 @@
*/
private ScmRepositoryConfigurator scmRepositoryConfigurator;
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult relResult = new ReleaseResult();
@@ -67,7 +67,7 @@
ScmProvider provider;
try
{
- repository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, settings );
+ repository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings() );
provider = scmRepositoryConfigurator.getRepositoryProvider( repository );
}
@@ -104,7 +104,7 @@
return relResult;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java Tue Jun 24 11:36:49 2008
@@ -36,7 +36,7 @@
public class ReleaseUtil
{
public static final String RELEASE_POMv4 = "release-pom.xml";
-
+
private static final String POMv4 = "pom.xml";
/**
@@ -63,20 +63,20 @@
return project;
}
-
+
public static File getStandardPom( MavenProject project )
{
File pom = project.getFile();
File releasePom = getReleasePom( project );
-
+
if ( pom.equals( releasePom ))
{
pom = new File( pom.getParent(), POMv4 );
}
-
+
return pom;
}
-
+
public static File getReleasePom( MavenProject project )
{
return new File( project.getFile().getParent(), RELEASE_POMv4 );
@@ -86,7 +86,7 @@
* Gets the string contents of the specified XML file. Note: In contrast to an XML processor, the line separators in
* the returned string will be normalized to use the platform's native line separator. This is basically to save
* another normalization step when writing the string contents back to an XML file.
- *
+ *
* @param file The path to the XML file to read in, must not be <code>null</code>.
* @return The string contents of the XML file.
* @throws IOException If the file could not be opened/read.
@@ -108,7 +108,7 @@
/**
* Normalizes the line separators in the specified string.
- *
+ *
* @param text The string to normalize, may be <code>null</code>.
* @param separator The line separator to use for normalization, typically "\n" or "\r\n", must not be
* <code>null</code>.
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java Tue Jun 24 11:36:49 2008
@@ -33,6 +33,7 @@
import org.apache.maven.shared.release.config.ReleaseDescriptorStore;
import org.apache.maven.shared.release.config.ReleaseDescriptorStoreException;
import org.apache.maven.shared.release.config.ReleaseDescriptorStoreStub;
+import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
import org.apache.maven.shared.release.exec.MavenExecutor;
import org.apache.maven.shared.release.phase.IsScmFileSetEquals;
import org.apache.maven.shared.release.phase.ReleasePhase;
@@ -87,7 +88,7 @@
ReleaseDescriptor releaseDescriptor = configStore.getReleaseConfiguration();
releaseDescriptor.setCompletedPhase( null );
- releaseManager.prepare( new ReleaseDescriptor(), null, null );
+ releaseManager.prepare( new ReleaseDescriptor(), new DefaultReleaseEnvironment(), null );
Map phases = container.lookupMap( ReleasePhase.ROLE );
@@ -110,7 +111,7 @@
ReleaseDescriptor releaseDescriptor = configStore.getReleaseConfiguration();
releaseDescriptor.setCompletedPhase( "step1" );
- releaseManager.prepare( new ReleaseDescriptor(), null, null );
+ releaseManager.prepare( new ReleaseDescriptor(), new DefaultReleaseEnvironment(), null );
Map phases = container.lookupMap( ReleasePhase.ROLE );
@@ -133,7 +134,7 @@
ReleaseDescriptor releaseDescriptor = configStore.getReleaseConfiguration();
releaseDescriptor.setCompletedPhase( "step1" );
- releaseManager.prepare( new ReleaseDescriptor(), null, null, false, false );
+ releaseManager.prepare( new ReleaseDescriptor(), new DefaultReleaseEnvironment(), null, false, false );
Map phases = container.lookupMap( ReleasePhase.ROLE );
@@ -156,7 +157,7 @@
ReleaseDescriptor releaseDescriptor = configStore.getReleaseConfiguration();
releaseDescriptor.setCompletedPhase( "step3" );
- releaseManager.prepare( new ReleaseDescriptor(), null, null );
+ releaseManager.prepare( new ReleaseDescriptor(), new DefaultReleaseEnvironment(), null );
Map phases = container.lookupMap( ReleasePhase.ROLE );
@@ -179,7 +180,7 @@
ReleaseDescriptor releaseDescriptor = configStore.getReleaseConfiguration();
releaseDescriptor.setCompletedPhase( "foo" );
- releaseManager.prepare( new ReleaseDescriptor(), null, null );
+ releaseManager.prepare( new ReleaseDescriptor(), new DefaultReleaseEnvironment(), null );
Map phases = container.lookupMap( ReleasePhase.ROLE );
@@ -202,7 +203,7 @@
ReleaseDescriptor releaseDescriptor = configStore.getReleaseConfiguration();
releaseDescriptor.setCompletedPhase( null );
- releaseManager.prepare( new ReleaseDescriptor(), null, null, true, true );
+ releaseManager.prepare( new ReleaseDescriptor(), new DefaultReleaseEnvironment(), null, true, true );
Map phases = container.lookupMap( ReleasePhase.ROLE );
@@ -225,7 +226,7 @@
ReleaseDescriptor releaseDescriptor = configStore.getReleaseConfiguration();
releaseDescriptor.setCompletedPhase( "step1" );
- releaseManager.prepare( new ReleaseDescriptor(), null, null, true, true );
+ releaseManager.prepare( new ReleaseDescriptor(), new DefaultReleaseEnvironment(), null, true, true );
Map phases = container.lookupMap( ReleasePhase.ROLE );
@@ -248,7 +249,7 @@
ReleaseDescriptor releaseDescriptor = configStore.getReleaseConfiguration();
releaseDescriptor.setCompletedPhase( "step3" );
- releaseManager.prepare( new ReleaseDescriptor(), null, null, true, true );
+ releaseManager.prepare( new ReleaseDescriptor(), new DefaultReleaseEnvironment(), null, true, true );
Map phases = container.lookupMap( ReleasePhase.ROLE );
@@ -271,7 +272,7 @@
ReleaseDescriptor releaseDescriptor = configStore.getReleaseConfiguration();
releaseDescriptor.setCompletedPhase( "foo" );
- releaseManager.prepare( new ReleaseDescriptor(), null, null, true, true );
+ releaseManager.prepare( new ReleaseDescriptor(), new DefaultReleaseEnvironment(), null, true, true );
Map phases = container.lookupMap( ReleasePhase.ROLE );
@@ -293,7 +294,7 @@
try
{
- releaseManager.prepare( new ReleaseDescriptor(), null, null );
+ releaseManager.prepare( new ReleaseDescriptor(), new DefaultReleaseEnvironment(), null );
fail( "Should have failed to find a phase" );
}
catch ( ReleaseExecutionException e )
@@ -320,7 +321,7 @@
try
{
- releaseManager.prepare( releaseDescriptor, null, null );
+ releaseManager.prepare( releaseDescriptor, new DefaultReleaseEnvironment(), null );
fail( "Should have failed to read configuration" );
}
catch ( ReleaseExecutionException e )
@@ -348,7 +349,7 @@
try
{
- releaseManager.prepare( releaseDescriptor, null, null, false, false );
+ releaseManager.prepare( releaseDescriptor, new DefaultReleaseEnvironment(), null, false, false );
fail( "Should have failed to read configuration" );
}
catch ( ReleaseExecutionException e )
@@ -412,7 +413,7 @@
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
- releaseManager.perform( releaseDescriptor, null, null );
+ releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), null );
assertTrue( true );
}
@@ -445,7 +446,7 @@
releaseDescriptor.setUseReleaseProfile( false );
- releaseManager.perform( releaseDescriptor, null, null );
+ releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), null );
assertTrue( true );
}
@@ -478,7 +479,7 @@
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
- releaseManager.perform( releaseDescriptor, null, null );
+ releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), null );
assertTrue( true );
}
@@ -512,7 +513,7 @@
releaseDescriptor.setUseReleaseProfile( false );
- releaseManager.perform( releaseDescriptor, null, null );
+ releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), null );
assertTrue( true );
}
@@ -547,7 +548,7 @@
configStore.getReleaseConfiguration().setCompletedPhase( "end-release" );
releaseManager.setConfigStore( configStore );
- releaseManager.perform( releaseDescriptor, null, null );
+ releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), null );
assertTrue( true );
}
@@ -572,7 +573,7 @@
{
releaseDescriptor.setUseReleaseProfile( false );
- releaseManager.perform( releaseDescriptor, null, null );
+ releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), null );
fail( "Should have failed to read configuration" );
}
catch ( ReleaseExecutionException e )
@@ -599,7 +600,7 @@
{
releaseDescriptor.setUseReleaseProfile( false );
- releaseManager.perform( releaseDescriptor, null, null );
+ releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), null );
fail( "Should have failed to perform" );
}
catch ( ReleaseFailureException e )
@@ -621,7 +622,7 @@
{
releaseDescriptor.setUseReleaseProfile( false );
- releaseManager.perform( releaseDescriptor, null, null );
+ releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), null );
fail( "perform should have failed" );
}
@@ -653,7 +654,7 @@
{
releaseDescriptor.setUseReleaseProfile( false );
- releaseManager.perform( releaseDescriptor, null, null );
+ releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), null );
fail( "commit should have failed" );
}
@@ -685,7 +686,7 @@
{
releaseDescriptor.setUseReleaseProfile( false );
- releaseManager.perform( releaseDescriptor, null, null );
+ releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), null );
fail( "commit should have failed" );
}
@@ -714,7 +715,7 @@
try
{
- releaseManager.perform( releaseDescriptor, null, null );
+ releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), null );
fail( "commit should have failed" );
}
@@ -742,7 +743,7 @@
try
{
- releaseManager.perform( releaseDescriptor, null, null );
+ releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), null );
fail( "commit should have failed" );
}
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java Tue Jun 24 11:36:49 2008
@@ -46,7 +46,7 @@
Commandline cl = factory.createCommandLine( "exec" );
assertEquals( "Check executable", "exec", cl.getExecutable() );
- assertNotNull( "Check environment", cl.getEnvironments() );
- assertFalse( "Check environment", cl.getEnvironments().length == 0 );
+ assertNotNull( "Check environment", cl.getEnvironmentVariables() );
+ assertFalse( "Check environment", cl.getEnvironmentVariables().length == 0 );
}
}
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java?rev=671288&r1=671287&r2=671288&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java Tue Jun 24 11:36:49 2008
@@ -26,6 +26,7 @@
import org.apache.maven.scm.provider.ScmProviderStub;
import org.apache.maven.shared.release.ReleaseExecutionException;
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.ScmRepositoryConfigurator;
@@ -51,7 +52,7 @@
config.setScmUseEditMode( true );
mapNextVersion( config, "groupId:artifactId" );
- phase.execute( config, null, reactorProjects );
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
assertTrue( comparePomFiles( reactorProjects ) );
}
@@ -74,7 +75,7 @@
try
{
- phase.execute( config, null, reactorProjects );
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
fail( "Should have thrown an exception" );
}
@@ -104,7 +105,7 @@
try
{
- phase.execute( config, null, reactorProjects );
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
fail( "Should have thrown an exception" );
}