You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ev...@apache.org on 2005/05/18 09:53:18 UTC
svn commit: r170717 - in
/maven/components/trunk/maven-plugins/maven-release-plugin: pom.xml
src/main/java/org/apache/maven/plugin/release/AbstractReleaseMojo.java
src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java
Author: evenisse
Date: Wed May 18 00:53:16 2005
New Revision: 170717
URL: http://svn.apache.org/viewcvs?rev=170717&view=rev
Log:
Use plexus-input-handler instead of System.in
Modified:
maven/components/trunk/maven-plugins/maven-release-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/AbstractReleaseMojo.java
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java
Modified: maven/components/trunk/maven-plugins/maven-release-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/pom.xml?rev=170717&r1=170716&r2=170717&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-release-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-release-plugin/pom.xml Wed May 18 00:53:16 2005
@@ -40,5 +40,10 @@
<artifactId>jaxen</artifactId>
<version>1.0-FCS</version>
</dependency>
+ <dependency>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-input-handler</artifactId>
+ <version>1.0-alpha-1-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
Modified: maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/AbstractReleaseMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/AbstractReleaseMojo.java?rev=170717&r1=170716&r2=170717&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/AbstractReleaseMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/AbstractReleaseMojo.java Wed May 18 00:53:16 2005
@@ -111,6 +111,11 @@
return scm;
}
+ public PlexusContainer getContainer()
+ {
+ return container;
+ }
+
public void execute()
throws MojoExecutionException
{
Modified: maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java?rev=170717&r1=170716&r2=170717&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java Wed May 18 00:53:16 2005
@@ -28,6 +28,7 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
+import org.codehaus.plexus.components.inputhandler.InputHandler;
import org.codehaus.plexus.util.StringUtils;
import java.io.BufferedReader;
@@ -71,15 +72,15 @@
protected void executeTask()
throws MojoExecutionException
{
- //checkStatus();
+ checkStatus();
- //checkDependencies();
+ checkDependencies();
transformPom();
- //checkin();
+ checkin();
- //tag();
+ tag();
}
private boolean isSnapshot( String version )
@@ -185,14 +186,14 @@
try
{
getLog().info( "What is the new version? [" + projectVersion + "]" );
- BufferedReader input = new BufferedReader( new InputStreamReader( System.in ) );
- String inputVersion = input.readLine();
+ InputHandler handler = (InputHandler) getContainer().lookup( InputHandler.ROLE );
+ String inputVersion = handler.readLine();
if ( !StringUtils.isEmpty( inputVersion ) )
{
projectVersion = inputVersion;
}
}
- catch ( IOException e )
+ catch ( Exception e )
{
throw new MojoExecutionException( "Can't read user input.", e );
}
@@ -284,8 +285,8 @@
if ( getScm().getTag() == null )
{
getLog().info( "What is the new tag name?" );
- BufferedReader input = new BufferedReader( new InputStreamReader( System.in ) );
- getScm().setTag( input.readLine() );
+ InputHandler handler = (InputHandler) getContainer().lookup( InputHandler.ROLE );
+ getScm().setTag( handler.readLine() );
}
getScm().tag();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org