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

o the getScm() call creates a new instance of the scm bean so I corrected some 

spots where it was being used because it was assuming the target/checkout
  directory for the prepare phase. this needs a touch of work but i left
  it pretty much as is to get it working. i have successfully prepared
  for the release and now i'm going to try and perform the release.
  


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@171239 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2005-05-21 19:08:10 +00:00
parent e801e4af69
commit eb4631e6f2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -338,6 +338,8 @@ private void tag()
{ {
ScmBean scm = getScm(); ScmBean scm = getScm();
scm.setWorkingDirectory( basedir );
if ( scm.getTag() == null ) if ( scm.getTag() == null )
{ {
getLog().info( "What tag name should be used? [ " + tag + " ]" ); getLog().info( "What tag name should be used? [ " + tag + " ]" );
@ -354,7 +356,7 @@ private void tag()
scm.setTag( tag ); scm.setTag( tag );
} }
getScm().tag(); scm.tag();
} }
catch ( Exception e ) catch ( Exception e )
{ {

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

@ -175,7 +175,8 @@ public void checkin( String message, String includes, String excludes )
CheckInScmResult result = getScmManager().checkIn( repository, CheckInScmResult result = getScmManager().checkIn( repository,
new ScmFileSet( new File( workingDirectory ), includes, excludes ), new ScmFileSet( new File( workingDirectory ), includes, excludes ),
tag, message ); tag,
message );
checkResult( result ); checkResult( result );
} }
@ -217,6 +218,8 @@ public String getTag()
public void setWorkingDirectory( String workingDirectory ) public void setWorkingDirectory( String workingDirectory )
{ {
FileUtils.mkdir( workingDirectory );
this.workingDirectory = workingDirectory; this.workingDirectory = workingDirectory;
} }