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/08 18:59:07 UTC
svn commit: r693165 - in /maven/components/branches/maven-2.1.0-M1-RC:
maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven-project/src/main/java/org/apache/maven/project/MavenProject.java
pom.xml
Author: jdcasey
Date: Mon Sep 8 09:59:05 2008
New Revision: 693165
URL: http://svn.apache.org/viewvc?rev=693165&view=rev
Log:
[MNG-3743] Found a more correct way of fixing this error, and now I've replicated the problem in an integration test to verify this fix.
Modified:
maven/components/branches/maven-2.1.0-M1-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/branches/maven-2.1.0-M1-RC/pom.xml
Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=693165&r1=693164&r2=693165&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.0-M1-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/branches/maven-2.1.0-M1-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Mon Sep 8 09:59:05 2008
@@ -1023,6 +1023,8 @@
MavenProject project )
throws LifecycleExecutionException, BuildFailureException, PluginNotFoundException
{
+ project = project.getExecutionProject();
+
forkEntryPoints.push( mojoDescriptor );
PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
@@ -1172,15 +1174,13 @@
{
Lifecycle lifecycle = getLifecycleForPhase( targetPhase );
- executeGoalWithLifecycle( targetPhase, forkEntryPoints, session, lifecycleMappings, project.getExecutionProject(),
- lifecycle );
+ executeGoalWithLifecycle( targetPhase, forkEntryPoints, session, lifecycleMappings, project, lifecycle );
}
else
{
String goal = mojoDescriptor.getExecuteGoal();
MojoDescriptor desc = getMojoDescriptor( pluginDescriptor, goal );
- executeGoals( Collections.singletonList( new MojoExecution( desc ) ), forkEntryPoints, session,
- project.getExecutionProject() );
+ executeGoals( Collections.singletonList( new MojoExecution( desc ) ), forkEntryPoints, session, project );
}
}
Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=693165&r1=693164&r2=693165&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Mon Sep 8 09:59:05 2008
@@ -1434,36 +1434,36 @@
}
}
- PluginManagement pluginManagement = getBuild().getPluginManagement();
- if ( pluginManagement != null && pluginManagement.getPlugins() != null )
- {
- for ( Iterator iterator = pluginManagement.getPlugins().iterator(); iterator.hasNext(); )
- {
- Plugin plugin = (Plugin) iterator.next();
-
- if ( pluginGroupId.equals( plugin.getGroupId() ) && pluginArtifactId.equals( plugin.getArtifactId() ) )
- {
- Xpp3Dom managedDom = (Xpp3Dom) plugin.getConfiguration();
-
- if ( executionId != null )
- {
- PluginExecution execution = (PluginExecution) plugin.getExecutionsAsMap().get( executionId );
- if ( execution != null )
- {
- Xpp3Dom executionConfiguration = (Xpp3Dom) execution.getConfiguration();
- if ( executionConfiguration != null )
- {
- Xpp3Dom newDom = new Xpp3Dom( executionConfiguration );
- managedDom = Xpp3Dom.mergeXpp3Dom( newDom, dom );
- }
- }
- }
-
- dom = Xpp3Dom.mergeXpp3Dom( dom, managedDom );
- break;
- }
- }
- }
+// PluginManagement pluginManagement = getBuild().getPluginManagement();
+// if ( pluginManagement != null && pluginManagement.getPlugins() != null )
+// {
+// for ( Iterator iterator = pluginManagement.getPlugins().iterator(); iterator.hasNext(); )
+// {
+// Plugin plugin = (Plugin) iterator.next();
+//
+// if ( pluginGroupId.equals( plugin.getGroupId() ) && pluginArtifactId.equals( plugin.getArtifactId() ) )
+// {
+// Xpp3Dom managedDom = (Xpp3Dom) plugin.getConfiguration();
+//
+// if ( executionId != null )
+// {
+// PluginExecution execution = (PluginExecution) plugin.getExecutionsAsMap().get( executionId );
+// if ( execution != null )
+// {
+// Xpp3Dom executionConfiguration = (Xpp3Dom) execution.getConfiguration();
+// if ( executionConfiguration != null )
+// {
+// Xpp3Dom newDom = new Xpp3Dom( executionConfiguration );
+// managedDom = Xpp3Dom.mergeXpp3Dom( newDom, dom );
+// }
+// }
+// }
+//
+// dom = Xpp3Dom.mergeXpp3Dom( dom, managedDom );
+// break;
+// }
+// }
+// }
if ( dom != null )
{
Modified: maven/components/branches/maven-2.1.0-M1-RC/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/pom.xml?rev=693165&r1=693164&r2=693165&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.0-M1-RC/pom.xml (original)
+++ maven/components/branches/maven-2.1.0-M1-RC/pom.xml Mon Sep 8 09:59:05 2008
@@ -246,7 +246,7 @@
</modules>
<properties>
- <mavenVersion>2.1.0-M1-RC14</mavenVersion>
+ <mavenVersion>2.1.0-M1-RC15-SNAPSHOT</mavenVersion>
<wagonVersion>1.0-beta-4</wagonVersion>
</properties>