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 23:26:37 UTC
svn commit: r763811 - in /maven/components/branches/maven-2.0.x: ./
maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Author: bentmann
Date: Thu Apr 9 21:26:37 2009
New Revision: 763811
URL: http://svn.apache.org/viewvc?rev=763811&view=rev
Log:
[MNG-4126] [regression] Properties defined in profiles.xml of parent are not inherited during multimodule build
o Merged from r763796
Modified:
maven/components/branches/maven-2.0.x/ (props changed)
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Propchange: maven/components/branches/maven-2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 9 21:26:37 2009
@@ -1,4 +1,4 @@
/maven/components/branches/maven-2.0.10-RC:708790-728809,728834
/maven/components/branches/maven-2.1.0-RC:753089
-/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,737683,738723,738753,739385,741507,741518,741870,742819,744645,745836,747468,747683,747799,748102,748111,748146,748815,749997
+/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,737683,738723,738753,739385,741507,741518,741870,742819,744645,745836,747468,747683,747799,748102,748111,748146,748815,749997,763796
/maven/components/trunk:720001,721902,726845,729292
Modified: maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=763811&r1=763810&r2=763811&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Thu Apr 9 21:26:37 2009
@@ -817,7 +817,7 @@
MavenProject project = null;
try
{
- project = assembleLineage( model, lineage, config, projectDir, parentSearchRepositories,
+ project = assembleLineage( model, lineage, config, projectDescriptor, parentSearchRepositories,
aggregatedRemoteWagonRepositories, strict );
}
catch ( InvalidRepositoryException e )
@@ -1131,7 +1131,7 @@
private MavenProject assembleLineage( Model model,
LinkedList lineage,
ProjectBuilderConfiguration config,
- File projectDir,
+ File projectDescriptor,
List parentSearchRepositories,
Set aggregatedRemoteWagonRepositories,
boolean strict )
@@ -1139,6 +1139,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 )
@@ -1193,6 +1199,7 @@
MavenProject project = new MavenProject( model );
+ project.setFile( projectDescriptor );
project.setActiveProfiles( activeProfiles );
project.setOriginalModel( originalModel );
@@ -1378,22 +1385,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 );