Author: jvanzyl
Date: Mon May 11 04:53:55 2009
New Revision: 773466
URL: http://svn.apache.org/viewvc?rev=773466&view=rev
Log:
o hack is no longer required to set the project.build.directory
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=773466&r1=773465&r2=773466&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Mon May 11 04:53:55 2009
@@ -218,8 +218,6 @@
project.setFile( pomFile );
project.setActiveProfiles( projectProfiles );
- setBuildOutputDirectoryOnParent( project );
-
projectCache.put( pomFile.getAbsolutePath(), project );
return project;
@@ -502,16 +500,6 @@
return ArtifactUtils.versionlessKey( gid, aid );
}
- private static void setBuildOutputDirectoryOnParent( MavenProject project )
- {
- MavenProject parent = project.getParent();
- if ( parent != null && parent.getFile() != null &&
parent.getModel().getBuild() != null )
- {
- parent.getModel().getBuild().setDirectory(
parent.getFile().getAbsolutePath() );
- setBuildOutputDirectoryOnParent( parent );
- }
- }
-
/**
* Returns true if the relative path of the specified parent references a
pom, otherwise returns
* false.
