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 2011/10/03 22:53:49 UTC

svn commit: r1178573 - in /maven/shared/trunk/maven-dependency-analyzer: ./ src/main/java/org/apache/maven/shared/dependency/analyzer/ src/main/java/org/apache/maven/shared/dependency/analyzer/asm/

Author: hboutemy
Date: Mon Oct  3 20:53:48 2011
New Revision: 1178573

URL: http://svn.apache.org/viewvc?rev=1178573&view=rev
Log:
use plexus java 5 annotations instead of old-style javadoc annotations

Modified:
    maven/shared/trunk/maven-dependency-analyzer/pom.xml
    maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java
    maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
    maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzer.java

Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/pom.xml?rev=1178573&r1=1178572&r2=1178573&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/pom.xml (original)
+++ maven/shared/trunk/maven-dependency-analyzer/pom.xml Mon Oct  3 20:53:48 2011
@@ -63,6 +63,11 @@
       <version>1.5.1</version>
     </dependency>
     <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-annotations</artifactId>
+      <version>1.5.5</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
       <version>${mavenVersion}</version>
@@ -113,11 +118,11 @@
       </plugin>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
+        <artifactId>plexus-component-metadata</artifactId>
         <executions>
           <execution>
             <goals>
-              <goal>descriptor</goal>
+              <goal>generate-metadata</goal>
             </goals>
           </execution>
         </executions>

Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java?rev=1178573&r1=1178572&r2=1178573&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java Mon Oct  3 20:53:48 2011
@@ -24,13 +24,15 @@ import java.net.URL;
 import java.util.Set;
 import java.util.zip.ZipException;
 
+import org.codehaus.plexus.component.annotations.Component;
+
 /**
  *
  *
  * @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
  * @version $Id$
- * @plexus.component role="org.apache.maven.shared.dependency.analyzer.ClassAnalyzer"
  */
+@Component( role = ClassAnalyzer.class )
 public class DefaultClassAnalyzer
     implements ClassAnalyzer
 {

Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java?rev=1178573&r1=1178572&r2=1178573&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java Mon Oct  3 20:53:48 2011
@@ -31,14 +31,16 @@ import java.util.Set;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 
 /**
  * 
  * 
  * @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
  * @version $Id$
- * @plexus.component role="org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalyzer" role-hint="default"
  */
+@Component( role = ProjectDependencyAnalyzer.class )
 public class DefaultProjectDependencyAnalyzer
     implements ProjectDependencyAnalyzer
 {
@@ -46,16 +48,14 @@ public class DefaultProjectDependencyAna
 
     /**
      * ClassAnalyzer
-     * 
-     * @plexus.requirement
      */
+    @Requirement
     private ClassAnalyzer classAnalyzer;
 
     /**
      * DependencyAnalyzer
-     * 
-     * @plexus.requirement
      */
+    @Requirement
     private DependencyAnalyzer dependencyAnalyzer;
 
     // ProjectDependencyAnalyzer methods --------------------------------------

Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzer.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzer.java?rev=1178573&r1=1178572&r2=1178573&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzer.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzer.java Mon Oct  3 20:53:48 2011
@@ -25,14 +25,15 @@ import java.util.Set;
 
 import org.apache.maven.shared.dependency.analyzer.ClassFileVisitorUtils;
 import org.apache.maven.shared.dependency.analyzer.DependencyAnalyzer;
+import org.codehaus.plexus.component.annotations.Component;
 
 /**
  * ASMDependencyAnalyzer 
  * 
  * @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
  * @version $Id$
- * @plexus.component role="org.apache.maven.shared.dependency.analyzer.DependencyAnalyzer"
  */
+@Component( role = DependencyAnalyzer.class )
 public class ASMDependencyAnalyzer
     implements DependencyAnalyzer
 {