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

Fix release pom creation for some null values 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279798 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Emmanuel Venisse 2005-09-09 15:34:31 +00:00
parent f4239df692
commit d2488680e1
1 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,7 @@ import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties;
import java.util.Set; import java.util.Set;
/** /**
@ -825,6 +826,7 @@ public class PrepareReleaseMojo
MavenProject releaseProject = new MavenProject( project ); MavenProject releaseProject = new MavenProject( project );
Model releaseModel = releaseProject.getOriginalModel(); Model releaseModel = releaseProject.getOriginalModel();
fixNullValueInModel( releaseModel, project.getModel() );
// Remove parent // Remove parent
if ( releaseModel.getParent() != null ) if ( releaseModel.getParent() != null )
@ -970,6 +972,43 @@ public class PrepareReleaseMojo
} }
} }
private void fixNullValueInModel( Model modelToFix, Model correctModel )
{
modelToFix.setModelVersion( correctModel.getModelVersion() );
modelToFix.setName( correctModel.getName() );
modelToFix.setParent( cloneParent( correctModel.getParent() ) );
modelToFix.setVersion( correctModel.getVersion() );
modelToFix.setArtifactId( correctModel.getArtifactId() );
modelToFix.setProperties( new Properties( correctModel.getProperties() ) );
modelToFix.setGroupId( correctModel.getGroupId() );
modelToFix.setPackaging( correctModel.getPackaging() );
modelToFix.setModules( cloneModules( correctModel.getModules() ) );
}
private static List cloneModules( List modules )
{
if ( modules == null )
{
return modules;
}
return new ArrayList( modules );
}
private static Parent cloneParent( Parent parent )
{
if ( parent == null )
{
return parent;
}
Parent newParent = new Parent();
newParent.setArtifactId( parent.getArtifactId() );
newParent.setGroupId( parent.getGroupId() );
newParent.setRelativePath( parent.getRelativePath() );
newParent.setVersion( parent.getVersion() );
return newParent;
}
private String resolveVersion( Artifact artifact, String artifactUsage, MavenProject project ) private String resolveVersion( Artifact artifact, String artifactUsage, MavenProject project )
throws MojoExecutionException throws MojoExecutionException
{ {