You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/07/04 17:49:47 UTC

svn commit: r1607880 - /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/DisplayAncestorsMojo.java

Author: hboutemy
Date: Fri Jul  4 15:49:47 2014
New Revision: 1607880

URL: http://svn.apache.org/r1607880
Log:
removed @Override which is causing problems on some JDKs since it is an implemented interface, not an overridden method

Modified:
    maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/DisplayAncestorsMojo.java

Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/DisplayAncestorsMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/DisplayAncestorsMojo.java?rev=1607880&r1=1607879&r2=1607880&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/DisplayAncestorsMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/DisplayAncestorsMojo.java Fri Jul  4 15:49:47 2014
@@ -23,9 +23,9 @@ import org.apache.commons.lang.StringUti
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 
 import java.util.ArrayList;
@@ -41,24 +41,26 @@ import java.util.Locale;
  */
 @Mojo( name = "display-ancestors", threadSafe = true, requiresProject = true, defaultPhase = LifecyclePhase.VALIDATE )
 public class DisplayAncestorsMojo
-    extends AbstractMojo {
+    extends AbstractMojo
+{
 
     /**
      * POM
      */
-    @Component
+    @Parameter( defaultValue = "${project}", readonly = true )
     private MavenProject project;
 
-    @Override
     public void execute()
         throws MojoExecutionException, MojoFailureException
     {
-
         final List<String> ancestors = collectAncestors();
 
-        if ( ancestors.isEmpty() ) {
+        if ( ancestors.isEmpty() )
+        {
             getLog().info( "No Ancestor POMs!" );
-        } else {
+        }
+        else
+        {
             getLog().info( String.format( Locale.US, "Ancestor POMs: %s", StringUtils.join( ancestors, " <- " ) ) );
         }
 
@@ -67,14 +69,18 @@ public class DisplayAncestorsMojo
     private ArrayList<String> collectAncestors()
     {
         final ArrayList<String> ancestors = new ArrayList<String>();
+
         MavenProject currentAncestor = project.getParent();
         while ( currentAncestor != null )
         {
             final String gav = String.format( Locale.US, "%s:%s:%s",
                     currentAncestor.getGroupId(), currentAncestor.getArtifactId(), currentAncestor.getVersion() );
+
             ancestors.add( gav );
+
             currentAncestor = currentAncestor.getParent();
         }
+
         return ancestors;
     }