maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdca...@apache.org
Subject svn commit: r588326 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Date Thu, 25 Oct 2007 19:58:14 GMT
Author: jdcasey
Date: Thu Oct 25 12:58:14 2007
New Revision: 588326

URL: http://svn.apache.org/viewvc?rev=588326&view=rev
Log:
use managed versions when resolving project dependencies from the plugin manager before executing
a mojo, and include system path in system-scoped artifacts within the managed version map.

Modified:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=588326&r1=588325&r2=588326&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Thu Oct 25 12:58:14 2007
@@ -1385,7 +1385,7 @@
         ArtifactResolutionResult result = artifactResolver.resolveTransitively(
                                                                                 project.getDependencyArtifacts(),
                                                                                 artifact,
-                                                                                Collections.EMPTY_MAP,
+                                                                                project.getManagedVersionMap(),
                                                                                 context.getLocalRepository(),
                                                                                 project.getRemoteArtifactRepositories(),
                                                                                 artifactMetadataSource,
@@ -1424,7 +1424,7 @@
         if ( pluginRealm == null )
         {
             getLogger().warn( "getPluginComponent(" + plugin + ", " + role + "): descriptor
is missing classRealm" );
-            
+
             pluginRealm = container.getLookupRealm();
         }
 

Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=588326&r1=588325&r2=588326&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Thu Oct 25 12:58:14 2007
@@ -340,6 +340,11 @@
                     Artifact artifact = artifactFactory.createDependencyArtifact( d.getGroupId(),
d.getArtifactId(), versionRange, d.getType(),
                         d.getClassifier(), d.getScope(), d.isOptional() );
 
+                    if ( Artifact.SCOPE_SYSTEM.equals( d.getScope() ) && ( d.getSystemPath()
!= null ) )
+                    {
+                        artifact.setFile( new File( d.getSystemPath() ) );
+                    }
+
                     if ( getLogger().isDebugEnabled() )
                     {
                         getLogger().debug( "  " + artifact );
@@ -1090,7 +1095,7 @@
     }
 
     /**
-     * 
+     *
      * @param projectId
      * @param plugins
      * @param pomLocation pom file



Mime
View raw message