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/05/31 11:48:17 UTC
svn commit: r949698 [2/5] - in /maven/maven-3/branches/MNG-1803: ./
apache-maven/ maven-artifact/
maven-artifact/src/main/java/org/apache/maven/artifact/repository/
maven-artifact/src/main/java/org/apache/maven/repository/ maven-compat/
maven-compat/sr...
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java:935334-935341,935664-949690
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java:935334-935341,935664-949690
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java:935334-935341,935664-949690
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java:935334-935341,935664-949690
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java:935334-935341,935664-949690
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java:935334-935341,935664-949690
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/main/mdo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 09:48:12 2010
@@ -5,4 +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
+/maven/maven-3/trunk/maven-compat/src/main/mdo:935334-935341,935664-949690
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 09:48:12 2010
@@ -5,4 +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
+/maven/maven-3/trunk/maven-compat/src/test:935334-935341,935664-949690
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/profiles/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 09:48:12 2010
@@ -5,4 +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
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/profiles:935334-935341,935664-949690
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 09:48:12 2010
@@ -5,4 +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
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java:935334-935341,935664-949690
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 09:48:12 2010
@@ -5,4 +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
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java:935334-935341,935664-949690
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 09:48:12 2010
@@ -5,4 +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
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java:935334-935341,935664-949690
Modified: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java Mon May 31 09:48:12 2010
@@ -64,6 +64,6 @@ public class ProjectInheritanceTest
MavenProject project0 = getProject( pom0 );
MavenProject project1 = getProject( pom1 );
- assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() );
+ assertEquals( pom0Basedir, project1.getParent().getBasedir() );
}
}
Modified: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java Mon May 31 09:48:12 2010
@@ -65,7 +65,7 @@ public class ProjectInheritanceTest
MavenProject project0 = getProjectWithDependencies( pom0 );
MavenProject project1 = getProjectWithDependencies( pom1 );
- assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() );
+ assertEquals( pom0Basedir, project1.getParent().getBasedir() );
Set set = project1.getArtifacts();
assertNotNull( "No artifacts", set );
assertTrue( "No Artifacts", set.size() > 0 );
Modified: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java Mon May 31 09:48:12 2010
@@ -61,7 +61,7 @@ public class ProjectInheritanceTest
MavenProject project0 = getProjectWithDependencies( pom0 );
MavenProject project1 = getProjectWithDependencies( pom1 );
- assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() );
+ assertEquals( pom0Basedir, project1.getParent().getBasedir() );
Set set = project1.getArtifacts();
assertNotNull( "No artifacts", set );
assertTrue( "No Artifacts", set.size() > 0 );
Modified: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java Mon May 31 09:48:12 2010
@@ -61,7 +61,7 @@ public class ProjectInheritanceTest
MavenProject project0 = getProjectWithDependencies( pom0 );
MavenProject project1 = getProjectWithDependencies( pom1 );
- assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() );
+ assertEquals( pom0Basedir, project1.getParent().getBasedir() );
Set set = project1.getArtifacts();
assertNotNull( "No artifacts", set );
assertTrue( "No Artifacts", set.size() > 0 );
Modified: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java Mon May 31 09:48:12 2010
@@ -60,7 +60,7 @@ public class ProjectInheritanceTest
// load everything...
MavenProject project1 = getProjectWithDependencies( pom1 );
- assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() );
+ assertEquals( pom0Basedir, project1.getParent().getBasedir() );
System.out.println("Project " + project1.getId() + " " + project1);
Set set = project1.getArtifacts();
assertNotNull("No artifacts", set);
Modified: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java Mon May 31 09:48:12 2010
@@ -61,7 +61,7 @@ public class ProjectInheritanceTest
MavenProject project0 = getProjectWithDependencies( pom0 );
MavenProject project1 = getProjectWithDependencies( pom1 );
- assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() );
+ assertEquals( pom0Basedir, project1.getParent().getBasedir() );
System.out.println( "Project " + project1.getId() + " " + project1 );
Set set = project1.getArtifacts();
assertNotNull( "No artifacts", set );
Modified: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java Mon May 31 09:48:12 2010
@@ -71,7 +71,7 @@ public class ProjectInheritanceTest
MavenProject project1 = getProjectWithDependencies( pom1 );
assertNotNull("Parent is null", project1.getParent());
- assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() );
+ assertEquals( pom0Basedir, project1.getParent().getBasedir() );
Map map = project1.getArtifactMap();
assertNotNull("No artifacts", map);
@@ -106,7 +106,7 @@ public class ProjectInheritanceTest
MavenProject project0 = getProjectWithDependencies( pom0 );
MavenProject project2 = getProjectWithDependencies( pom2 );
- assertEquals( pom0Basedir, project2.getParent().getBasedir().getCanonicalFile() );
+ assertEquals( pom0Basedir, project2.getParent().getBasedir() );
Map map = project2.getArtifactMap();
assertNotNull( "No artifacts", map );
assertTrue( "No Artifacts", map.size() > 0 );
Modified: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java Mon May 31 09:48:12 2010
@@ -66,7 +66,7 @@ public class ProjectInheritanceTest
MavenProject project0 = getProjectWithDependencies( pom0 );
MavenProject project1 = getProjectWithDependencies( pom1 );
- assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() );
+ assertEquals( pom0Basedir, project1.getParent().getBasedir() );
System.out.println("Project " + project1.getId() + " " + project1);
Map map = project1.getArtifactMap();
assertNotNull("No artifacts", map);
Modified: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java Mon May 31 09:48:12 2010
@@ -58,7 +58,7 @@ public class ProjectInheritanceTest
MavenProject project0 = getProjectWithDependencies( pom0 );
MavenProject project1 = getProjectWithDependencies( pom1 );
- assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() );
+ assertEquals( pom0Basedir, project1.getParent().getBasedir() );
assertNull( "dependencyManagement has overwritten the scope of the currently building child project",
project1.getArtifact().getScope() );
}
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/project/path/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 09:48:12 2010
@@ -5,4 +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
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/path:935334-935341,935664-949690
Propchange: maven/maven-3/branches/MNG-1803/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 09:48:12 2010
@@ -5,4 +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
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -5,4 +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
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java:935334-935341,935664-949690
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 May 31 09:48:12 2010
@@ -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/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java:935334-935341
+/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java:935334-935341,935664-949690
Modified: maven/maven-3/branches/MNG-1803/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/pom.xml?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-core/pom.xml (original)
+++ maven/maven-3/branches/MNG-1803/maven-core/pom.xml Mon May 31 09:48:12 2010
@@ -18,8 +18,11 @@
<artifactId>maven</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
+
<artifactId>maven-core</artifactId>
+
<name>Maven Core</name>
+
<dependencies>
<!-- Maven -->
<dependency>
@@ -73,6 +76,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<resources>
<resource>
@@ -98,6 +102,7 @@
</plugin>
</plugins>
</build>
+
<profiles>
<profile>
<id>svn-buildnumber</id>
Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java Mon May 31 09:48:12 2010
@@ -56,13 +56,11 @@ public class DefaultArtifactFilterManage
artifacts.add( "org.codehaus.plexus:plexus-classworlds" );
artifacts.add( "org.codehaus.plexus:plexus-component-api" );
artifacts.add( "org.codehaus.plexus:plexus-container-default" );
+ artifacts.add( "plexus:plexus-container-default" );
artifacts.add( "org.apache.maven:maven-artifact" );
artifacts.add( "org.apache.maven:maven-artifact-manager" );
- artifacts.add( "org.apache.maven:maven-artifact-resolver" );
- artifacts.add( "org.apache.maven:maven-build-context" );
artifacts.add( "org.apache.maven:maven-compat" );
artifacts.add( "org.apache.maven:maven-core" );
- artifacts.add( "org.apache.maven:maven-error-diagnoser" );
artifacts.add( "org.apache.maven:maven-error-diagnostics" );
artifacts.add( "org.apache.maven:maven-lifecycle" );
artifacts.add( "org.apache.maven:maven-model" );
Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Mon May 31 09:48:12 2010
@@ -39,6 +39,7 @@ import org.apache.maven.execution.MavenS
import org.apache.maven.execution.ProjectDependencyGraph;
import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.lifecycle.internal.ExecutionEventCatapult;
+import org.apache.maven.lifecycle.internal.LifecycleStarter;
import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.model.building.ModelProblemUtils;
import org.apache.maven.model.building.ModelSource;
@@ -74,8 +75,9 @@ public class DefaultMaven
@Requirement
protected ProjectBuilder projectBuilder;
+
@Requirement
- protected LifecycleExecutor lifecycleExecutor;
+ private LifecycleStarter lifecycleStarter;
@Requirement
protected PlexusContainer container;
@@ -243,7 +245,7 @@ public class DefaultMaven
return result;
}
- lifecycleExecutor.execute( session );
+ lifecycleStarter.execute( session );
validateActivatedProfiles( session.getProjects(), request.getActiveProfiles() );
@@ -415,8 +417,8 @@ public class DefaultMaven
for ( ModelProblem problem : result.getProblems() )
{
- logger.warn( problem.getMessage() + " @ "
- + ModelProblemUtils.formatLocation( problem, result.getProjectId() ) );
+ String location = ModelProblemUtils.formatLocation( problem, result.getProjectId() );
+ logger.warn( problem.getMessage() + ( StringUtils.isNotEmpty( location ) ? " @ " + location : "" ) );
}
problems = true;
Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/MavenExecutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 09:48:12 2010
@@ -5,4 +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
+/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/MavenExecutionException.java:935334-935341,935664-949690
Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/MissingModuleException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 09:48:12 2010
@@ -5,4 +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
+/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/MissingModuleException.java:935334-935341,935664-949690
Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java Mon May 31 09:48:12 2010
@@ -370,6 +370,11 @@ public class MavenArtifactRepository
return false;
}
+ public void setBlacklisted( boolean blackListed )
+ {
+ // no op
+ }
+
public boolean isUniqueVersion()
{
return true;
Propchange: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/execution/SettingsAdapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 09:48:12 2010
@@ -5,4 +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
+/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/SettingsAdapter.java:935334-935341,935664-949690
Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Mon May 31 09:48:12 2010
@@ -14,29 +14,19 @@
*/
package org.apache.maven.lifecycle;
-import org.apache.maven.execution.ExecutionEvent;
-import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.lifecycle.internal.BuildListCalculator;
-import org.apache.maven.lifecycle.internal.ConcurrencyDependencyGraph;
-import org.apache.maven.lifecycle.internal.ExecutionEventCatapult;
-import org.apache.maven.lifecycle.internal.LifecycleDebugLogger;
+import org.apache.maven.lifecycle.internal.DependencyContext;
import org.apache.maven.lifecycle.internal.LifecycleExecutionPlanCalculator;
-import org.apache.maven.lifecycle.internal.LifecycleModuleBuilder;
+import org.apache.maven.lifecycle.internal.LifecycleExecutionPlanCalculatorImpl;
+import org.apache.maven.lifecycle.internal.LifecycleStarter;
import org.apache.maven.lifecycle.internal.LifecycleTaskSegmentCalculator;
-import org.apache.maven.lifecycle.internal.LifecycleThreadedBuilder;
-import org.apache.maven.lifecycle.internal.LifecycleWeaveBuilder;
import org.apache.maven.lifecycle.internal.MojoDescriptorCreator;
-import org.apache.maven.lifecycle.internal.ProjectBuildList;
+import org.apache.maven.lifecycle.internal.MojoExecutor;
import org.apache.maven.lifecycle.internal.ProjectIndex;
-import org.apache.maven.lifecycle.internal.ProjectSegment;
-import org.apache.maven.lifecycle.internal.ReactorBuildStatus;
-import org.apache.maven.lifecycle.internal.ReactorContext;
import org.apache.maven.lifecycle.internal.TaskSegment;
-import org.apache.maven.lifecycle.internal.ThreadConfigurationService;
import org.apache.maven.model.Plugin;
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.PluginManagerException;
@@ -48,193 +38,51 @@ import org.apache.maven.plugin.version.P
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.logging.Logger;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ExecutorService;
+import java.util.TreeSet;
/**
+ * A facade that provides lifecycle services to components outside maven core.
+ *
+ * Note that this component is not normally used from within core itself.
+ *
* @author Jason van Zyl
* @author Benjamin Bentmann
* @author Kristian Rosenvold
*/
-@Component(role = LifecycleExecutor.class)
+@Component( role = LifecycleExecutor.class )
public class DefaultLifecycleExecutor
implements LifecycleExecutor
{
@Requirement
- private ExecutionEventCatapult eventCatapult;
-
- @Requirement
private LifeCyclePluginAnalyzer lifeCyclePluginAnalyzer;
@Requirement
private DefaultLifecycles defaultLifeCycles;
@Requirement
- private Logger logger;
-
- @Requirement
- private LifecycleModuleBuilder lifecycleModuleBuilder;
-
- @Requirement
- private LifecycleWeaveBuilder lifeCycleWeaveBuilder;
-
- @Requirement
- private LifecycleThreadedBuilder lifecycleThreadedBuilder;
-
- @Requirement
- private BuildListCalculator buildListCalculator;
-
- @Requirement
- private LifecycleDebugLogger lifecycleDebugLogger;
-
- @Requirement
private LifecycleTaskSegmentCalculator lifecycleTaskSegmentCalculator;
@Requirement
private LifecycleExecutionPlanCalculator lifecycleExecutionPlanCalculator;
@Requirement
- private ThreadConfigurationService threadConfigService;
-
- public DefaultLifecycleExecutor()
- {
- }
-
- public void execute( MavenSession session )
- {
- eventCatapult.fire( ExecutionEvent.Type.SessionStarted, session, null );
-
- MavenExecutionResult result = session.getResult();
-
- try
- {
- if ( !session.isUsingPOMsFromFilesystem() && lifecycleTaskSegmentCalculator.requiresProject( session ) )
- {
- throw new MissingProjectException( "The goal you specified requires a project to execute" +
- " but there is no POM in this directory (" + session.getExecutionRootDirectory() + ")." +
- " Please verify you invoked Maven from the correct directory." );
- }
-
- final MavenExecutionRequest executionRequest = session.getRequest();
- boolean isThreaded = executionRequest.isThreadConfigurationPresent();
- session.setParallel( isThreaded );
-
- List<TaskSegment> taskSegments = buildListCalculator.calculateTaskSegments( session );
-
- ProjectBuildList projectBuilds = buildListCalculator.calculateProjectBuilds( session, taskSegments );
-
- if ( projectBuilds.isEmpty() )
- {
- throw new NoGoalSpecifiedException( "No goals have been specified for this build." +
- " You must specify a valid lifecycle phase or a goal in the format <plugin-prefix>:<goal> or" +
- " <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>." +
- " Available lifecycle phases are: " + defaultLifeCycles.getLifecyclePhaseList() + "." );
- }
-
- ProjectIndex projectIndex = new ProjectIndex( session.getProjects() );
-
- if ( logger.isDebugEnabled() )
- {
- lifecycleDebugLogger.debugReactorPlan( projectBuilds );
- }
-
- ClassLoader oldContextClassLoader = Thread.currentThread().getContextClassLoader();
-
- ReactorBuildStatus reactorBuildStatus = new ReactorBuildStatus( session.getProjectDependencyGraph() );
- ReactorContext callableContext =
- new ReactorContext( result, projectIndex, oldContextClassLoader, reactorBuildStatus );
-
- if ( isThreaded )
- {
- ExecutorService executor = threadConfigService.getExecutorService( executionRequest.getThreadCount(),
- executionRequest.isPerCoreThreadCount(),
- session.getProjects().size() );
- try
- {
-
- final boolean isWeaveMode = LifecycleWeaveBuilder.isWeaveMode( executionRequest );
- if ( isWeaveMode )
- {
- lifecycleDebugLogger.logWeavePlan( session );
- CompletionService<ProjectSegment> service =
- new ExecutorCompletionService<ProjectSegment>( executor );
- lifeCycleWeaveBuilder.build( projectBuilds, callableContext, taskSegments, session, service,
- reactorBuildStatus );
- }
- else
- {
- ConcurrencyDependencyGraph analyzer =
- new ConcurrencyDependencyGraph( projectBuilds, session.getProjectDependencyGraph() );
-
- CompletionService<ProjectSegment> service =
- new ExecutorCompletionService<ProjectSegment>( executor );
-
- lifecycleThreadedBuilder.build( session, callableContext, projectBuilds, taskSegments, analyzer,
- service );
- }
- }
- finally
- {
- executor.shutdown();
- }
- }
- else
- {
- singleThreadedBuild( session, callableContext, projectBuilds, taskSegments, reactorBuildStatus );
- }
-
- }
-
- catch (
-
- Exception e
-
- )
+ private MojoExecutor mojoExecutor;
- {
- result.addException( e );
- }
+ @Requirement
+ private LifecycleStarter lifecycleStarter;
- eventCatapult.fire( ExecutionEvent.Type.SessionEnded, session, null );
- }
- private void singleThreadedBuild( MavenSession session, ReactorContext callableContext,
- ProjectBuildList projectBuilds, List<TaskSegment> taskSegments,
- ReactorBuildStatus reactorBuildStatus )
+ public void execute( MavenSession session )
{
- for ( TaskSegment taskSegment : taskSegments )
- {
- for ( ProjectSegment projectBuild : projectBuilds.getByTaskSegment( taskSegment ) )
- {
- try
- {
- lifecycleModuleBuilder.buildProject( session, callableContext, projectBuild.getProject(),
- taskSegment );
- if ( reactorBuildStatus.isHalted() )
- {
- break;
- }
- }
- catch ( Exception e )
- {
- break; // Why are we just ignoring this exception? Are exceptions are being used for flow control
- }
-
- }
- }
+ lifecycleStarter.execute( session );
}
- /**
- * * CRUFT GOES BELOW HERE ***
- */
-
@Requirement
private MojoDescriptorCreator mojoDescriptorCreator;
@@ -248,6 +96,7 @@ public class DefaultLifecycleExecutor
// from the plugin.xml inside a plugin.
//
// TODO: This whole method could probably removed by injecting lifeCyclePluginAnalyzer straight into client site.
+ // TODO: But for some reason the whole plexus appcontext refuses to start when I try this.
public Set<Plugin> getPluginsBoundByDefaultToAllLifecycles( String packaging )
{
@@ -256,7 +105,7 @@ public class DefaultLifecycleExecutor
// USED BY MAVEN HELP PLUGIN
- @SuppressWarnings({"UnusedDeclaration"})
+ @SuppressWarnings( { "UnusedDeclaration" } )
@Deprecated
public Map<String, Lifecycle> getPhaseToLifecycleMap()
{
@@ -265,7 +114,7 @@ public class DefaultLifecycleExecutor
// NOTE: Backward-compat with maven-help-plugin:2.1
- @SuppressWarnings({"UnusedDeclaration"})
+ @SuppressWarnings( { "UnusedDeclaration" } )
MojoDescriptor getMojoDescriptor( String task, MavenSession session, MavenProject project, String invokedVia,
boolean canUsePrefix, boolean isOptionalMojo )
throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
@@ -277,7 +126,7 @@ public class DefaultLifecycleExecutor
// Used by m2eclipse
- @SuppressWarnings({"UnusedDeclaration"})
+ @SuppressWarnings( { "UnusedDeclaration" } )
public MavenExecutionPlan calculateExecutionPlan( MavenSession session, String... tasks )
throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
@@ -285,7 +134,7 @@ public class DefaultLifecycleExecutor
PluginVersionResolutionException
{
- List<TaskSegment> taskSegments = buildListCalculator.calculateTaskSegments( session );
+ List<TaskSegment> taskSegments = lifecycleTaskSegmentCalculator.calculateTaskSegments( session );
TaskSegment mergedSegment = new TaskSegment( false );
@@ -298,4 +147,34 @@ public class DefaultLifecycleExecutor
mergedSegment.getTasks() );
}
+ // Site 3.x
+ public void calculateForkedExecutions( MojoExecution mojoExecution, MavenSession session )
+ throws MojoNotFoundException, PluginNotFoundException, PluginResolutionException,
+ PluginDescriptorParsingException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
+ LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException
+ {
+ lifecycleExecutionPlanCalculator.calculateForkedExecutions( mojoExecution, session );
+ }
+
+
+ // Site 3.x
+ public List<MavenProject> executeForkedExecutions( MojoExecution mojoExecution, MavenSession session )
+ throws LifecycleExecutionException
+ {
+ Set<String> requiredDependencyResolutionScopes = new TreeSet<String>();
+ Set<String> requiredDependencyCollectionScopes = new TreeSet<String>();
+ // Ok, so this method could probably have a better location.
+ LifecycleExecutionPlanCalculatorImpl.collectDependencyRequirements( requiredDependencyResolutionScopes,
+ requiredDependencyCollectionScopes,
+ mojoExecution );
+
+ final DependencyContext context =
+ new DependencyContext( requiredDependencyCollectionScopes, requiredDependencyResolutionScopes,
+ mojoExecution.getMojoDescriptor().isAggregator() );
+ mojoExecutor.executeForkedExecutions( mojoExecution, session, new ProjectIndex( session.getProjects() ),
+ context );
+ return Collections.emptyList();
+ }
+
+
}
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=949698&r1=949697&r2=949698&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 May 31 09:48:12 2010
@@ -14,6 +14,8 @@
*/
package org.apache.maven.lifecycle;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.StringUtils;
@@ -32,14 +34,17 @@ import java.util.Set;
*/
// TODO: The configuration for the lifecycle needs to be externalized so that I can use the annotations properly for the
// wiring and reference and external source for the lifecycle configuration.
+@Component( role = DefaultLifecycles.class )
public class DefaultLifecycles
{
public static final String[] STANDARD_LIFECYCLES = { "default", "clean", "site" };
// @Configuration(source="org/apache/maven/lifecycle/lifecycles.xml")
+ @Requirement( role = Lifecycle.class )
private Map<String, Lifecycle> lifecycles;
+ @Requirement
private Logger logger;
@SuppressWarnings( { "UnusedDeclaration" } )
Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultSchedules.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultSchedules.java?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultSchedules.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultSchedules.java Mon May 31 09:48:12 2010
@@ -65,7 +65,7 @@ public class DefaultSchedules
Schedule schedule = null;
if ( scheduling != null )
{
- schedule = scheduling.getSchedule( mojoExecution.getPlugin() );
+ schedule = scheduling.getSchedule( mojoExecution );
if ( schedule == null )
{
schedule = scheduling.getSchedule( lifeCyclePhase );
Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java Mon May 31 09:48:12 2010
@@ -1,18 +1,4 @@
package org.apache.maven.lifecycle;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java Mon May 31 09:48:12 2010
@@ -19,11 +19,10 @@ package org.apache.maven.lifecycle;
* under the License.
*/
-import java.util.Set;
-
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
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.PluginManagerException;
@@ -31,10 +30,18 @@ import org.apache.maven.plugin.PluginNot
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 java.util.List;
+import java.util.Set;
/**
+ * A facade that provides lifecycle services to components outside maven core.
+ *
+ *
* @author Jason van Zyl
*/
+@SuppressWarnings( { "UnusedDeclaration" } )
public interface LifecycleExecutor
{
@@ -51,6 +58,7 @@ public interface LifecycleExecutor
// 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.
@@ -65,4 +73,14 @@ public interface LifecycleExecutor
void execute( MavenSession session );
+ public void calculateForkedExecutions( MojoExecution mojoExecution, MavenSession session )
+ throws MojoNotFoundException, PluginNotFoundException, PluginResolutionException,
+ PluginDescriptorParsingException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
+ LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException;
+
+
+ public List<MavenProject> executeForkedExecutions( MojoExecution mojoExecution, MavenSession session )
+ throws LifecycleExecutionException;
+
+
}
Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java Mon May 31 09:48:12 2010
@@ -20,16 +20,10 @@ package org.apache.maven.lifecycle;
*/
import org.apache.maven.lifecycle.internal.ExecutionPlanItem;
+import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.MojoExecution;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
//TODO: lifecycles being executed
//TODO: what runs in each phase
@@ -196,6 +190,21 @@ public class MavenExecutionPlan
return result;
}
+
+ public Set<Plugin> getNonThreadSafePlugins()
+ {
+ Set<Plugin> plugins = new HashSet<Plugin>();
+ for ( ExecutionPlanItem executionPlanItem : planItem )
+ {
+ final MojoExecution mojoExecution = executionPlanItem.getMojoExecution();
+ if ( !mojoExecution.getMojoDescriptor().isThreadSafe() )
+ {
+ plugins.add( mojoExecution.getPlugin() );
+ }
+ }
+ return plugins;
+ }
+
// Used by m2e but will be removed, really.
@SuppressWarnings({"UnusedDeclaration"})
Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/Schedule.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/Schedule.java?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/Schedule.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/Schedule.java Mon May 31 09:48:12 2010
@@ -15,54 +15,67 @@
package org.apache.maven.lifecycle;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.plugin.descriptor.MojoDescriptor;
+import org.apache.maven.plugin.MojoExecution;
/**
* @author Kristian Rosenvold
*/
-public class Schedule {
+@SuppressWarnings( { "UnusedDeclaration" } )
+public class Schedule
+{
private String phase;
- private String mojoClass;
+
+ private String upstreamPhase; // The upstream phase to lock to.
+
+ private String pluginKey;
+
+ private String mojoGoal;
+
private boolean mojoSynchronized;
// Indicates that this phase/mojo does not need to respect the reactor-dependency graph
// (Module lifecycle order still must be respected )
+
private boolean parallel;
- public Schedule() {
+ public Schedule()
+ {
}
- public Schedule( String phase, boolean mojoSynchronized, boolean parallel ) {
+ public Schedule( String phase, boolean mojoSynchronized, boolean parallel )
+ {
this.phase = phase;
this.mojoSynchronized = mojoSynchronized;
this.parallel = parallel;
}
- public boolean isMissingPhase(){
- return null == phase;
- }
- public String getPhase() {
+ public String getPhase()
+ {
return phase;
}
- public void setPhase(String phase) {
+ public void setPhase( String phase )
+ {
this.phase = phase;
}
- public String getMojoClass() {
- return mojoClass;
+ public String getPluginKey()
+ {
+ return pluginKey;
}
- public void setMojoClass(String mojoClass) {
- this.mojoClass = mojoClass;
+ public void setPluginKey( String pluginKey )
+ {
+ this.pluginKey = pluginKey;
}
- public boolean isMojoSynchronized() {
+ public boolean isMojoSynchronized()
+ {
return mojoSynchronized;
}
- public void setMojoSynchronized(boolean mojoSynchronized) {
+ public void setMojoSynchronized( boolean mojoSynchronized )
+ {
this.mojoSynchronized = mojoSynchronized;
}
@@ -77,14 +90,60 @@ public class Schedule {
this.parallel = parallel;
}
+ public String getUpstreamPhase()
+ {
+ return upstreamPhase;
+ }
+
+ public void setUpstreamPhase( String upstreamPhase )
+ {
+ this.upstreamPhase = upstreamPhase;
+ }
+
+ public String getMojoGoal()
+ {
+ return mojoGoal;
+ }
+
+ public void setMojoGoal( String mojoGoal )
+ {
+ this.mojoGoal = mojoGoal;
+ }
+
+ public boolean hasUpstreamPhaseDefined()
+ {
+ return getUpstreamPhase() != null;
+ }
+
+ public boolean appliesTo( MojoExecution mojoExecution )
+ {
+ boolean pluginKeyMatches = true;
+ boolean pluginGoalMatches = true;
+ if ( pluginKey == null && mojoGoal == null )
+ {
+ return false;
+ }
+ if ( pluginKey != null )
+ {
+ pluginKeyMatches = pluginKey.equals( mojoExecution.getPlugin().getKey() );
+ }
+ if ( mojoGoal != null )
+ {
+ pluginGoalMatches = mojoGoal.equals( mojoExecution.getGoal() );
+ }
+
+ if ( pluginKeyMatches && pluginGoalMatches )
+ {
+ return true;
+ }
+ return false;
+ }
@Override
- public String toString() {
- return "Schedule{" +
- "phase='" + phase + '\'' +
- ", mojoClass='" + mojoClass + '\'' +
- ", mojoSynchronized=" + mojoSynchronized +
- ", parallel=" + parallel +
- '}';
+ public String toString()
+ {
+ return "Schedule{" + "phase='" + phase + '\'' + ", upstreamPhase='" + upstreamPhase + '\'' + ", pluginKey='" +
+ pluginKey + '\'' + ", mojoGoal='" + mojoGoal + '\'' + ", mojoSynchronized=" + mojoSynchronized +
+ ", parallel=" + parallel + '}';
}
}
Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/Scheduling.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/Scheduling.java?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/Scheduling.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/Scheduling.java Mon May 31 09:48:12 2010
@@ -15,10 +15,9 @@
package org.apache.maven.lifecycle;
-import org.apache.maven.model.Plugin;
+import org.apache.maven.plugin.MojoExecution;
import java.util.List;
-import java.util.Map;
/**
* Class Scheduling.
@@ -29,46 +28,66 @@ public class Scheduling
private List<Schedule> schedules;
- public Scheduling() {
+ public Scheduling()
+ {
}
- public Scheduling(String lifecycle, List<Schedule> schedules) {
+ public Scheduling( String lifecycle, List<Schedule> schedules )
+ {
this.lifecycle = lifecycle;
this.schedules = schedules;
}
- public String getLifecycle() {
+ public String getLifecycle()
+ {
return lifecycle;
}
- public void setLifecycle(String lifecycle) {
+ public void setLifecycle( String lifecycle )
+ {
this.lifecycle = lifecycle;
}
- public List<Schedule> getSchedules() {
+ public List<Schedule> getSchedules()
+ {
return schedules;
}
- public Schedule getSchedule(String phaseName){
- if (phaseName == null) return null;
- for (Schedule schedule : schedules) {
- if (phaseName.equals(schedule.getPhase()) )
+ public Schedule getSchedule( String phaseName )
+ {
+ if ( phaseName == null )
+ {
+ return null;
+ }
+ for ( Schedule schedule : schedules )
+ {
+ if ( phaseName.equals( schedule.getPhase() ) )
+ {
return schedule;
+ }
}
return null;
}
-
- public Schedule getSchedule(Plugin mojoClass){
- if (mojoClass == null) return null;
- for (Schedule schedule : schedules) {
- if (mojoClass.getKey().equals(schedule.getMojoClass()) )
+
+ public Schedule getSchedule( MojoExecution mojoExecution )
+ {
+ if ( mojoExecution == null )
+ {
+ return null;
+ }
+ for ( Schedule schedule : schedules )
+ {
+ if ( schedule.appliesTo( mojoExecution ) )
+ {
return schedule;
+ }
}
return null;
}
- public void setSchedules(List<Schedule> schedules) {
+ public void setSchedules( List<Schedule> schedules )
+ {
this.schedules = schedules;
}
}
\ No newline at end of file
Modified: maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java?rev=949698&r1=949697&r2=949698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java (original)
+++ maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java Mon May 31 09:48:12 2010
@@ -15,18 +15,10 @@
package org.apache.maven.lifecycle.internal;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.lifecycle.LifecycleNotFoundException;
-import org.apache.maven.lifecycle.LifecyclePhaseNotFoundException;
-import org.apache.maven.plugin.*;
-import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException;
-import org.apache.maven.plugin.version.PluginVersionResolutionException;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.util.StringUtils;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -34,43 +26,9 @@ import java.util.List;
* @author Kristian Rosenvold
* This class is not part of any public api and can be changed or deleted without prior notice.
*/
-@Component(role = BuildListCalculator.class)
+@Component( role = BuildListCalculator.class )
public class BuildListCalculator
{
- @Requirement
- private LifecycleTaskSegmentCalculator lifeCycleTaskSegmentCalculator;
-
- @SuppressWarnings({"UnusedDeclaration"})
- public BuildListCalculator()
- {
- }
-
- public BuildListCalculator( LifecycleTaskSegmentCalculator lifeCycleTaskSegmentCalculator )
- {
- this.lifeCycleTaskSegmentCalculator = lifeCycleTaskSegmentCalculator;
- }
-
- public List<TaskSegment> calculateTaskSegments( MavenSession session )
- throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
- MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
- PluginVersionResolutionException, LifecyclePhaseNotFoundException, LifecycleNotFoundException
- {
-
- MavenProject rootProject = session.getTopLevelProject();
-
- List<String> tasks = session.getGoals();
-
- if ( tasks == null || tasks.isEmpty() )
- {
- if ( !StringUtils.isEmpty( rootProject.getDefaultGoal() ) )
- {
- tasks = Arrays.asList( StringUtils.split( rootProject.getDefaultGoal() ) );
- }
- }
-
- return lifeCycleTaskSegmentCalculator.calculateTaskSegments( session, tasks );
- }
-
public ProjectBuildList calculateProjectBuilds( MavenSession session, List<TaskSegment> taskSegments )
{
List<ProjectSegment> projectBuilds = new ArrayList<ProjectSegment>();