svn commit: r519377 - /maven/plugins/branches/maven-dependency-plugin-w-analyzer/src/main/java/org/apache/maven/plugin/dependency/AnalyzeMojo.java

[brianf]

Author: brianf
Date: Sat Mar 17 10:37:26 2007
New Revision: 519377

URL: http://svn.apache.org/viewvc?view=rev&rev=519377
Log:
fixed up analyze output

Modified:
    
maven/plugins/branches/maven-dependency-plugin-w-analyzer/src/main/java/org/apache/maven/plugin/dependency/AnalyzeMojo.java

Modified: 
maven/plugins/branches/maven-dependency-plugin-w-analyzer/src/main/java/org/apache/maven/plugin/dependency/AnalyzeMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/branches/maven-dependency-plugin-w-analyzer/src/main/java/org/apache/maven/plugin/dependency/AnalyzeMojo.java?view=diff&rev=519377&r1=519376&r2=519377
==============================================================================
--- 
maven/plugins/branches/maven-dependency-plugin-w-analyzer/src/main/java/org/apache/maven/plugin/dependency/AnalyzeMojo.java
 (original)
+++ 
maven/plugins/branches/maven-dependency-plugin-w-analyzer/src/main/java/org/apache/maven/plugin/dependency/AnalyzeMojo.java
 Sat Mar 17 10:37:26 2007
@@ -66,21 +66,21 @@
     /**
      * Check for dependency / dependencyMgt conflicts
      * 
-     * @parameter expression=${mdep.checkDepMgt}
+     * @parameter expression="${mdep.checkDepMgt}"
      */
     private boolean checkDependencyMgt = true;
 
     /**
      * Check dependency conflicts
      * 
-     * @parameter expression=${mdep.checkDependencies}
+     * @parameter expression="${mdep.checkDependencies}"
      */
     private boolean checkDependencies = false;
 
     /**
      * Fail Build on problem
      * 
-     * @parameter expression=${mdep.failBuild}
+     * @parameter expression="${mdep.failBuild}"
      */
     private boolean failBuild = false;
 
@@ -104,7 +104,7 @@
         boolean result = false;
         if ( this.checkDependencies )
         {
-            checkDependencies();
+            result = checkDependencies();
         }
 
         if ( this.checkDependencyMgt )
@@ -120,9 +120,10 @@
 
     // private methods --------------------------------------------------------
 
-    private void checkDependencies()
+    private boolean checkDependencies()
         throws MojoExecutionException
     {
+        boolean result = false;
         try
         {
             ProjectDependencyAnalysis analysis = analyzer.analyze( project );
@@ -144,6 +145,7 @@
             throw new MojoExecutionException( "Cannot analyze dependencies", 
exception );
         }
 
+        return result;
     }
 
     private boolean checkDependencyManagement()
@@ -176,17 +178,19 @@
             while ( iter.hasNext() )
             {
                 Artifact artifact = (Artifact) iter.next();
-               // getLog().info( "a:"+getArtifactManagementKey( artifact ) );
+                // 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() ) )
+                    // 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() ) )
 
                     {
                         logMismatch( artifact, dep );
@@ -233,9 +237,9 @@
             throw new MojoExecutionException( "Invalid params: Artifact:" + 
artifact + " Dependency:" + dependency );
         }
 
-        getLog().info(
-                       "   Resolved Dependency: " + 
dependency.getManagementKey() +":"+dependency.getVersion()+ " Dependency 
Management: "
-                           + getArtifactManagementKey( artifact 
)+":"+artifact.getVersion() );
+        getLog().info("\tDependency: " + dependency.getManagementKey());
+        getLog().info( "\t\tDepMgt  : " + artifact.getVersion());
+        getLog().info( "\t\tResolved: " + dependency.getVersion() );
     }
 
     private String getArtifactManagementKey( Artifact artifact )