You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by jv...@apache.org on 2004/06/19 21:01:00 UTC
cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/project/inheritance DefaultModelInheritanceAssembler.java
jvanzyl 2004/06/19 12:01:00
Modified: maven-core/src/main/java/org/apache/maven/project/inheritance
DefaultModelInheritanceAssembler.java
Log:
o inheritance for distributionManagement element
Revision Changes Path
1.2 +7 -4 maven-components/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Index: DefaultModelInheritanceAssembler.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultModelInheritanceAssembler.java 14 Jun 2004 21:32:42 -0000 1.1
+++ DefaultModelInheritanceAssembler.java 19 Jun 2004 19:01:00 -0000 1.2
@@ -78,10 +78,13 @@
child.setSiteDirectory( parent.getSiteDirectory() );
}
- // distributionDirectory
- if ( child.getDistributionDirectory() == null )
+ // ----------------------------------------------------------------------
+ // Distribution
+ // ----------------------------------------------------------------------
+
+ if ( child.getDistributionManagement() == null )
{
- child.setDistributionDirectory( parent.getDistributionDirectory() );
+ child.setDistributionManagement( parent.getDistributionManagement() );
}
// issueManagement