maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r801013 [2/4] - in /maven/components/branches/MNG-4162: ./ apache-maven/ maven-compat/src/main/java/org/apache/maven/artifact/ maven-compat/src/main/java/org/apache/maven/artifact/repository/ maven-compat/src/main/java/org/apache/maven/arti...
Date Tue, 04 Aug 2009 23:11:17 GMT
Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicy.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java:799928-799938
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolver.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java:799928-799938
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java:799928-799938
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java:799928-799938
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java:799928-799938
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java:799928-799938
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java:799928-799938
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java:799928-799938
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java:799928-799938
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java:799928-799938
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java:799928-799938
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java:799928-799938
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java:799928-799938
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java:799928-799938
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java:799928-799938
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java:799928-799938
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java:738757-738972
 /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java:799928-799938
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/mdo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -4,4 +4,4 @@
 /maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/mdo:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/mdo:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/main/mdo:738757-738972
-/maven/components/trunk/maven-compat/src/main/mdo:751453-767358,767708-768832,799928-799938
+/maven/components/trunk/maven-compat/src/main/mdo:751453-767358,767708-768832,799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -4,4 +4,4 @@
 /maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test:679206
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/test:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/test:738757-738972
-/maven/components/trunk/maven-compat/src/test:751453-767358,767708-768832,799928-799938
+/maven/components/trunk/maven-compat/src/test:751453-767358,767708-768832,799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/project/path/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -3,5 +3,5 @@
 /maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/path:679206,720042
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/project/path:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/project/path:738757-738972
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/project/path:751453-767358,767708-768832,799928-799938
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/project/path:751453-767358,767708-768832,799928-800992
 /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/path:688587-696625,696644-699681

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -4,5 +4,5 @@
 /maven/components/branches/maven-2.1.x/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:739385,741841,747468,747683,748815,749612,766523,768817
 /maven/components/branches/sisbell-plugin-manager/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:738757-738972
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:799928-799938
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:799928-800992
 /maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:751453-767358,767708-768832

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManagerTest.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManagerTest.java:738757-738972
 /maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManagerTest.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java:799928-799938
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java:738757-738972
 /maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java:799928-799938
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -4,5 +4,5 @@
 /maven/components/branches/maven-2.1.x/maven-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:739385,741841,747468,747683,748815,749612,766523,768817
 /maven/components/branches/sisbell-plugin-manager/maven-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:738757-738972
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:799928-799938
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:799928-800992
 /maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:751453-767358,767708-768832

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/StringWagon.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/StringWagon.java:738757-738972
 /maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/StringWagon.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java:799928-799938
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonA.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonA.java:738757-738972
 /maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonA.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java:799928-799938
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonB.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonB.java:738757-738972
 /maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonB.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java:799928-799938
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonC.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonC.java:738757-738972
 /maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonC.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java:799928-799938
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonMock.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonMock.java:738757-738972
 /maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonMock.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java:799928-799938
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java:738757-738972
 /maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java:799928-799938
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java:738757-738972
 /maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java:799928-799938
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolverTest.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolverTest.java:738757-738972
 /maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolverTest.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java:799928-799938
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolverTest.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolverTest.java:738757-738972
 /maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolverTest.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java:799928-799938
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolverTest.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolverTest.java:738757-738972
 /maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolverTest.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java:799928-799938
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolverTest.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolverTest.java:738757-738972
 /maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolverTest.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java:799928-799938
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java:738757-738972
 /maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java:799928-799938
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java:738757-738972
 /maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java:799928-799938
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java:738757-738972
 /maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java:799928-799938
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java:799928-800992

Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -5,4 +5,4 @@
 /maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java:738757-738972
 /maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java:751453-767358,767708-768832
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java:799928-799938
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java:799928-800992

Modified: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java?rev=801013&r1=801012&r2=801013&view=diff
==============================================================================
--- maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java (original)
+++ maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java Tue Aug  4 23:11:12 2009
@@ -53,13 +53,13 @@
 
         artifacts.add( "classworlds" );
         artifacts.add( "plexus-classworlds" );
-        artifacts.add( "commons-cli" );
         artifacts.add( "maven-artifact" );
         artifacts.add( "maven-artifact-manager" );
         artifacts.add( "maven-build-context" );
         artifacts.add( "maven-compat" );
         artifacts.add( "maven-core" );
         artifacts.add( "maven-error-diagnoser" );
+        artifacts.add( "maven-error-diagnostics" );
         artifacts.add( "maven-lifecycle" );
         artifacts.add( "maven-model" );
         artifacts.add( "maven-monitor" );
@@ -77,6 +77,7 @@
         artifacts.add( "wagon-provider-api" );
         artifacts.add( "wagon-file" );
         artifacts.add( "wagon-http-lightweight" );
+        artifacts.add( "wagon-http-shared" );
         artifacts.add( "wagon-manager" );
 
         DEFAULT_EXCLUSIONS = artifacts;

Modified: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=801013&r1=801012&r2=801013&view=diff
==============================================================================
--- maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Tue Aug  4 23:11:12 2009
@@ -38,6 +38,7 @@
 import org.apache.maven.execution.ProjectDependencyGraph;
 import org.apache.maven.execution.ProjectSorter;
 import org.apache.maven.lifecycle.LifecycleExecutor;
+import org.apache.maven.model.building.ModelProblem;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
@@ -165,7 +166,7 @@
         // User Local Repository
         try
         {
-            delegatingLocalArtifactRepository.setBuildReactor( new ReactorArtifactRepository( getProjectMap( session.getProjects() ) ) );
+            delegatingLocalArtifactRepository.setBuildReactor( new ReactorArtifactRepository( getProjectMap( session.getProjects() ), session ) );
         }
         catch ( MavenExecutionException e )
         {
@@ -293,6 +294,27 @@
         for ( ProjectBuildingResult result : results )
         {
             projects.add( result.getProject() );
+
+            if ( !result.getProblems().isEmpty() && logger.isWarnEnabled() )
+            {
+                logger.warn( "" );
+                logger.warn( "Some problems were encountered while building the effective model for "
+                    + result.getProject().getId() );
+                logger.warn( "" );
+
+                for ( ModelProblem problem : result.getProblems() )
+                {
+                    logger.warn( problem.getMessage() + " @ " + problem.getSource() );
+                }
+
+                logger.warn( "" );
+                logger.warn( "It is highly recommended to fix these problems"
+                    + " because they threaten the stability of your build." );
+                logger.warn( "" );
+                logger.warn( "For this reason, future Maven versions will no"
+                    + " longer support building such malformed projects." );
+                logger.warn( "" );
+            }
         }
     }
 

Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/MavenExecutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -4,5 +4,5 @@
 /maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java:739385,741841,747468,747683,748815,749612,766523,768817
 /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/MavenExecutionException.java:799928-799938
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/MavenExecutionException.java:799928-800992
 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java:751453-767358,767708-768832

Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/MissingModuleException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -4,5 +4,5 @@
 /maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/reactor/MissingModuleException.java:739385,741841,747468,747683,748815,749612,766523,768817
 /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/reactor/MissingModuleException.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/reactor/MissingModuleException.java:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/MissingModuleException.java:799928-799938
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/MissingModuleException.java:799928-800992
 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/reactor/MissingModuleException.java:751453-767358,767708-768832

Modified: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java?rev=801013&r1=801012&r2=801013&view=diff
==============================================================================
--- maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java (original)
+++ maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java Tue Aug  4 23:11:12 2009
@@ -6,6 +6,9 @@
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.ArtifactUtils;
+import org.apache.maven.execution.BuildSuccess;
+import org.apache.maven.execution.MavenExecutionResult;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.repository.LocalArtifactRepository;
 
@@ -21,11 +24,14 @@
 {
     private Map<String, MavenProject> reactorProjects;
 
+    private MavenExecutionResult executionResult;
+
     private final int hashCode;
 
-    public ReactorArtifactRepository( Map<String, MavenProject> reactorProjects )
+    public ReactorArtifactRepository( Map<String, MavenProject> reactorProjects, MavenSession session )
     {
         this.reactorProjects = reactorProjects;
+        this.executionResult = ( session != null ) ? session.getResult() : null;
         hashCode = ( reactorProjects != null ) ? reactorProjects.keySet().hashCode() : 0;
     }
 
@@ -60,28 +66,26 @@
 
                     artifact.setResolved( true );
                 }
-// TODO: The code below supports MNG-3043 & MNG-2871 but in its current form causes MNG-4269. 
-//       We need to consider the state of the reactor before handing out directories.
-//                else
-//                {
-//                    File classesDir;
-//
-//                    if ( isTestArtifact( artifact ) )
-//                    {
-//                        classesDir = new File( project.getBuild().getTestOutputDirectory() );
-//                    }
-//                    else
-//                    {
-//                        classesDir = new File( project.getBuild().getOutputDirectory() );
-//                    }
-//
-//                    if ( classesDir.isDirectory() )
-//                    {
-//                        artifact.setFile( classesDir );
-//
-//                        artifact.setResolved( true );
-//                    }
-//                }
+                else if ( isProjectOutputValid( project ) )
+                {
+                    File classesDir;
+
+                    if ( isTestArtifact( artifact ) )
+                    {
+                        classesDir = new File( project.getBuild().getTestOutputDirectory() );
+                    }
+                    else
+                    {
+                        classesDir = new File( project.getBuild().getOutputDirectory() );
+                    }
+
+                    if ( classesDir.isDirectory() )
+                    {
+                        artifact.setFile( classesDir );
+
+                        artifact.setResolved( true );
+                    }
+                }
             }
         }
 
@@ -181,6 +185,18 @@
     }
 
     /**
+     * Determines whether the output directories of the specified project have valid contents and can be used for
+     * artifact resolution.
+     * 
+     * @param project The project to check, must not be {@code null}.
+     * @return {@code true} if the output directories are valid, {@code false} otherwise.
+     */
+    private boolean isProjectOutputValid( MavenProject project )
+    {
+        return executionResult != null && executionResult.getBuildSummary( project ) instanceof BuildSuccess;
+    }
+
+    /**
      * Determines whether the specified artifact refers to test classes.
      * 
      * @param artifact The artifact to check, must not be {@code null}.

Modified: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java?rev=801013&r1=801012&r2=801013&view=diff
==============================================================================
--- maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java (original)
+++ maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java Tue Aug  4 23:11:12 2009
@@ -21,7 +21,9 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.IdentityHashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
 import org.apache.maven.exception.ExceptionSummary;
@@ -40,7 +42,9 @@
     private List<Throwable> exceptions;
 
     private ExceptionSummary exceptionSummary;
-    
+
+    private Map<MavenProject, BuildSummary> buildSummaries;
+
     public MavenExecutionResult setProject( MavenProject project )
     {
         this.project = project;
@@ -110,4 +114,19 @@
     {
         return exceptionSummary;
     }
+
+    public BuildSummary getBuildSummary( MavenProject project )
+    {
+        return ( buildSummaries != null ) ? buildSummaries.get( project ) : null;
+    }
+
+    public void addBuildSummary( BuildSummary summary )
+    {
+        if ( buildSummaries == null )
+        {
+            buildSummaries = new IdentityHashMap<MavenProject, BuildSummary>();
+        }
+        buildSummaries.put( summary.getProject(), summary );
+    }
+
 }

Modified: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java?rev=801013&r1=801012&r2=801013&view=diff
==============================================================================
--- maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java (original)
+++ maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java Tue Aug  4 23:11:12 2009
@@ -52,4 +52,20 @@
         
     MavenExecutionResult setExceptionSummary( ExceptionSummary exceptionSummary );
     ExceptionSummary getExceptionSummary();
+
+    /**
+     * Gets the build summary for the specified project.
+     * 
+     * @param project The project to get the build summary for, must not be {@code null}.
+     * @return The build summary for the project or {@code null} if the project has not been built (yet).
+     */
+    BuildSummary getBuildSummary( MavenProject project );
+
+    /**
+     * Add the specified build summary.
+     * 
+     * @param summary The build summary to add, must not be {@code null}.
+     */
+    void addBuildSummary( BuildSummary summary );
+
 }

Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -4,4 +4,4 @@
 /maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java:739385,741841,747468,747683,748815,749612,766523,768817
 /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java:751453-767358,767708-768832,799928-799938
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java:751453-767358,767708-768832,799928-800992

Modified: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=801013&r1=801012&r2=801013&view=diff
==============================================================================
--- maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Tue Aug  4 23:11:12 2009
@@ -35,7 +35,10 @@
 import org.apache.maven.artifact.repository.metadata.Metadata;
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadataReadException;
 import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
+import org.apache.maven.execution.BuildFailure;
+import org.apache.maven.execution.BuildSuccess;
 import org.apache.maven.execution.MavenExecutionRequest;
+import org.apache.maven.execution.MavenExecutionResult;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.lifecycle.mapping.LifecycleMapping;
 import org.apache.maven.model.Dependency;
@@ -122,7 +125,7 @@
     {
         // TODO: Use a listener here instead of loggers
         
-        logger.info(  "Build Order:" );
+        logger.info( "Build Order:" );
         
         logger.info( "" );
         
@@ -148,7 +151,9 @@
         }
 
         ClassLoader oldContextClassLoader = Thread.currentThread().getContextClassLoader();
-                
+
+        MavenExecutionResult result = session.getResult();
+
         for ( MavenProject currentProject : session.getProjects() )
         {
             if ( session.isBlackListed( currentProject ) )
@@ -161,6 +166,8 @@
 
             logger.info( "Building " + currentProject.getName() );
 
+            long buildStartTime = System.currentTimeMillis();
+
             try
             {
                 session.setCurrentProject( currentProject );
@@ -171,7 +178,8 @@
                     Thread.currentThread().setContextClassLoader( projectRealm );
                 }
 
-                MavenExecutionPlan executionPlan = calculateExecutionPlan( session, goals.toArray( new String[] {} ) );
+                MavenExecutionPlan executionPlan =
+                    calculateExecutionPlan( session, goals.toArray( new String[goals.size()] ) );
 
                 //TODO: once we have calculated the build plan then we should accurately be able to download
                 // the project dependencies. Having it happen in the plugin manager is a tangled mess. We can optimize this
@@ -199,11 +207,18 @@
                 {
                     execute( currentProject, session, mojoExecution );
                 }
-                
+
+                long buildEndTime = System.currentTimeMillis();
+
+                result.addBuildSummary( new BuildSuccess( currentProject, buildEndTime - buildStartTime ) );
             }
             catch ( Exception e )
             {
-                session.getResult().addException( e );
+                result.addException( e );
+
+                long buildEndTime = System.currentTimeMillis();
+
+                result.addBuildSummary( new BuildFailure( currentProject, buildEndTime - buildStartTime, e ) );
 
                 if ( MavenExecutionRequest.REACTOR_FAIL_NEVER.equals( session.getReactorFailureBehavior() ) )
                 {
@@ -243,6 +258,11 @@
 
         if ( !forkedExecutions.isEmpty() )
         {
+            if ( logger.isDebugEnabled() )
+            {
+                logger.debug( "Forking execution for " + mojoExecution.getMojoDescriptor().getId() );
+            }
+
             executionProject = project.clone();
 
             session.setCurrentProject( executionProject );
@@ -257,6 +277,11 @@
             {
                 session.setCurrentProject( project );
             }
+
+            if ( logger.isDebugEnabled() )
+            {
+                logger.debug( "Completed forked execution for " + mojoExecution.getMojoDescriptor().getId() );
+            }
         }
 
         project.setExecutionProject( executionProject );
@@ -298,8 +323,18 @@
             //
             // org.apache.maven.plugins:maven-remote-resources-plugin:1.0:process
             //                        
-            MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( mojoExecution.getPlugin(), mojoExecution.getGoal(), session
-                .getLocalRepository(), project.getPluginArtifactRepositories() );
+
+            MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
+
+            if ( mojoDescriptor == null )
+            {
+                mojoDescriptor =
+                    pluginManager.getMojoDescriptor( mojoExecution.getPlugin(), mojoExecution.getGoal(),
+                                                     session.getLocalRepository(),
+                                                     project.getPluginArtifactRepositories() );
+
+                mojoExecution.setMojoDescriptor( mojoDescriptor );
+            }
 
             PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
             if ( pluginDescriptor.getPlugin().isExtensions() )
@@ -307,9 +342,10 @@
                 pluginDescriptor.setClassRealm( pluginManager.getPluginRealm( session, pluginDescriptor ) );
             }
 
-            mojoExecution.setMojoDescriptor( mojoDescriptor );
+            populateMojoExecutionConfiguration( project, mojoExecution,
+                                                MojoExecution.Source.CLI.equals( mojoExecution.getSource() ) );
 
-            populateMojoExecutionConfiguration( project, mojoExecution, false );
+            extractMojoConfiguration( mojoExecution );
 
             calculateForkedExecutions( mojoExecution, session, project, new HashSet<MojoDescriptor>() );
 
@@ -338,8 +374,6 @@
     private void calculateExecutionForIndividualGoal( MavenSession session, List<MojoExecution> lifecyclePlan, String goal ) 
         throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, CycleDetectedInPluginGraphException, MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException
     {
-        MavenProject project = session.getCurrentProject();
-        
         // If this is a goal like "mvn modello:java" and the POM looks like the following:
         //
         // <project>
@@ -372,9 +406,7 @@
         
         MojoDescriptor mojoDescriptor = getMojoDescriptor( goal, session );
 
-        MojoExecution mojoExecution = new MojoExecution( mojoDescriptor, "default-cli" );
-        
-        populateMojoExecutionConfiguration( project, mojoExecution, true );
+        MojoExecution mojoExecution = new MojoExecution( mojoDescriptor, "default-cli", MojoExecution.Source.CLI );
 
         lifecyclePlan.add( mojoExecution );        
     }
@@ -601,12 +633,11 @@
                         {
                             for ( MojoExecution forkedExecution : forkedExecutions )
                             {
-                                Xpp3Dom executionConfiguration = forkedExecution.getConfiguration();
+                                Xpp3Dom forkedConfiguration = forkedExecution.getConfiguration();
 
-                                Xpp3Dom mergedConfiguration =
-                                    Xpp3Dom.mergeXpp3Dom( phaseConfiguration, executionConfiguration );
+                                forkedConfiguration = Xpp3Dom.mergeXpp3Dom( phaseConfiguration, forkedConfiguration );
 
-                                forkedExecution.setConfiguration( mergedConfiguration );
+                                forkedExecution.setConfiguration( forkedConfiguration );
                             }
                         }
                     }
@@ -617,6 +648,8 @@
             {
                 for ( MojoExecution forkedExecution : forkedExecutions )
                 {
+                    extractMojoConfiguration( forkedExecution );
+
                     calculateForkedExecutions( forkedExecution, session, project, alreadyForkedExecutions );
 
                     mojoExecution.addForkedExecution( forkedExecution );
@@ -637,6 +670,8 @@
 
             populateMojoExecutionConfiguration( project, forkedExecution, true );
 
+            extractMojoConfiguration( forkedExecution );
+
             calculateForkedExecutions( forkedExecution, session, project, alreadyForkedExecutions );
 
             mojoExecution.addForkedExecution( forkedExecution );
@@ -651,7 +686,8 @@
         return sb.toString();
     }
         
-    public void populateMojoExecutionConfiguration( MavenProject project, MojoExecution mojoExecution, boolean directInvocation )
+    public void populateMojoExecutionConfiguration( MavenProject project, MojoExecution mojoExecution,
+                                                     boolean allowPluginLevelConfig )
     {
         String g = mojoExecution.getGroupId();
 
@@ -659,6 +695,8 @@
 
         Plugin plugin = project.getPlugin( g + ":" + a );
 
+        MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
+
         if ( plugin != null && StringUtils.isNotEmpty( mojoExecution.getExecutionId() ) )
         {
             for ( PluginExecution e : plugin.getExecutions() )
@@ -667,37 +705,57 @@
                 {
                     Xpp3Dom executionConfiguration = (Xpp3Dom) e.getConfiguration();
 
-                    Xpp3Dom mojoConfiguration = extractMojoConfiguration( executionConfiguration, mojoExecution.getMojoDescriptor() );
+                    Xpp3Dom mojoConfiguration = new Xpp3Dom( executionConfiguration );
+
+                    mojoConfiguration = Xpp3Dom.mergeXpp3Dom( mojoExecution.getConfiguration(), mojoConfiguration );
+
+                    /*
+                     * The model only contains the default configuration for those goals that are present in the plugin
+                     * execution. For goals invoked from the CLI or a forked execution, we need to grab the default
+                     * parameter values explicitly.
+                     */
+                    if ( !e.getGoals().contains( mojoExecution.getGoal() ) )
+                    {
+                        Xpp3Dom defaultConfiguration = getMojoConfiguration( mojoDescriptor );
 
-                    Xpp3Dom mergedConfiguration =
-                        Xpp3Dom.mergeXpp3Dom( mojoExecution.getConfiguration(), mojoConfiguration );
+                        mojoConfiguration = Xpp3Dom.mergeXpp3Dom( mojoConfiguration, defaultConfiguration );
+                    }
 
-                    mojoExecution.setConfiguration( mergedConfiguration );
+                    mojoExecution.setConfiguration( mojoConfiguration );
 
                     return;
                 }
             }
         }
 
-        if ( directInvocation )
+        if ( allowPluginLevelConfig )
         {
-            Xpp3Dom defaultDom = convert( mojoExecution.getMojoDescriptor() );
+            Xpp3Dom defaultConfiguration = getMojoConfiguration( mojoDescriptor );
 
-            Xpp3Dom mojoDom = defaultDom;
+            Xpp3Dom mojoConfiguration = defaultConfiguration;
 
             if ( plugin != null && plugin.getConfiguration() != null )
             {
-                Xpp3Dom projectDom = (Xpp3Dom) plugin.getConfiguration();
-                projectDom = extractMojoConfiguration( projectDom, mojoExecution.getMojoDescriptor() );
-                mojoDom = Xpp3Dom.mergeXpp3Dom( projectDom, defaultDom, Boolean.TRUE );
+                Xpp3Dom pluginConfiguration = (Xpp3Dom) plugin.getConfiguration();
+                pluginConfiguration = new Xpp3Dom( pluginConfiguration );
+                mojoConfiguration = Xpp3Dom.mergeXpp3Dom( pluginConfiguration, defaultConfiguration, Boolean.TRUE );
             }
 
-            mojoDom = Xpp3Dom.mergeXpp3Dom( mojoExecution.getConfiguration(), mojoDom );
+            mojoConfiguration = Xpp3Dom.mergeXpp3Dom( mojoExecution.getConfiguration(), mojoConfiguration );
 
-            mojoExecution.setConfiguration( mojoDom );
+            mojoExecution.setConfiguration( mojoConfiguration );
         }
     }
 
+    public void extractMojoConfiguration( MojoExecution mojoExecution )
+    {
+        Xpp3Dom configuration = mojoExecution.getConfiguration();
+
+        configuration = extractMojoConfiguration( configuration, mojoExecution.getMojoDescriptor() );
+
+        mojoExecution.setConfiguration( configuration );
+    }
+
     /**
      * Extracts the configuration for a single mojo from the specified execution configuration by discarding any
      * non-applicable parameters. This is necessary because a plugin execution can have multiple goals with different
@@ -705,56 +763,42 @@
      * underlying configurator will error out when trying to configure a mojo parameter that is specified in the
      * configuration but not present in the mojo instance.
      * 
-     * @param executionConfiguration The configuration from the plugin execution, must not be {@code null}.
+     * @param executionConfiguration The configuration from the plugin execution, may be {@code null}.
      * @param mojoDescriptor The descriptor for the mojo being configured, must not be {@code null}.
      * @return The configuration for the mojo, never {@code null}.
      */
     private Xpp3Dom extractMojoConfiguration( Xpp3Dom executionConfiguration, MojoDescriptor mojoDescriptor )
     {
-        Xpp3Dom mojoConfiguration = new Xpp3Dom( executionConfiguration.getName() );
-
-        Map<String, Parameter> mojoParameters = mojoDescriptor.getParameterMap();
+        Xpp3Dom mojoConfiguration = null;
 
-        Map<String, String> aliases = new HashMap<String, String>();
-        if ( mojoDescriptor.getParameters() != null )
+        if ( executionConfiguration != null )
         {
-            for ( Parameter parameter : mojoDescriptor.getParameters() )
+            mojoConfiguration = new Xpp3Dom( executionConfiguration.getName() );
+
+            if ( mojoDescriptor.getParameters() != null )
             {
-                String alias = parameter.getAlias();
-                if ( StringUtils.isNotEmpty( alias ) )
+                for ( Parameter parameter : mojoDescriptor.getParameters() )
                 {
-                    aliases.put( alias, parameter.getName() );
-                }
-            }
-        }
+                    Xpp3Dom parameterConfiguration = executionConfiguration.getChild( parameter.getName() );
 
-        for ( int i = 0; i < executionConfiguration.getChildCount(); i++ )
-        {
-            Xpp3Dom executionDom = executionConfiguration.getChild( i );
-            String paramName = executionDom.getName();
+                    if ( parameterConfiguration == null )
+                    {
+                        parameterConfiguration = executionConfiguration.getChild( parameter.getAlias() );
+                    }
 
-            Xpp3Dom mojoDom;
+                    if ( parameterConfiguration != null )
+                    {
+                        parameterConfiguration = new Xpp3Dom( parameterConfiguration, parameter.getName() );
 
-            if ( mojoParameters.containsKey( paramName ) )
-            {
-                mojoDom = new Xpp3Dom( executionDom );
-            }
-            else if ( aliases.containsKey( paramName ) )
-            {
-                mojoDom = new Xpp3Dom( executionDom, aliases.get( paramName ) );
-            }
-            else
-            {
-                continue;
-            }
+                        if ( StringUtils.isNotEmpty( parameter.getImplementation() ) )
+                        {
+                            parameterConfiguration.setAttribute( "implementation", parameter.getImplementation() );
+                        }
 
-            String implementation = mojoParameters.get( mojoDom.getName() ).getImplementation();
-            if ( StringUtils.isNotEmpty( implementation ) )
-            {
-                mojoDom.setAttribute( "implementation", implementation );
+                        mojoConfiguration.addChild( parameterConfiguration );
+                    }
+                }
             }
-
-            mojoConfiguration.addChild( mojoDom );
         }
 
         return mojoConfiguration;
@@ -1002,17 +1046,19 @@
     //
     public Set<Plugin> getPluginsBoundByDefaultToAllLifecycles( String packaging )
     {
+        LifecycleMapping lifecycleMappingForPackaging = lifecycleMappings.get( packaging );
+
+        if ( lifecycleMappingForPackaging == null )
+        {
+            return null;
+        }
+
         Map<Plugin, Plugin> plugins = new LinkedHashMap<Plugin, Plugin>();
-        
+
         for ( Lifecycle lifecycle : lifecycles )
         {
-            LifecycleMapping lifecycleMappingForPackaging = lifecycleMappings.get( packaging );
-
-            org.apache.maven.lifecycle.mapping.Lifecycle lifecycleConfiguration = null;
-            if ( lifecycleMappingForPackaging != null )
-            {
-                lifecycleConfiguration = lifecycleMappingForPackaging.getLifecycles().get( lifecycle.getId() );
-            }
+            org.apache.maven.lifecycle.mapping.Lifecycle lifecycleConfiguration =
+                lifecycleMappingForPackaging.getLifecycles().get( lifecycle.getId() );
 
             if ( lifecycleConfiguration != null )
             {
@@ -1090,7 +1136,7 @@
             }
             catch ( PluginNotFoundException e )
             {
-                throw new LifecycleExecutionException( "Error resolving version for plugin " + plugin, e );
+                throw new LifecycleExecutionException( "Error resolving version for plugin " + plugin.getKey(), e );
             }
         }
 
@@ -1147,7 +1193,7 @@
             throw new LifecycleExecutionException( "Error getting default plugin information: ", e );
         } 
         
-        return convert( mojoDescriptor );
+        return getMojoConfiguration( mojoDescriptor );
     }
     
     public Xpp3Dom getMojoConfiguration( MojoDescriptor mojoDescriptor )
@@ -1562,4 +1608,4 @@
     }    
     
     */    
-}
+}
\ No newline at end of file

Modified: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java?rev=801013&r1=801012&r2=801013&view=diff
==============================================================================
--- maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java (original)
+++ maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java Tue Aug  4 23:11:12 2009
@@ -65,6 +65,10 @@
     // We need to know the specific version so that we can lookup the right version of the plugin descriptor
     // which tells us what the default configuration is.
     //
+    /**
+     * @return The plugins bound to the lifecycles of the specified packaging or {@code null} if the packaging is
+     *         unknown.
+     */
     Set<Plugin> getPluginsBoundByDefaultToAllLifecycles( String packaging );
 
     // Given a set of {@link org.apache.maven.Plugin} objects where the GAV is set we can lookup the plugin
@@ -76,4 +80,6 @@
     void execute( MavenSession session );
     
     void populateMojoExecutionConfiguration( MavenProject project, MojoExecution mojoExecution, boolean directInvocation );
+    
+    void extractMojoConfiguration( MojoExecution mojoExecution );
 }

Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -4,4 +4,4 @@
 /maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:739385,741841,747468,748815,749612
 /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:688587-696625,696644-699681,751453-767358,767708-768832,799928-799938
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:688587-696625,696644-699681,751453-767358,767708-768832,799928-800992

Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -4,4 +4,4 @@
 /maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:739385,741841,747468,748815,749612
 /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:688587-696625,696644-699681,751453-767358,767708-768832,799928-799938
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:688587-696625,696644-699681,751453-767358,767708-768832,799928-800992

Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/listeners/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -3,5 +3,5 @@
 /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/builder/listeners:679206
 /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners:738973-739966
 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners:751453-767358,767708-768832,799928-799938
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners:751453-767358,767708-768832,799928-800992
 /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners:688587-696625,696644-699681

Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  4 23:11:12 2009
@@ -3,5 +3,5 @@
 /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:751453-767358,767708-768832,799928-799938
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:751453-767358,767708-768832,799928-800992
 /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java:688587-696625,696644-699681

Modified: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java?rev=801013&r1=801012&r2=801013&view=diff
==============================================================================
--- maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java (original)
+++ maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java Tue Aug  4 23:11:12 2009
@@ -32,6 +32,7 @@
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.PluginContainer;
+import org.apache.maven.model.building.ModelProblemCollector;
 import org.apache.maven.model.merge.MavenModelMerger;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
@@ -51,13 +52,17 @@
     @Requirement
     private LifecycleExecutor lifecycle;
 
-    public void injectLifecycleBindings( Model model )
+    public void injectLifecycleBindings( Model model, ModelProblemCollector problems )
     {
         String packaging = model.getPackaging();
 
         Collection<Plugin> defaultPlugins = lifecycle.getPluginsBoundByDefaultToAllLifecycles( packaging );
 
-        if ( !defaultPlugins.isEmpty() )
+        if ( defaultPlugins == null )
+        {
+            problems.addError( "Unknown packaging: " + packaging );
+        }
+        else if ( !defaultPlugins.isEmpty() )
         {
             Model lifecycleModel = new Model();
             lifecycleModel.setBuild( new Build() );



Mime
View raw message