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/09/13 14:14:57 UTC
svn commit: r280545 -
/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
Author: evenisse
Date: Tue Sep 13 05:14:53 2005
New Revision: 280545
URL: http://svn.apache.org/viewcvs?rev=280545&view=rev
Log:
Update releasePom fields only if fields are null
Modified:
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
Modified: maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java?rev=280545&r1=280544&r2=280545&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java Tue Sep 13 05:14:53 2005
@@ -974,16 +974,55 @@
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() ) );
- modelToFix.setDistributionManagement( correctModel.getDistributionManagement() );
+ if ( modelToFix.getModelVersion() != null )
+ {
+ modelToFix.setModelVersion( correctModel.getModelVersion() );
+ }
+
+ if ( modelToFix.getName() != null )
+ {
+ modelToFix.setName( correctModel.getName() );
+ }
+
+ if ( modelToFix.getParent() != null )
+ {
+ modelToFix.setParent( cloneParent( correctModel.getParent() ) );
+ }
+
+ if ( modelToFix.getVersion() != null )
+ {
+ modelToFix.setVersion( correctModel.getVersion() );
+ }
+
+ if ( modelToFix.getArtifactId() != null )
+ {
+ modelToFix.setArtifactId( correctModel.getArtifactId() );
+ }
+
+ if ( modelToFix.getProperties() != null && modelToFix.getProperties().isEmpty() )
+ {
+ modelToFix.setProperties( new Properties( correctModel.getProperties() ) );
+ }
+
+ if ( modelToFix.getGroupId() != null )
+ {
+ modelToFix.setGroupId( correctModel.getGroupId() );
+ }
+
+ if ( modelToFix.getPackaging() != null )
+ {
+ modelToFix.setPackaging( correctModel.getPackaging() );
+ }
+
+ if ( modelToFix.getModules() != null && !modelToFix.getModules().isEmpty() )
+ {
+ modelToFix.setModules( cloneModules( correctModel.getModules() ) );
+ }
+
+ if ( modelToFix.getDistributionManagement() != null )
+ {
+ modelToFix.setDistributionManagement( correctModel.getDistributionManagement() );
+ }
}
private static List cloneModules( List modules )
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org