Author: jdcasey Date: Sat Aug 27 08:44:48 2005 New Revision: 240428 URL: http://svn.apache.org/viewcvs?rev=240428&view=rev Log: Resolving: MNG-717
o Dependencies don't have a default scope value, to allow DependencyManagement to set the scope if null...then, the metadata source sets the scope to 'compile' when it constructs the artifacts from deps that still have a null scope. Oh, and it will at that point back-propagate the 'compile' scope to these dependency instances, for later reference... Modified: maven/components/trunk/maven-model/maven.mdo maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java Modified: maven/components/trunk/maven-model/maven.mdo URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-model/maven.mdo?rev=240428&r1=240427&r2=240428&view=diff ============================================================================== --- maven/components/trunk/maven-model/maven.mdo (original) +++ maven/components/trunk/maven-model/maven.mdo Sat Aug 27 08:44:48 2005 @@ -1248,7 +1248,10 @@ <a href="http://maven.apache.org/maven2/dependencies.html">Dependency Mechanism</a>.]]> </description> <type>String</type> - <defaultValue>compile</defaultValue> + <!-- This default has to be enforced at the maven-artifact layer, to allow + | injection of defaults from <dependencyManagement/>. + |--> + <!-- defaultValue>compile</defaultValue --> </field> <field> <name>exclusions</name> Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=240428&r1=240427&r2=240428&view=diff ============================================================================== --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original) +++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Sat Aug 27 08:44:48 2005 @@ -36,6 +36,7 @@ import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.project.ProjectBuildingException; import org.codehaus.plexus.logging.AbstractLogEnabled; +import org.codehaus.plexus.util.StringUtils; import java.util.ArrayList; import java.util.Collections; @@ -235,11 +236,20 @@ for ( Iterator i = dependencies.iterator(); i.hasNext(); ) { Dependency d = (Dependency) i.next(); + + String scope = d.getScope(); + + if ( StringUtils.isEmpty( scope ) ) + { + scope = Artifact.SCOPE_COMPILE; + + d.setScope( scope ); + } VersionRange versionRange = VersionRange.createFromVersionSpec( d.getVersion() ); Artifact artifact = artifactFactory.createDependencyArtifact( d.getGroupId(), d.getArtifactId(), versionRange, d.getType(), d.getClassifier(), - d.getScope(), inheritedScope ); + scope, inheritedScope ); if ( artifact != null && ( dependencyFilter == null || dependencyFilter.include( artifact ) ) ) { Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java?rev=240428&r1=240427&r2=240428&view=diff ============================================================================== --- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java (original) +++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java Sat Aug 27 08:44:48 2005 @@ -38,6 +38,7 @@ import org.codehaus.plexus.context.ContextException; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; import org.codehaus.plexus.util.IOUtil; +import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import java.io.File; @@ -144,10 +145,19 @@ { Dependency d = (Dependency) i.next(); + String scope = d.getScope(); + + if ( StringUtils.isEmpty( scope ) ) + { + scope = Artifact.SCOPE_COMPILE; + + d.setScope( scope ); + } + VersionRange versionRange = VersionRange.createFromVersionSpec( d.getVersion() ); Artifact artifact = artifactFactory.createDependencyArtifact( d.getGroupId(), d.getArtifactId(), versionRange, d.getType(), - d.getClassifier(), d.getScope(), + d.getClassifier(), scope, inheritedScope ); if ( artifact != null ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]