You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/04/19 13:15:45 UTC
svn commit: r935529 [2/3] - in /maven/maven-3/branches/MNG-1803: ./
apache-maven/
maven-artifact/src/main/java/org/apache/maven/artifact/repository/
maven-artifact/src/main/java/org/apache/maven/repository/
maven-compat/src/main/java/org/apache/maven/a...
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:679206
/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/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java:679206
/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/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java:679206
/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/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java:679206
/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/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/main/mdo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -5,3 +5,4 @@
/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
+/maven/maven-3/trunk/maven-compat/src/main/mdo:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -5,3 +5,4 @@
/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
+/maven/maven-3/trunk/maven-compat/src/test:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/profiles/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -5,3 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/profiles:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/profiles:738757-738972
/maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/profiles:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -5,3 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java:738757-738972
/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -5,3 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java:738757-738972
/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -5,3 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java:738757-738972
/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/path/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -5,3 +5,4 @@
/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
/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/path:688587-696625,696644-699681
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/path:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -5,3 +5,4 @@
/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-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManagerTest.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManagerTest.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManagerTest.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManagerTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManagerTest.java:679206
/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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java:679206
/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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -5,3 +5,4 @@
/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-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/manager/StringWagon.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/manager/StringWagon.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java:679206
/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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonA.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonA.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonA.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonA.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonA.java:679206
/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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonB.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonB.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonB.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonB.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonB.java:679206
/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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonC.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonC.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonC.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonC.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonC.java:679206
/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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonMock.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonMock.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonMock.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonMock.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonMock.java:679206
/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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java:679206
/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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java:679206
/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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolverTest.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolverTest.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolverTest.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolverTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolverTest.java:679206
/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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolverTest.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolverTest.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolverTest.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolverTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolverTest.java:679206
/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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolverTest.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolverTest.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolverTest.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolverTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolverTest.java:679206
/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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolverTest.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolverTest.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolverTest.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolverTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolverTest.java:679206
/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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java:679206
/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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java:679206
/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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java:679206
/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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java:679206
/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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java:935334-935341
Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java?rev=935529&r1=935528&r2=935529&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java Mon Apr 19 11:15:42 2010
@@ -42,7 +42,7 @@ import org.apache.maven.repository.Repos
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-@Component(role=ProjectDependenciesResolver.class)
+@Component(role = ProjectDependenciesResolver.class)
public class DefaultProjectDependenciesResolver
implements ProjectDependenciesResolver
{
@@ -63,18 +63,31 @@ public class DefaultProjectDependenciesR
Collection<String> scopesToResolve, MavenSession session )
throws ArtifactResolutionException, ArtifactNotFoundException
{
- return resolve( Collections.singleton( project ), scopesToCollect, scopesToResolve, session );
+ Set<MavenProject> mavenProjects = Collections.singleton( project );
+ return resolveImpl( mavenProjects, scopesToCollect, scopesToResolve, session,
+ getIgnorableArtifacts( mavenProjects ) );
}
public Set<Artifact> resolve( Collection<? extends MavenProject> projects, Collection<String> scopesToResolve,
MavenSession session )
throws ArtifactResolutionException, ArtifactNotFoundException
{
- return resolve( projects, null, scopesToResolve, session );
+ return resolveImpl( projects, null, scopesToResolve, session, getIgnorableArtifacts( projects ) );
}
- public Set<Artifact> resolve( Collection<? extends MavenProject> projects, Collection<String> scopesToCollect,
- Collection<String> scopesToResolve, MavenSession session )
+ public Set<Artifact> resolve( MavenProject project, Collection<String> scopesToCollect,
+ Collection<String> scopesToResolve, MavenSession session,
+ Set<Artifact> ignoreableArtifacts )
+ throws ArtifactResolutionException, ArtifactNotFoundException
+ {
+ return resolveImpl( Collections.singleton( project ), scopesToCollect, scopesToResolve, session,
+ getIgnorableArtifacts( ignoreableArtifacts ) );
+ }
+
+
+ private Set<Artifact> resolveImpl( Collection<? extends MavenProject> projects, Collection<String> scopesToCollect,
+ Collection<String> scopesToResolve, MavenSession session,
+ Set<String> projectIds )
throws ArtifactResolutionException, ArtifactNotFoundException
{
Set<Artifact> resolved = new LinkedHashSet<Artifact>();
@@ -84,18 +97,18 @@ public class DefaultProjectDependenciesR
return resolved;
}
- if ( ( scopesToCollect == null || scopesToCollect.isEmpty() )
- && ( scopesToResolve == null || scopesToResolve.isEmpty() ) )
+ if ( ( scopesToCollect == null || scopesToCollect.isEmpty() ) &&
+ ( scopesToResolve == null || scopesToResolve.isEmpty() ) )
{
return resolved;
}
/*
-
+
Logic for transitve global exclusions
-
+
List<String> exclusions = new ArrayList<String>();
-
+
for ( Dependency d : project.getDependencies() )
{
if ( d.getExclusions() != null )
@@ -106,10 +119,10 @@ public class DefaultProjectDependenciesR
}
}
}
-
+
ArtifactFilter scopeFilter = new ScopeArtifactFilter( scope );
-
- ArtifactFilter filter;
+
+ ArtifactFilter filter;
if ( ! exclusions.isEmpty() )
{
@@ -118,7 +131,7 @@ public class DefaultProjectDependenciesR
else
{
filter = scopeFilter;
- }
+ }
*/
CumulativeScopeArtifactFilter resolutionScopeFilter = new CumulativeScopeArtifactFilter( scopesToResolve );
@@ -126,22 +139,16 @@ public class DefaultProjectDependenciesR
CumulativeScopeArtifactFilter collectionScopeFilter = new CumulativeScopeArtifactFilter( scopesToCollect );
collectionScopeFilter = new CumulativeScopeArtifactFilter( collectionScopeFilter, resolutionScopeFilter );
- ArtifactResolutionRequest request = new ArtifactResolutionRequest()
- .setResolveRoot( false )
- .setResolveTransitively( true )
- .setCollectionFilter( collectionScopeFilter )
- .setResolutionFilter( resolutionScopeFilter )
- .setLocalRepository( session.getLocalRepository() )
- .setOffline( session.isOffline() )
- .setForceUpdate( session.getRequest().isUpdateSnapshots() )
- .setCache( session.getRepositoryCache() );
+ ArtifactResolutionRequest request =
+ new ArtifactResolutionRequest().setResolveRoot( false ).setResolveTransitively( true ).setCollectionFilter(
+ collectionScopeFilter ).setResolutionFilter( resolutionScopeFilter ).setLocalRepository(
+ session.getLocalRepository() ).setOffline( session.isOffline() ).setForceUpdate(
+ session.getRequest().isUpdateSnapshots() ).setCache( session.getRepositoryCache() );
request.setTransferListener( session.getRequest().getTransferListener() );
request.setServers( session.getRequest().getServers() );
request.setMirrors( session.getRequest().getMirrors() );
request.setProxies( session.getRequest().getProxies() );
- Set<String> projectIds = null;
-
for ( MavenProject project : projects )
{
request.setArtifact( new ProjectArtifact( project ) );
@@ -157,16 +164,6 @@ public class DefaultProjectDependenciesR
}
catch ( MultipleArtifactsNotFoundException e )
{
- if ( projectIds == null )
- {
- projectIds = new HashSet<String>( projects.size() * 2 );
-
- for ( MavenProject p : projects )
- {
- String key = ArtifactUtils.key( p.getGroupId(), p.getArtifactId(), p.getVersion() );
- projectIds.add( key );
- }
- }
Collection<Artifact> missing = new HashSet<Artifact>( e.getMissingArtifacts() );
@@ -191,4 +188,29 @@ public class DefaultProjectDependenciesR
return resolved;
}
+
+ private Set<String> getIgnorableArtifacts( Collection<? extends MavenProject> projects )
+ {
+ Set<String> projectIds = new HashSet<String>( projects.size() * 2 );
+
+ for ( MavenProject p : projects )
+ {
+ String key = ArtifactUtils.key( p.getGroupId(), p.getArtifactId(), p.getVersion() );
+ projectIds.add( key );
+ }
+ return projectIds;
+ }
+
+ private Set<String> getIgnorableArtifacts( Iterable<Artifact> artifactIterable )
+ {
+ Set<String> projectIds = new HashSet<String>();
+
+ for ( Artifact artifact : artifactIterable )
+ {
+ String key = ArtifactUtils.key( artifact );
+ projectIds.add( key );
+ }
+ return projectIds;
+ }
+
}
Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/MavenExecutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -5,3 +5,4 @@
/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/reactor/MavenExecutionException.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/MavenExecutionException.java:935334-935341
Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/MissingModuleException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -5,3 +5,4 @@
/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/reactor/MissingModuleException.java:751453-767358,767708-768832
+/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/MissingModuleException.java:935334-935341
Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java?rev=935529&r1=935528&r2=935529&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java Mon Apr 19 11:15:42 2010
@@ -33,10 +33,10 @@ public interface ProjectDependenciesReso
/**
* Resolves the transitive dependencies of the specified project.
- *
- * @param project The project whose dependencies should be resolved, must not be {@code null}.
+ *
+ * @param project The project whose dependencies should be resolved, must not be {@code null}.
* @param scopesToResolve The dependency scopes that should be resolved, may be {@code null}.
- * @param session The current build session, must not be {@code null}.
+ * @param session The current build session, must not be {@code null}.
* @return The transitive dependencies of the specified project that match the requested scopes, never {@code null}.
*/
public Set<Artifact> resolve( MavenProject project, Collection<String> scopesToResolve, MavenSession session )
@@ -44,11 +44,11 @@ public interface ProjectDependenciesReso
/**
* Resolves the transitive dependencies of the specified project.
- *
- * @param project The project whose dependencies should be resolved, must not be {@code null}.
+ *
+ * @param project The project whose dependencies should be resolved, must not be {@code null}.
* @param scopesToCollect The dependency scopes that should be collected, may be {@code null}.
* @param scopesToResolve The dependency scopes that should be collected and also resolved, may be {@code null}.
- * @param session The current build session, must not be {@code null}.
+ * @param session The current build session, must not be {@code null}.
* @return The transitive dependencies of the specified project that match the requested scopes, never {@code null}.
*/
public Set<Artifact> resolve( MavenProject project, Collection<String> scopesToCollect,
@@ -56,14 +56,30 @@ public interface ProjectDependenciesReso
throws ArtifactResolutionException, ArtifactNotFoundException;
/**
+ * Resolves the transitive dependencies of the specified project.
+ *
+ * @param project The project whose dependencies should be resolved, must not be {@code null}.
+ * @param scopesToCollect The dependency scopes that should be collected, may be {@code null}.
+ * @param scopesToResolve The dependency scopes that should be collected and also resolved, may be {@code null}.
+ * @param session The current build session, must not be {@code null}.
+ * @param ignoreableArtifacts Artifacts that need not be resolved
+ * @return The transitive dependencies of the specified project that match the requested scopes, never {@code null}.
+ */
+ public Set<Artifact> resolve( MavenProject project, Collection<String> scopesToCollect,
+ Collection<String> scopesToResolve, MavenSession session,
+ Set<Artifact> ignoreableArtifacts )
+ throws ArtifactResolutionException, ArtifactNotFoundException;
+
+
+ /**
* Resolves the transitive dependencies of the specified projects. Note that dependencies which can't be resolved
* from any repository but are present among the set of specified projects will not cause an exception. Instead,
* those unresolved artifacts will be returned in the result set, allowing the caller to take special care of
* artifacts that haven't been build yet.
- *
+ *
* @param projects The projects whose dependencies should be resolved, may be {@code null}.
- * @param scopes The dependency scopes that should be resolved, may be {@code null}.
- * @param session The current build session, must not be {@code null}.
+ * @param scopes The dependency scopes that should be resolved, may be {@code null}.
+ * @param session The current build session, must not be {@code null}.
* @return The transitive dependencies of the specified projects that match the requested scopes, never {@code null}
* .
*/
Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/execution/SettingsAdapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 11:15:42 2010
@@ -5,3 +5,4 @@
/maven/components/sisbell-plugin-manager/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:738757-738972
/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:751453-767358,767708-768832
/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/user/SettingsAdapter.java:688587-696625,696644-699681
+/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/SettingsAdapter.java:935334-935341
Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java?rev=935529&r1=935528&r2=935529&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java Mon Apr 19 11:15:42 2010
@@ -14,17 +14,6 @@
*/
package org.apache.maven.lifecycle;
-import org.apache.maven.lifecycle.internal.BuilderCommon;
-import org.apache.maven.lifecycle.internal.ExecutionPlanItem;
-import org.apache.maven.plugin.InvalidPluginDescriptorException;
-import org.apache.maven.plugin.MojoExecution;
-import org.apache.maven.plugin.MojoNotFoundException;
-import org.apache.maven.plugin.PluginDescriptorParsingException;
-import org.apache.maven.plugin.PluginNotFoundException;
-import org.apache.maven.plugin.PluginResolutionException;
-import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException;
-import org.apache.maven.plugin.version.PluginVersionResolutionException;
-import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.StringUtils;
@@ -53,69 +42,18 @@ public class DefaultLifecycles
private Logger logger;
- private List<Scheduling> schedules;
-
@SuppressWarnings( { "UnusedDeclaration" } )
public DefaultLifecycles()
{
}
- public DefaultLifecycles( Map<String, Lifecycle> lifecycles, List<Scheduling> schedules, Logger logger )
+ public DefaultLifecycles( Map<String, Lifecycle> lifecycles, Logger logger )
{
this.lifecycles = new LinkedHashMap<String, Lifecycle>();
- this.schedules = schedules;
this.logger = logger;
this.lifecycles = lifecycles;
}
- public List<ExecutionPlanItem> createExecutionPlanItem( MavenProject mavenProject, List<MojoExecution> executions )
- throws PluginNotFoundException, PluginResolutionException, LifecyclePhaseNotFoundException,
- PluginDescriptorParsingException, MojoNotFoundException, InvalidPluginDescriptorException,
- NoPluginFoundForPrefixException, LifecycleNotFoundException, PluginVersionResolutionException
- {
- BuilderCommon.attachToThread( mavenProject );
-
- List<ExecutionPlanItem> result = new ArrayList<ExecutionPlanItem>();
- for ( MojoExecution mojoExecution : executions )
- {
- String lifeCyclePhase = mojoExecution.getMojoDescriptor().getPhase();
- final Scheduling scheduling = getScheduling( "default" );
- Schedule schedule = null;
- if ( scheduling != null )
- {
- schedule = scheduling.getSchedule( mojoExecution.getPlugin() );
- if ( schedule == null )
- {
- schedule = scheduling.getSchedule( lifeCyclePhase );
- }
- }
- result.add( new ExecutionPlanItem( mojoExecution, schedule ) );
-
- }
- return result;
- }
-
- /**
- * Gets scheduling associated with a given phase.
- * <p/>
- * This is part of the experimental weave mode and therefore not part of the public api.
- *
- * @param lifecyclePhaseName The name of the lifecycle phase
- * @return Schecduling information related to phase
- */
-
- private Scheduling getScheduling( String lifecyclePhaseName )
- {
- for ( Scheduling schedule : schedules )
- {
- if ( lifecyclePhaseName.equals( schedule.getLifecycle() ) )
- {
- return schedule;
- }
- }
- return null;
- }
-
public Lifecycle get( String key )
{
return getPhaseToLifecycleMap().get( key );
@@ -124,7 +62,7 @@ public class DefaultLifecycles
/**
* We use this to map all phases to the lifecycle that contains it. This is used so that a user can specify the
* phase they want to execute and we can easily determine what lifecycle we need to run.
- *
+ *
* @return A map of lifecycles, indexed on id
*/
public Map<String, Lifecycle> getPhaseToLifecycleMap()
@@ -178,11 +116,6 @@ public class DefaultLifecycles
return result;
}
- public List<Scheduling> getSchedules()
- {
- return schedules;
- }
-
public String getLifecyclePhaseList()
{
Set<String> phases = new LinkedHashSet<String>();
Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuilderCommon.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuilderCommon.java?rev=935529&r1=935528&r2=935529&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuilderCommon.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuilderCommon.java Mon Apr 19 11:15:42 2010
@@ -14,11 +14,15 @@
*/
package org.apache.maven.lifecycle.internal;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.BuildFailure;
import org.apache.maven.execution.ExecutionEvent;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.lifecycle.*;
+import org.apache.maven.lifecycle.LifecycleExecutionException;
+import org.apache.maven.lifecycle.LifecycleNotFoundException;
+import org.apache.maven.lifecycle.LifecyclePhaseNotFoundException;
+import org.apache.maven.lifecycle.MavenExecutionPlan;
import org.apache.maven.plugin.*;
import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException;
import org.apache.maven.plugin.version.PluginVersionResolutionException;
@@ -27,6 +31,8 @@ import org.codehaus.plexus.classworlds.r
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
+import java.util.Set;
+
/**
* Common code that is shared by the LifecycleModuleBuilder and the LifeCycleWeaveBuilder
*
@@ -63,7 +69,8 @@ public class BuilderCommon
this.lifecycleDependencyResolver = lifecycleDependencyResolver;
}
- public MavenExecutionPlan resolveBuildPlan( MavenSession session, MavenProject project, TaskSegment taskSegment )
+ public MavenExecutionPlan resolveBuildPlan( MavenSession session, MavenProject project, TaskSegment taskSegment,
+ Set<Artifact> projectArtifacts )
throws PluginNotFoundException, PluginResolutionException, LifecyclePhaseNotFoundException,
PluginDescriptorParsingException, MojoNotFoundException, InvalidPluginDescriptorException,
NoPluginFoundForPrefixException, LifecycleNotFoundException, PluginVersionResolutionException,
@@ -78,13 +85,14 @@ public class BuilderCommon
// this later by looking at the build plan. Would be better to just batch download everything required
// by the reactor.
- lifecycleDependencyResolver.resolveDependencies( taskSegment.isAggregating(), project, session, executionPlan );
+ lifecycleDependencyResolver.resolveDependencies( taskSegment.isAggregating(), project, session, executionPlan,
+ projectArtifacts );
return executionPlan;
}
public void handleBuildError( final ReactorContext buildContext, final MavenSession rootSession,
- final MavenProject mavenProject, final Exception e, final long buildStartTime )
+ final MavenProject mavenProject, final Exception e, final long buildStartTime )
{
buildContext.getResult().addException( e );
Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java?rev=935529&r1=935528&r2=935529&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java Mon Apr 19 11:15:42 2010
@@ -62,11 +62,12 @@ public class LifecycleDependencyResolver
}
public void resolveDependencies( boolean aggregating, MavenProject currentProject,
- MavenSession sessionForThisModule, MavenExecutionPlan executionPlan )
+ MavenSession sessionForThisModule, MavenExecutionPlan executionPlan,
+ Set<Artifact> projectArtifacts )
throws LifecycleExecutionException
{
List<MavenProject> projectsToResolve = getProjects( currentProject, sessionForThisModule, aggregating );
- resolveDependencies( aggregating, sessionForThisModule, executionPlan, projectsToResolve );
+ resolveDependencies( aggregating, sessionForThisModule, executionPlan, projectsToResolve, projectArtifacts );
}
public static List<MavenProject> getProjects( MavenProject project, MavenSession session, boolean aggregator )
@@ -88,8 +89,8 @@ public class LifecycleDependencyResolver
if ( dependenctContext.isSameButUpdatedProject( session ) )
{
resolveProjectDependencies( dependenctContext.getLastProject(), dependenctContext.getScopesToCollect(),
- dependenctContext.getScopesToResolve(), session,
- dependenctContext.isAggregating() );
+ dependenctContext.getScopesToResolve(), session,
+ dependenctContext.isAggregating(), new HashSet<Artifact>() );
}
dependenctContext.setLastProject( session.getCurrentProject() );
@@ -97,30 +98,25 @@ public class LifecycleDependencyResolver
}
private void resolveDependencies( boolean aggregating, MavenSession session, MavenExecutionPlan executionPlan,
- List<MavenProject> projectsToResolve )
+ List<MavenProject> projectsToResolve, Set<Artifact> projectArtifacts )
throws LifecycleExecutionException
{
for ( MavenProject project : projectsToResolve )
{
- resolveDependencies( project, aggregating, session, executionPlan );
+ resolveProjectDependencies( project, executionPlan.getRequiredCollectionScopes(),
+ executionPlan.getRequiredResolutionScopes(), session, aggregating,
+ projectArtifacts );
}
}
- private void resolveDependencies( MavenProject project, boolean aggregating, MavenSession session,
- MavenExecutionPlan executionPlan )
- throws LifecycleExecutionException
- {
- resolveProjectDependencies( project, executionPlan.getRequiredCollectionScopes(),
- executionPlan.getRequiredResolutionScopes(), session, aggregating );
- }
-
private void resolveProjectDependencies( MavenProject project, Collection<String> scopesToCollect,
- Collection<String> scopesToResolve, MavenSession session,
- boolean aggregating )
+ Collection<String> scopesToResolve, MavenSession session,
+ boolean aggregating, Set<Artifact> projectArtifacts )
throws LifecycleExecutionException
{
Set<Artifact> artifacts =
- getProjectDependencies( project, scopesToCollect, scopesToResolve, session, aggregating );
+ getProjectDependencies( project, scopesToCollect, scopesToResolve, session, aggregating,
+ projectArtifacts );
updateProjectArtifacts( project, artifacts );
}
@@ -136,7 +132,7 @@ public class LifecycleDependencyResolver
private Set<Artifact> getProjectDependencies( MavenProject project, Collection<String> scopesToCollect,
Collection<String> scopesToResolve, MavenSession session,
- boolean aggregating )
+ boolean aggregating, Set<Artifact> projectArtifacts )
throws LifecycleExecutionException
{
Set<Artifact> artifacts;
@@ -144,7 +140,8 @@ public class LifecycleDependencyResolver
{
try
{
- artifacts = projectDependenciesResolver.resolve( project, scopesToCollect, scopesToResolve, session );
+ artifacts = projectDependenciesResolver.resolve( project , scopesToCollect,
+ scopesToResolve, session, projectArtifacts );
}
catch ( MultipleArtifactsNotFoundException e )
{
@@ -153,24 +150,7 @@ public class LifecycleDependencyResolver
* plugins that require dependency resolution although they usually run in phases of the build where project
* artifacts haven't been assembled yet. The prime example of this is "mvn release:prepare".
*/
- if ( aggregating && areAllArtifactsInReactor( session.getProjects(), e.getMissingArtifacts() ) )
- {
- logger.warn( "The following artifacts could not be resolved at this point of the build" +
- " but seem to be part of the reactor:" );
-
- for ( Artifact artifact : e.getMissingArtifacts() )
- {
- logger.warn( "o " + artifact.getId() );
- }
-
- logger.warn( "Try running the build up to the lifecycle phase \"package\"" );
-
- artifacts = new LinkedHashSet<Artifact>( e.getResolvedArtifacts() );
- }
- else
- {
- throw e;
- }
+ artifacts = handleException( session, aggregating, e );
}
return artifacts;
@@ -187,6 +167,36 @@ public class LifecycleDependencyResolver
}
+ private Set<Artifact> handleException( MavenSession session, boolean aggregating,
+ MultipleArtifactsNotFoundException e )
+ throws MultipleArtifactsNotFoundException
+ {
+ Set<Artifact> artifacts;/*
+ * MNG-2277, the check below compensates for our bad plugin support where we ended up with aggregator
+ * plugins that require dependency resolution although they usually run in phases of the build where project
+ * artifacts haven't been assembled yet. The prime example of this is "mvn release:prepare".
+ */
+ if ( aggregating && areAllArtifactsInReactor( session.getProjects(), e.getMissingArtifacts() ) )
+ {
+ logger.warn( "The following artifacts could not be resolved at this point of the build" +
+ " but seem to be part of the reactor:" );
+
+ for ( Artifact artifact : e.getMissingArtifacts() )
+ {
+ logger.warn( "o " + artifact.getId() );
+ }
+
+ logger.warn( "Try running the build up to the lifecycle phase \"package\"" );
+
+ artifacts = new LinkedHashSet<Artifact>( e.getResolvedArtifacts() );
+ }
+ else
+ {
+ throw e;
+ }
+ return artifacts;
+ }
+
private Set<Artifact> getDependencyArtifacts( MavenProject project, Set<Artifact> artifacts )
{
Set<String> directDependencies = new HashSet<String>( project.getDependencies().size() * 2 );
Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorImpl.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorImpl.java?rev=935529&r1=935528&r2=935529&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorImpl.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorImpl.java Mon Apr 19 11:15:42 2010
@@ -16,10 +16,21 @@ package org.apache.maven.lifecycle.inter
import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.lifecycle.*;
+import org.apache.maven.lifecycle.DefaultLifecycles;
+import org.apache.maven.lifecycle.DefaultSchedules;
+import org.apache.maven.lifecycle.Lifecycle;
+import org.apache.maven.lifecycle.LifecycleNotFoundException;
+import org.apache.maven.lifecycle.LifecyclePhaseNotFoundException;
+import org.apache.maven.lifecycle.MavenExecutionPlan;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
-import org.apache.maven.plugin.*;
+import org.apache.maven.plugin.BuildPluginManager;
+import org.apache.maven.plugin.InvalidPluginDescriptorException;
+import org.apache.maven.plugin.MojoExecution;
+import org.apache.maven.plugin.MojoNotFoundException;
+import org.apache.maven.plugin.PluginDescriptorParsingException;
+import org.apache.maven.plugin.PluginNotFoundException;
+import org.apache.maven.plugin.PluginResolutionException;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
@@ -36,7 +47,16 @@ import org.codehaus.plexus.util.xml.Xpp3
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
/**
* @author Benjamin Bentmann
@@ -44,7 +64,7 @@ import java.util.*;
* <p/>
* NOTE: This class is not part of any public api and can be changed or deleted without prior notice.
*/
-@Component(role = LifecycleExecutionPlanCalculator.class)
+@Component( role = LifecycleExecutionPlanCalculator.class )
public class LifecycleExecutionPlanCalculatorImpl
implements LifecycleExecutionPlanCalculator
{
@@ -58,24 +78,29 @@ public class LifecycleExecutionPlanCalcu
private DefaultLifecycles defaultLifeCycles;
@Requirement
+ private DefaultSchedules defaultSchedules;
+
+ @Requirement
private MojoDescriptorCreator mojoDescriptorCreator;
@Requirement
private LifecyclePluginResolver lifecyclePluginResolver;
- @SuppressWarnings({"UnusedDeclaration"})
+ @SuppressWarnings( { "UnusedDeclaration" } )
public LifecycleExecutionPlanCalculatorImpl()
{
}
public LifecycleExecutionPlanCalculatorImpl( BuildPluginManager pluginManager, DefaultLifecycles defaultLifeCycles,
MojoDescriptorCreator mojoDescriptorCreator,
- LifecyclePluginResolver lifecyclePluginResolver )
+ LifecyclePluginResolver lifecyclePluginResolver,
+ DefaultSchedules defaultSchedules )
{
this.pluginManager = pluginManager;
this.defaultLifeCycles = defaultLifeCycles;
this.mojoDescriptorCreator = mojoDescriptorCreator;
this.lifecyclePluginResolver = lifecyclePluginResolver;
+ this.defaultSchedules = defaultSchedules;
}
public MavenExecutionPlan calculateExecutionPlan( MavenSession session, MavenProject project, List<Object> tasks )
@@ -86,27 +111,61 @@ public class LifecycleExecutionPlanCalcu
Set<String> requiredDependencyResolutionScopes = new TreeSet<String>();
Set<String> requiredDependencyCollectionScopes = new TreeSet<String>();
- final List<MojoExecution> executions =
- calculateExecutionPlan( session, project, tasks, requiredDependencyResolutionScopes,
- requiredDependencyCollectionScopes );
- final List<ExecutionPlanItem> planItem = defaultLifeCycles.createExecutionPlanItem( project, executions );
+ lifecyclePluginResolver.resolveMissingPluginVersions( project, session );
+
+ final List<MojoExecution> executions = calculateMojoExecutions( session, project, tasks );
- return new MavenExecutionPlan( requiredDependencyResolutionScopes, requiredDependencyCollectionScopes,
- planItem, defaultLifeCycles );
+ setupMojoExections( session, project, requiredDependencyResolutionScopes, requiredDependencyCollectionScopes,
+ executions );
+
+ final List<ExecutionPlanItem> planItem = defaultSchedules.createExecutionPlanItem( project, executions );
+
+ return new MavenExecutionPlan( requiredDependencyResolutionScopes, requiredDependencyCollectionScopes, planItem,
+ defaultLifeCycles );
}
- public List<MojoExecution> calculateExecutionPlan( MavenSession session, MavenProject project, List<Object> tasks,
- Set<String> requiredDependencyResolutionScopes,
- Set<String> requiredDependencyCollectionScopes )
- throws PluginNotFoundException, PluginResolutionException, LifecyclePhaseNotFoundException,
- PluginDescriptorParsingException, MojoNotFoundException, InvalidPluginDescriptorException,
- NoPluginFoundForPrefixException, LifecycleNotFoundException, PluginVersionResolutionException
+ private void setupMojoExections( MavenSession session, MavenProject project,
+ Set<String> requiredDependencyResolutionScopes,
+ Set<String> requiredDependencyCollectionScopes,
+ List<MojoExecution> mojoExecutions )
+ throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
+ MojoNotFoundException, InvalidPluginDescriptorException, NoPluginFoundForPrefixException,
+ LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException
{
- lifecyclePluginResolver.resolveMissingPluginVersions( project, session );
+ for ( MojoExecution mojoExecution : mojoExecutions )
+ {
+ MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
- List<MojoExecution> mojoExecutions = new ArrayList<MojoExecution>();
+ if ( mojoDescriptor == null )
+ {
+ mojoDescriptor = pluginManager.getMojoDescriptor( mojoExecution.getPlugin(), mojoExecution.getGoal(),
+ DefaultRepositoryRequest.getRepositoryRequest(
+ session, project ) );
+
+ mojoExecution.setMojoDescriptor( mojoDescriptor );
+ }
+
+ populateMojoExecutionConfiguration( project, mojoExecution,
+ MojoExecution.Source.CLI.equals( mojoExecution.getSource() ) );
+
+ finalizeMojoConfiguration( mojoExecution );
+
+ calculateForkedExecutions( mojoExecution, session, project, new HashSet<MojoDescriptor>() );
+
+ collectDependencyRequirements( requiredDependencyResolutionScopes, requiredDependencyCollectionScopes,
+ mojoExecution );
+ }
+ }
+
+ private List<MojoExecution> calculateMojoExecutions( MavenSession session, MavenProject project,
+ List<Object> tasks )
+ throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
+ MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
+ PluginVersionResolutionException, LifecyclePhaseNotFoundException
+ {
+ final List<MojoExecution> mojoExecutions = new ArrayList<MojoExecution>();
for ( Object task : tasks )
{
@@ -138,31 +197,6 @@ public class LifecycleExecutionPlanCalcu
throw new IllegalStateException( "unexpected task " + task );
}
}
-
- for ( MojoExecution mojoExecution : mojoExecutions )
- {
- MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
-
- if ( mojoDescriptor == null )
- {
- mojoDescriptor = pluginManager.getMojoDescriptor( mojoExecution.getPlugin(), mojoExecution.getGoal(),
- DefaultRepositoryRequest.getRepositoryRequest(
- session, project ) );
-
- mojoExecution.setMojoDescriptor( mojoDescriptor );
- }
-
- populateMojoExecutionConfiguration( project, mojoExecution,
- MojoExecution.Source.CLI.equals( mojoExecution.getSource() ) );
-
- finalizeMojoConfiguration( mojoExecution );
-
- calculateForkedExecutions( mojoExecution, session, project, new HashSet<MojoDescriptor>() );
-
- collectDependencyRequirements( requiredDependencyResolutionScopes, requiredDependencyCollectionScopes,
- mojoExecution );
- }
-
return mojoExecutions;
}
Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java?rev=935529&r1=935528&r2=935529&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java Mon Apr 19 11:15:42 2010
@@ -15,6 +15,7 @@
package org.apache.maven.lifecycle.internal;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.BuildSuccess;
import org.apache.maven.execution.ExecutionEvent;
import org.apache.maven.execution.MavenSession;
@@ -23,6 +24,8 @@ import org.apache.maven.project.MavenPro
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
+import java.util.HashSet;
+
/**
* Builds one or more lifecycles for a full module
*
@@ -72,7 +75,8 @@ public class LifecycleModuleBuilder
eventCatapult.fire( ExecutionEvent.Type.ProjectStarted, session, null );
BuilderCommon.attachToThread( currentProject );
- MavenExecutionPlan executionPlan = builderCommon.resolveBuildPlan( session, currentProject, taskSegment );
+ MavenExecutionPlan executionPlan =
+ builderCommon.resolveBuildPlan( session, currentProject, taskSegment, new HashSet<Artifact>() );
DependencyContext dependencyContext = new DependencyContext( executionPlan, isAggregating );
mojoExecutor.execute( session, executionPlan.getMojoExecutions(), reactorContext.getProjectIndex(),