You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/04/09 22:58:19 UTC
svn commit: r763796 -
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Author: bentmann
Date: Thu Apr 9 20:58:18 2009
New Revision: 763796
URL: http://svn.apache.org/viewvc?rev=763796&view=rev
Log:
[MNG-4126] [regression] Properties defined in profiles.xml of parent are not inherited during multimodule build
Submitted by: Denis Dudinski
o Applied with minor modifications
Modified:
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified: maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=763796&r1=763795&r2=763796&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Thu Apr 9 20:58:18 2009
@@ -820,7 +820,7 @@
MavenProject project = null;
try
{
- project = assembleLineage( model, lineage, config, projectDir, parentSearchRepositories,
+ project = assembleLineage( model, lineage, config, projectDescriptor, parentSearchRepositories,
aggregatedRemoteWagonRepositories, strict );
}
catch ( InvalidRepositoryException e )
@@ -1159,7 +1159,7 @@
private MavenProject assembleLineage( Model model,
LinkedList lineage,
ProjectBuilderConfiguration config,
- File projectDir,
+ File projectDescriptor,
List parentSearchRepositories,
Set aggregatedRemoteWagonRepositories,
boolean strict )
@@ -1167,6 +1167,12 @@
{
Model originalModel = ModelUtils.cloneModel( model );
+ File projectDir = null;
+ if ( projectDescriptor != null )
+ {
+ projectDir = projectDescriptor.getAbsoluteFile().getParentFile();
+ }
+
ProfileManager externalProfileManager = config.getGlobalProfileManager();
ProfileManager profileManager;
if ( externalProfileManager != null )
@@ -1221,6 +1227,7 @@
MavenProject project = new MavenProject( model, getLogger() );
+ project.setFile( projectDescriptor );
project.setActiveProfiles( activeProfiles );
project.setOriginalModel( originalModel );
@@ -1406,22 +1413,14 @@
projectId + " has wrong packaging: " + model.getPackaging() + ". Must be 'pom'." );
}
- File parentProjectDir = null;
- if ( parentDescriptor != null )
- {
- parentProjectDir = parentDescriptor.getParentFile();
- }
-
MavenProject parent = assembleLineage( model,
lineage,
config,
- parentProjectDir,
+ parentDescriptor,
parentSearchRepositories,
aggregatedRemoteWagonRepositories,
strict );
- parent.setFile( parentDescriptor );
-
project.setParent( parent );
project.setParentArtifact( parentArtifact );