Author: brett
Date: Tue May 2 18:49:16 2006
New Revision: 399105
URL: http://svn.apache.org/viewcvs?rev=399105&view=rev
Log:
[MRELEASE-98] misc fixes for perform
Modified:
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/DefaultReleaseManager.java
Modified:
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java?rev=399105&r1=399104&r2=399105&view=diff
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
(original)
+++
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
Tue May 2 18:49:16 2006
@@ -19,6 +19,7 @@
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.release.config.ReleaseConfiguration;
import org.apache.maven.profiles.Profile;
+import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
import java.io.File;
@@ -82,7 +83,7 @@
* @required
* @readonly
*/
- private Settings project;
+ private MavenProject project;
/**
* @component
Modified:
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/DefaultReleaseManager.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/DefaultReleaseManager.java?rev=399105&r1=399104&r2=399105&view=diff
==============================================================================
---
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/DefaultReleaseManager.java
(original)
+++
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/DefaultReleaseManager.java
Tue May 2 18:49:16 2006
@@ -190,8 +190,7 @@
CheckOutScmResult result;
try
{
- result = provider.checkOut( repository, new ScmFileSet(
releaseConfiguration.getWorkingDirectory() ),
- config.getReleaseLabel() );
+ result = provider.checkOut( repository, new ScmFileSet(
checkoutDirectory ), config.getReleaseLabel() );
}
catch ( ScmException e )
{