You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/10/12 09:41:39 UTC
svn commit: r314814 - in
/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release:
PerformReleaseMojo.java PrepareReleaseMojo.java
Author: brett
Date: Wed Oct 12 00:41:34 2005
New Revision: 314814
URL: http://svn.apache.org/viewcvs?rev=314814&view=rev
Log:
cleanup tags, and only use batch mode when it was what was originally used to run maven
Modified:
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
Modified: maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java?rev=314814&r1=314813&r2=314814&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java Wed Oct 12 00:41:34 2005
@@ -16,11 +16,6 @@
* limitations under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.maven.model.Profile;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.release.helpers.ReleaseProgressTracker;
@@ -32,6 +27,11 @@
import org.codehaus.plexus.util.cli.DefaultConsumer;
import org.codehaus.plexus.util.cli.StreamConsumer;
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
/**
* Perform a release from SCM
*
@@ -60,14 +60,21 @@
* @required
*/
protected String workingDirectory;
-
+
/**
* @parameter expression="${project}"
* @required
* @readonly
*/
protected MavenProject project;
-
+
+ /**
+ * @parameter expression="${settings.interactiveMode}"
+ * @required
+ * @readonly
+ */
+ private boolean interactive;
+
private ReleaseProgressTracker releaseProgress;
protected void executeTask()
@@ -114,37 +121,40 @@
cl.createArgument().setLine( "--no-plugin-updates" );
- cl.createArgument().setLine( "--batch-mode" );
-
+ if ( !interactive )
+ {
+ cl.createArgument().setLine( "--batch-mode" );
+ }
+
List profiles = project.getActiveProfiles();
-
+
if ( profiles != null && !profiles.isEmpty() )
{
StringBuffer buffer = new StringBuffer();
-
+
buffer.append( "-P " );
-
+
for ( Iterator it = profiles.iterator(); it.hasNext(); )
{
Profile profile = (Profile) it.next();
-
+
buffer.append( profile.getId() ).append( "," );
}
-
+
buffer.setLength( buffer.length() - 1 );
-
+
cl.createArgument().setLine( buffer.toString() );
}
-
+
StreamConsumer consumer = new DefaultConsumer();
try
{
int result = CommandLineUtils.executeCommandLine( cl, consumer, consumer );
-
+
if ( result != 0 )
{
- throw new MojoExecutionException("Result of m2 execution is: \'" + result + "\'. Release failed." );
+ throw new MojoExecutionException( "Result of m2 execution is: \'" + result + "\'. Release failed." );
}
}
catch ( CommandLineException e )
Modified: maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java?rev=314814&r1=314813&r2=314814&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java Wed Oct 12 00:41:34 2005
@@ -16,19 +16,6 @@
* limitations under the License.
*/
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
@@ -62,6 +49,19 @@
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
/**
* Prepare for a release in SCM
*
@@ -96,12 +96,12 @@
private boolean interactive;
/**
- * @component role="org.apache.maven.artifact.metadata.ArtifactMetadataSource"
+ * @component
*/
private ArtifactMetadataSource artifactMetadataSource;
/**
- * @component role="org.apache.maven.plugin.version.PluginVersionManager"
+ * @component
*/
private PluginVersionManager pluginVersionManager;
@@ -218,7 +218,8 @@
try
{
- getReleaseProgress().checkpoint( basedir.getAbsolutePath(), ReleaseProgressTracker.CP_POM_TRANSFORMED_FOR_RELEASE );
+ getReleaseProgress().checkpoint( basedir.getAbsolutePath(),
+ ReleaseProgressTracker.CP_POM_TRANSFORMED_FOR_RELEASE );
}
catch ( IOException e )
{
@@ -266,7 +267,8 @@
try
{
- getReleaseProgress().checkpoint( basedir.getAbsolutePath(), ReleaseProgressTracker.CP_PREPARED_RELEASE );
+ getReleaseProgress().checkpoint( basedir.getAbsolutePath(),
+ ReleaseProgressTracker.CP_PREPARED_RELEASE );
}
catch ( IOException e )
{
@@ -407,7 +409,8 @@
}
catch ( IOException e )
{
- getLog().warn( "Cannot read existing release progress file from directory: " + basedir.getAbsolutePath() + "." );
+ getLog().warn(
+ "Cannot read existing release progress file from directory: " + basedir.getAbsolutePath() + "." );
getLog().debug( "Cause", e );
releaseProgress = ReleaseProgressTracker.create();
@@ -527,7 +530,8 @@
try
{
- getReleaseProgress().checkpoint( basedir.getAbsolutePath(), ReleaseProgressTracker.CP_LOCAL_MODIFICATIONS_CHECKED );
+ getReleaseProgress().checkpoint( basedir.getAbsolutePath(),
+ ReleaseProgressTracker.CP_LOCAL_MODIFICATIONS_CHECKED );
}
catch ( IOException e )
{
@@ -586,8 +590,8 @@
{
Artifact artifact = (Artifact) i.next();
- String artifactVersion = getVersionResolver().getResolvedVersion( artifact.getGroupId(),
- artifact.getArtifactId() );
+ String artifactVersion =
+ getVersionResolver().getResolvedVersion( artifact.getGroupId(), artifact.getArtifactId() );
if ( artifactVersion == null )
{
@@ -606,8 +610,8 @@
{
Artifact artifact = (Artifact) i.next();
- String artifactVersion = getVersionResolver().getResolvedVersion( artifact.getGroupId(),
- artifact.getArtifactId() );
+ String artifactVersion =
+ getVersionResolver().getResolvedVersion( artifact.getGroupId(), artifact.getArtifactId() );
if ( artifactVersion == null )
{
@@ -672,8 +676,8 @@
// Avoid in dep mgmt
if ( dep.getVersion() != null )
{
- String resolvedVersion = getVersionResolver().getResolvedVersion( dep.getGroupId(),
- dep.getArtifactId() );
+ String resolvedVersion =
+ getVersionResolver().getResolvedVersion( dep.getGroupId(), dep.getArtifactId() );
if ( resolvedVersion != null )
{
@@ -694,8 +698,8 @@
if ( dep.getVersion() != null )
{
- String resolvedVersion = getVersionResolver().getResolvedVersion( dep.getGroupId(),
- dep.getArtifactId() );
+ String resolvedVersion =
+ getVersionResolver().getResolvedVersion( dep.getGroupId(), dep.getArtifactId() );
if ( resolvedVersion != null )
{
@@ -721,8 +725,8 @@
// Avoid in plugin mgmt
if ( plugin.getVersion() != null )
{
- String resolvedVersion = getVersionResolver().getResolvedVersion( plugin.getGroupId(),
- plugin.getArtifactId() );
+ String resolvedVersion =
+ getVersionResolver().getResolvedVersion( plugin.getGroupId(), plugin.getArtifactId() );
if ( resolvedVersion != null )
{
@@ -743,8 +747,8 @@
if ( plugin.getVersion() != null )
{
- String resolvedVersion = getVersionResolver().getResolvedVersion( plugin.getGroupId(),
- plugin.getArtifactId() );
+ String resolvedVersion =
+ getVersionResolver().getResolvedVersion( plugin.getGroupId(), plugin.getArtifactId() );
if ( resolvedVersion != null )
{
@@ -761,8 +765,8 @@
{
Extension ext = (Extension) i.next();
- String resolvedVersion = getVersionResolver().getResolvedVersion( ext.getGroupId(),
- ext.getArtifactId() );
+ String resolvedVersion =
+ getVersionResolver().getResolvedVersion( ext.getGroupId(), ext.getArtifactId() );
if ( resolvedVersion != null )
{
@@ -782,8 +786,8 @@
{
ReportPlugin plugin = (ReportPlugin) i.next();
- String resolvedVersion = getVersionResolver().getResolvedVersion( plugin.getGroupId(),
- plugin.getArtifactId() );
+ String resolvedVersion =
+ getVersionResolver().getResolvedVersion( plugin.getGroupId(), plugin.getArtifactId() );
if ( resolvedVersion != null )
{
@@ -848,8 +852,8 @@
{
String snapshotVersion = projectVersion;
- projectVersion = getVersionResolver().getResolvedVersion( project.getGroupId(),
- project.getArtifactId() );
+ projectVersion =
+ getVersionResolver().getResolvedVersion( project.getGroupId(), project.getArtifactId() );
if ( ArtifactUtils.isSnapshot( projectVersion ) )
{
@@ -1001,8 +1005,8 @@
Artifact artifact = (Artifact) extensionArtifacts.get( extensionId );
- String version = resolveVersion( artifact, "extension",
- releaseProject.getPluginArtifactRepositories() );
+ String version =
+ resolveVersion( artifact, "extension", releaseProject.getPluginArtifactRepositories() );
ext.setVersion( version );
}
@@ -1050,7 +1054,8 @@
try
{
- getReleaseProgress().checkpoint( basedir.getAbsolutePath(), ReleaseProgressTracker.CP_GENERATED_RELEASE_POM );
+ getReleaseProgress().checkpoint( basedir.getAbsolutePath(),
+ ReleaseProgressTracker.CP_GENERATED_RELEASE_POM );
}
catch ( IOException e )
{
@@ -1140,8 +1145,8 @@
private String resolveVersion( Artifact artifact, String artifactUsage, List pluginArtifactRepositories )
throws MojoExecutionException
{
- String resolvedVersion = getVersionResolver().getResolvedVersion( artifact.getGroupId(),
- artifact.getArtifactId() );
+ String resolvedVersion =
+ getVersionResolver().getResolvedVersion( artifact.getGroupId(), artifact.getArtifactId() );
if ( resolvedVersion == null )
{
@@ -1180,7 +1185,8 @@
try
{
- getReleaseProgress().checkpoint( basedir.getAbsolutePath(), ReleaseProgressTracker.CP_CHECKED_IN_RELEASE_VERSION );
+ getReleaseProgress().checkpoint( basedir.getAbsolutePath(),
+ ReleaseProgressTracker.CP_CHECKED_IN_RELEASE_VERSION );
}
catch ( IOException e )
{
@@ -1232,7 +1238,8 @@
try
{
- getReleaseProgress().checkpoint( basedir.getAbsolutePath(), ReleaseProgressTracker.CP_REMOVED_RELEASE_POM );
+ getReleaseProgress().checkpoint( basedir.getAbsolutePath(),
+ ReleaseProgressTracker.CP_REMOVED_RELEASE_POM );
}
catch ( IOException e )
{
@@ -1267,7 +1274,8 @@
try
{
- getReleaseProgress().checkpoint( basedir.getAbsolutePath(), ReleaseProgressTracker.CP_CHECKED_IN_DEVELOPMENT_VERSION );
+ getReleaseProgress().checkpoint( basedir.getAbsolutePath(),
+ ReleaseProgressTracker.CP_CHECKED_IN_DEVELOPMENT_VERSION );
}
catch ( IOException e )
{