Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use plexus-input-handler instead of System.in 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170717 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Emmanuel Venisse 2005-05-18 07:53:16 +00:00
parent ecde534c5a
commit c4db798207
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maven-plugins/maven-release-plugin/pom.xml
View File

@ -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>

5
maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/AbstractReleaseMojo.java
View File

@ -111,6 +111,11 @@ protected ScmBean getScm()
return scm;
}
public PlexusContainer getContainer()
{
return container;
}
public void execute()
throws MojoExecutionException
{

19
maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java
View File

@ -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 @@ public class PrepareReleaseMojo
protected void executeTask()
throws MojoExecutionException
{
//checkStatus();
checkStatus();
//checkDependencies();
checkDependencies();
transformPom();
//checkin();
checkin();
//tag();
tag();
}
private boolean isSnapshot( String version )
@ -185,14 +186,14 @@ private void transformPom()
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 @@ private void tag()
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();
}