Author: jdcasey
Date: Thu Sep 11 09:42:51 2008
New Revision: 694345
URL: http://svn.apache.org/viewvc?rev=694345&view=rev
Log:
Fixing executionProject sync, merged from 688259 of 2.1.0-M1-RC branch.
Modified:
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java
(props changed)
maven/components/branches/maven-2.1.x/pom.xml
Modified:
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=694345&r1=694344&r2=694345&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Thu Sep 11 09:42:51 2008
@@ -703,20 +703,30 @@
{
throw new LifecycleExecutionException( e.getMessage(), e );
}
-
- // NOTE: Ordinarily, we might be tempted to set all pertinent
executionProjects
- // to null here, to release some memory. HOWEVER, the problem is
that
- // the reactorProjects construct doesn't track successive levels of
- // forked execution properly, so we MUST NOT SET THE
executionProject
- // INSTANCES TO NULL. If we do this inside a two-or-more-level-deep
- // fork, it can result in passing a null project instance through
- // to the plugin manager, since successive iterations of the n-1
- // fork to execute fork n with each project in reactorProjects MUST
- // HAVE ACCESS TO THE executionProject for every project.
- //
- // Just please don't set executionProjects == null here. Not until
- // we have a mechanism for tracking (stack push/pull) successive
- // forked lifecycles in the reactorProjects collection.
+
+ if ( hasFork )
+ {
+ project.setExecutionProject( null );
+
+ if ( usesReactorProjects )
+ {
+ List reactorProjects = session.getSortedProjects();
+ for ( Iterator it = reactorProjects.iterator();
it.hasNext(); )
+ {
+ MavenProject reactorProject = (MavenProject) it.next();
+ reactorProject.setExecutionProject( null );
+ }
+ }
+ }
+
+// if ( usesReactorProjects )
+// {
+// restoreAllDynamicStates( session );
+// }
+// else
+// {
+// restoreDynamicState( project, session, true );
+// }
}
}
Modified:
maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java?rev=694345&r1=694344&r2=694345&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
Thu Sep 11 09:42:51 2008
@@ -563,8 +563,7 @@
assertEquals( "First test source root should be absolute ref to
src/test/java", new File( basedir, "src/test/java" ).getAbsolutePath(),
project.getTestCompileSourceRoots().get( 0 ) );
assertEquals( "Before adding source roots, project should contain one
script source root", 1, project.getScriptSourceRoots().size() );
- // TODO: MNG-3731
-// assertEquals( "First script source root should be absolute ref to
src/main/scripts", new File( basedir, "src/main/scripts" ).getAbsolutePath(),
project.getScriptSourceRoots().get( 0 ) );
+ assertEquals( "First script source root should be absolute ref to
src/main/scripts", new File( basedir, "src/main/scripts" ).getAbsolutePath(),
project.getScriptSourceRoots().get( 0 ) );
project.addCompileSourceRoot( new File( basedir,
"target/generated/src/main/java" ).getAbsolutePath() );
project.addTestCompileSourceRoot( new File( basedir,
"target/generated/src/test/java" ).getAbsolutePath() );
@@ -586,10 +585,8 @@
assertEquals( "Second test source root should be absolute ref to
target/generated/src/test/java", new File( basedir,
"target/generated/src/test/java" ).getAbsolutePath(),
project.getTestCompileSourceRoots().get( 1 ) );
assertEquals( "After adding source roots and transitioning, project
should contain two script source roots", 2,
project.getScriptSourceRoots().size() );
-
- // TODO: MNG-3731
-// assertEquals( "First script source root should be absolute ref to
src/main/scripts", new File( basedir, "src/main/scripts" ).getAbsolutePath(),
project.getScriptSourceRoots().get( 0 ) );
-// assertEquals( "Second script source root should be absolute ref to
target/generated/src/main/scripts", new File( basedir,
"target/generated/src/main/scripts" ).getAbsolutePath(),
project.getScriptSourceRoots().get( 1 ) );
+ assertEquals( "First script source root should be absolute ref to
src/main/scripts", new File( basedir, "src/main/scripts" ).getAbsolutePath(),
project.getScriptSourceRoots().get( 0 ) );
+ assertEquals( "Second script source root should be absolute ref to
target/generated/src/main/scripts", new File( basedir,
"target/generated/src/main/scripts" ).getAbsolutePath(),
project.getScriptSourceRoots().get( 1 ) );
}
public void testShouldInterpolatePluginLevelDependency()
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 Thu Sep 11 09:42:51 2008
@@ -1,2 +1,3 @@
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:688259
/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
Modified: maven/components/branches/maven-2.1.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/pom.xml?rev=694345&r1=694344&r2=694345&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/pom.xml Thu Sep 11 09:42:51 2008
@@ -194,7 +194,7 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-20</version>
+ <version>1.0-alpha-13</version>
<executions>
<execution>
<id>site-docs</id>
@@ -233,6 +233,16 @@
<exclude>org/apache/maven/project/inheritance/ModelInheritanceAssembler*</exclude>
<exclude>org/apache/maven/execution/MavenExecutionRequest*</exclude>
<exclude>org/apache/maven/plugin/DefaultPluginManager*</exclude>
+
+ <!-- these are differences in methods that SHOULD BE PRIVATE -->
+
<exclude>org/apache/maven/settings/io/xpp3/SettingsXpp3Reader*</exclude>
+
<exclude>org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Reader*</exclude>
+
<exclude>org/apache/maven/model/io/xpp3/MavenXpp3Reader*</exclude>
+
<exclude>org/apache/maven/usability/plugin/io/xpp3/ParamdocXpp3Reader*</exclude>
+
<exclude>org/apache/maven/profiles/io/xpp3/ProfilesXpp3Reader*</exclude>
+
<exclude>org/apache/maven/plugin/registry/io/xpp3/PluginRegistryXpp3Reader*</exclude>
+
<exclude>org/apache/maven/plugin/lifecycle/io/xpp3/LifecycleMappingsXpp3Reader*</exclude>
+
<exclude>org/apache/maven/toolchain/model/io/xpp3/MavenToolchainsXpp3Reader*</exclude>
</excludes>
</configuration>
</plugin>
@@ -387,7 +397,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
