svn commit: r519528 - in /maven/plugins/trunk/maven-dependency-plugin: pom.xml src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java

[brianf]

Author: brianf
Date: Sat Mar 17 20:00:32 2007
New Revision: 519528

URL: http://svn.apache.org/viewvc?view=rev&rev=519528
Log:
changed analyzer dependency to release version and excluded direct dependency 
override from depMgt checks.

Modified:
    maven/plugins/trunk/maven-dependency-plugin/pom.xml
    
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java

Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?view=diff&rev=519528&r1=519527&r2=519528
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Sat Mar 17 20:00:32 2007
@@ -115,6 +115,11 @@
        <dependencies>
                <dependency>
                        <groupId>org.apache.maven</groupId>
+                       <artifactId>maven-core</artifactId>
+                       <version>2.0.5</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.maven</groupId>
                        <artifactId>maven-artifact</artifactId>
                        <version>2.0.5</version>
                </dependency>

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java?view=diff&rev=519528&r1=519527&r2=519528
==============================================================================
--- 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
 Sat Mar 17 20:00:32 2007
@@ -134,20 +134,18 @@
             }
 
             Set allDependencies = project.getArtifacts();
+            
+            //don't warn if a dependency that is directly listed overrides 
depMgt. That's ok.
+            Set directDependencies = project.getDependencyArtifacts();
+            allDependencies.removeAll( directDependencies );
+       
             iter = allDependencies.iterator();
             while ( iter.hasNext() )
             {
                 Artifact artifact = (Artifact) iter.next();
-                // getLog().info( "a:"+getArtifactManagementKey( artifact ) );
-                // see if this artifact matches anything in the dependencyMgt
-                // list
                 Dependency dep = (Dependency) map.get( 
getArtifactManagementKey( artifact ) );
                 if ( dep != null )
                 {
-                    // getLog().info( "Compare:" + dep.getManagementKey()+"
-                    // v:"+dep.getVersion()+"a:"+artifact.getVersion());
-                    // ArtifactVersion depVersion = new
-                    // DefaultArtifactVersion(dep.getVersion());
                     ArtifactVersion artifactVersion = new 
DefaultArtifactVersion( artifact.getVersion() );
 
                     if ( !artifact.isSnapshot() && !dep.getVersion().equals( 
artifact.getVersion() ) )