You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2003/05/20 15:55:41 UTC
cvs commit: maven-new/core/src/java/org/apache/maven/project/builder DefaultProjectBuilder.java
jvanzyl 2003/05/20 06:55:41
Modified: core/src/java/org/apache/maven/project/builder
DefaultProjectBuilder.java
Log:
o gracefully ignore missing parent definitions.
Revision Changes Path
1.5 +8 -24 maven-new/core/src/java/org/apache/maven/project/builder/DefaultProjectBuilder.java
Index: DefaultProjectBuilder.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/project/builder/DefaultProjectBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultProjectBuilder.java 20 May 2003 04:06:54 -0000 1.4
+++ DefaultProjectBuilder.java 20 May 2003 13:55:41 -0000 1.5
@@ -23,17 +23,9 @@
public class DefaultProjectBuilder
implements ProjectBuilder
{
- // This should be a component too.
-
/** POM Unmarshaller */
private ProjectUnmarshaller projectUnmarshaller;
- // This should be tracked by Maven not the builder.
-
- /** Map of loaded POMs. */
- private HashMap parentPoms = new HashMap();
-
-
public DefaultProjectBuilder()
{
projectUnmarshaller = new DefaultProjectUnmarshaller();
@@ -105,25 +97,17 @@
File parentPom = new File( pomToExtend );
- // See if we have already processed this POM.
- Project parent = (Project) parentPoms.get( parentPom.getCanonicalPath() );
-
- if ( parent == null )
+ if ( parentPom.exists() )
{
- parent = projectUnmarshaller.parse( new FileReader( parentPom ) );
-
- if ( parent != null )
- {
- parentPoms.put( parentPom.getCanonicalPath(), parent );
- }
- }
+ Project parent = projectUnmarshaller.parse( new FileReader( parentPom ) );
- // Set the parent project.
- project.setParent( parent );
+ // Set the parent project.
+ project.setParent( parent );
- // Now let's do some magic with dependencies. We take all
- // the parent's dependencies and put them in with the childs.
- project.addParentDependencies( parent.getDependencies() );
+ // Now let's do some magic with dependencies. We take all
+ // the parent's dependencies and put them in with the childs.
+ project.addParentDependencies( parent.getDependencies() );
+ }
}
// Set the created context, and put the project itself in the context. This
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org