You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/09/03 23:41:54 UTC
svn commit: r691797 - in /maven/components/branches/maven-2.1.x: ./
maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java
Author: jdcasey
Date: Wed Sep 3 14:41:54 2008
New Revision: 691797
URL: http://svn.apache.org/viewvc?rev=691797&view=rev
Log:
[MNG-3740] Merging fix from r691793 on RC branch.
Modified:
maven/components/branches/maven-2.1.x/ (props changed)
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java (props changed)
Propchange: maven/components/branches/maven-2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 3 14:41:54 2008
@@ -1,4 +1,4 @@
/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882
/maven/components/branches/maven-2.0.x:679552-679867
-/maven/components/branches/maven-2.1.0-M1-RC:690315
+/maven/components/branches/maven-2.1.0-M1-RC:690315,691793
/maven/components/branches/maven-2.1.0-RC:688883,689695,689990
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=691797&r1=691796&r2=691797&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 Wed Sep 3 14:41:54 2008
@@ -1833,7 +1833,12 @@
private void calculateConcreteStateInternal( MavenProject project, ProjectBuilderConfiguration config, boolean processProjectReferences, Set processedProjects )
throws ModelInterpolationException
{
- restoreDynamicState( project, config, false );
+ if ( processProjectReferences )
+ {
+ processedProjects.add( project.getId() );
+ }
+
+ restoreDynamicStateInternal( project, config, processProjectReferences, processProjectReferences ? new HashSet( processedProjects ) : null );
if ( !project.isConcrete() )
{
@@ -1914,7 +1919,6 @@
if ( processProjectReferences )
{
- processedProjects.add( project.getId() );
calculateConcreteProjectReferences( project, config, processedProjects );
}
}
@@ -2003,6 +2007,11 @@
private void restoreDynamicStateInternal( MavenProject project, ProjectBuilderConfiguration config, boolean processProjectReferences, Set processedProjects )
throws ModelInterpolationException
{
+ if ( processProjectReferences )
+ {
+ processedProjects.add( project.getId() );
+ }
+
if ( project.isConcrete() && projectWasChanged( project ) )
{
if ( project.getParent() != null )
@@ -2023,7 +2032,6 @@
if ( processProjectReferences )
{
- processedProjects.add( project.getId() );
restoreDynamicProjectReferences( project, config, processedProjects );
}
}
Propchange: maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 3 14:41:54 2008
@@ -1,2 +1,2 @@
-/maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:690315
+/maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:690315,691793
/maven/components/branches/maven-2.1.0-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:688883,689695,689990