mirror of https://github.com/apache/maven.git
default to true for resume mode, use default-value for parameter defaults, and leave in parent so release-pom works even if it is now substandard due to some regressions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280745 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
62552ef4ab
commit
ca5253159a
|
@ -141,14 +141,14 @@ public class PrepareReleaseMojo
|
|||
private String tag;
|
||||
|
||||
/**
|
||||
* @parameter expression="${tagBase}"
|
||||
* @parameter expression="${tagBase}" default-value="../tags"
|
||||
*/
|
||||
private String tagBase = "../tags";
|
||||
private String tagBase;
|
||||
|
||||
/**
|
||||
* @parameter expression="${resume}"
|
||||
* @parameter expression="${resume}" default-value="true"
|
||||
*/
|
||||
private boolean resume = false;
|
||||
private boolean resume;
|
||||
|
||||
private String userTag;
|
||||
|
||||
|
@ -829,11 +829,13 @@ public class PrepareReleaseMojo
|
|||
fixNullValueInModel( releaseModel, project.getModel() );
|
||||
|
||||
// Remove parent
|
||||
/* TODO: put this back after it is properly resolved again
|
||||
if ( releaseModel.getParent() != null )
|
||||
{
|
||||
releaseModel.setParent( null );
|
||||
}
|
||||
|
||||
*/
|
||||
Set artifacts = releaseProject.getArtifacts();
|
||||
|
||||
if ( artifacts != null )
|
||||
|
|
Loading…
Reference in New Issue