svn commit: r731252 - in /maven/plugins/trunk: maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/ maven-dependency-plugin/src/main/java/org/apache/maven/plug...

Sun, 04 Jan 2009 05:12:22 -0800 

Author: bentmann
Date: Sun Jan  4 05:11:57 2009
New Revision: 731252

URL: http://svn.apache.org/viewvc?rev=731252&view=rev
Log:
o Avoided deprecated syntax @parameter expression="${component...}"

Modified:
    
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
    
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/VelocityTemplate.java
    
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
    
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java
    
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/AbstractDeployMojo.java
    
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
    
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
    
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java
    
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
    
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
    
maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/MavenOnePluginMojo.java
    
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
    
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
    
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java
    
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java

Modified: 
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java?rev=731252&r1=731251&r2=731252&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
 (original)
+++ 
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
 Sun Jan  4 05:11:57 2009
@@ -236,9 +236,7 @@
     private File outputDirectory;
 
     /**
-     * @parameter 
expression="${component.org.codehaus.doxia.site.renderer.SiteRenderer}"
-     * @required
-     * @readonly
+     * @component
      */
     private SiteRenderer siteRenderer;
 
@@ -250,9 +248,7 @@
     private boolean offline;
 
     /**
-     * @parameter 
expression="${component.org.apache.maven.scm.manager.ScmManager}"
-     * @required
-     * @readonly
+     * @component
      */
     private ScmManager manager;
 

Modified: 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/VelocityTemplate.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/VelocityTemplate.java?rev=731252&r1=731251&r2=731252&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/VelocityTemplate.java
 (original)
+++ 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/VelocityTemplate.java
 Sun Jan  4 05:11:57 2009
@@ -44,8 +44,7 @@
  * <pre>
  * /&#042;&#042;
  *  &#042; Velocity Component
- *  &#042; &#064;parameter 
expression="${component.org.codehaus.plexus.velocity.VelocityComponent}"
- *  &#042; &#064;readonly
+ *  &#042; &#064;component
  *  &#042;/
  *  private VelocityComponent velocity;
  * </pre>

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java?rev=731252&r1=731251&r2=731252&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
 Sun Jan  4 05:11:57 2009
@@ -50,18 +50,14 @@
     /**
      * Used to look up Artifacts in the remote repository.
      *
-     * @parameter 
expression="${component.org.apache.maven.artifact.factory.ArtifactFactory}"
-     * @required
-     * @readonly
+     * @component
      */
     protected org.apache.maven.artifact.factory.ArtifactFactory factory;
 
     /**
      * Used to look up Artifacts in the remote repository.
      *
-     * @parameter 
expression="${component.org.apache.maven.artifact.resolver.ArtifactResolver}"
-     * @required
-     * @readonly
+     * @component
      */
     protected org.apache.maven.artifact.resolver.ArtifactResolver resolver;
 
@@ -103,9 +99,7 @@
     /**
      * To look up Archiver/UnArchiver implementations
      *
-     * @parameter 
expression="${component.org.codehaus.plexus.archiver.manager.ArchiverManager}"
-     * @required
-     * @readonly
+     * @component
      */
     protected ArchiverManager archiverManager;
 

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java?rev=731252&r1=731251&r2=731252&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java
 Sun Jan  4 05:11:57 2009
@@ -53,16 +53,12 @@
 {
 
     /**
-     * @parameter 
expression="${component.org.apache.maven.artifact.installer.ArtifactInstaller}"
-     * @required
-     * @readonly
+     * @component
      */
     protected ArtifactInstaller installer;
 
     /**
-     * @parameter 
expression="${component.org.apache.maven.artifact.repository.ArtifactRepositoryFactory}"
-     * @required
-     * @readonly
+     * @component
      */
     protected ArtifactRepositoryFactory repositoryFactory;
 

Modified: 
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/AbstractDeployMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/AbstractDeployMojo.java?rev=731252&r1=731251&r2=731252&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/AbstractDeployMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/AbstractDeployMojo.java
 Sun Jan  4 05:11:57 2009
@@ -32,9 +32,7 @@
     extends AbstractMojo
 {
     /**
-     * @parameter 
expression="${component.org.apache.maven.artifact.deployer.ArtifactDeployer}"
-     * @required
-     * @readonly
+     * @component
      */
     private ArtifactDeployer deployer;
 

Modified: 
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java?rev=731252&r1=731251&r2=731252&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
 Sun Jan  4 05:11:57 2009
@@ -108,9 +108,7 @@
     /**
      * Maven SCM Manager.
      *
-     * @parameter 
expression="${component.org.apache.maven.scm.manager.ScmManager}"
-     * @required
-     * @readonly
+     * @component
      * @since 1.0
      */
     private ScmManager scmManager;

Modified: 
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?rev=731252&r1=731251&r2=731252&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
 Sun Jan  4 05:11:57 2009
@@ -141,8 +141,7 @@
     /**
      * The Jar archiver.
      *
-     * @parameter 
expression="${component.org.codehaus.plexus.archiver.Archiver#jar}"
-     * @required
+     * @component role="org.codehaus.plexus.archiver.Archiver" roleHint="jar"
      */
     private JarArchiver jarArchiver;
 
@@ -165,17 +164,14 @@
     /**
      * The client Jar archiver.
      *
-     * @parameter 
expression="${component.org.codehaus.plexus.archiver.Archiver#jar}"
-     * @required
+     * @component role="org.codehaus.plexus.archiver.Archiver" roleHint="jar"
      */
     private JarArchiver clientJarArchiver;
 
     /**
      * The Maven project's helper.
      *
-     * @parameter 
expression="${component.org.apache.maven.project.MavenProjectHelper}"
-     * @required
-     * @readonly
+     * @component
      */
     private MavenProjectHelper projectHelper;
 

Modified: 
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java?rev=731252&r1=731251&r2=731252&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java
 Sun Jan  4 05:11:57 2009
@@ -106,9 +106,7 @@
      * the current jar
      */
     /**
-     * @parameter 
expression="${component.org.apache.maven.artifact.deployer.ArtifactDeployer}"
-     * @required
-     * @readonly
+     * @component
      */
     private ArtifactDeployer deployer;
     /**

Modified: 
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java?rev=731252&r1=731251&r2=731252&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
 Sun Jan  4 05:11:57 2009
@@ -76,8 +76,7 @@
     /**
      * The Jar archiver.
      *
-     * @parameter 
expression="${component.org.codehaus.plexus.archiver.Archiver#jar}"
-     * @required
+     * @component role="org.codehaus.plexus.archiver.Archiver" roleHint="jar"
      */
     private JarArchiver jarArchiver;
 

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java?rev=731252&r1=731251&r2=731252&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
 Sun Jan  4 05:11:57 2009
@@ -80,7 +80,7 @@
     /**
      * The Jar archiver.
      *
-     * @parameter 
expression="${component.org.codehaus.plexus.archiver.Archiver#jar}"
+     * @component role="org.codehaus.plexus.archiver.Archiver" roleHint="jar"
      * @since 2.5
      */
     private JarArchiver jarArchiver;

Modified: 
maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/MavenOnePluginMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/MavenOnePluginMojo.java?rev=731252&r1=731251&r2=731252&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/MavenOnePluginMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/MavenOnePluginMojo.java
 Sun Jan  4 05:11:57 2009
@@ -74,7 +74,7 @@
     /**
      * The Jar archiver.
      *
-     * @parameter 
expression="${component.org.codehaus.plexus.archiver.Archiver#jar}"
+     * @component role="org.codehaus.plexus.archiver.Archiver" roleHint="jar"
      * @required
      */
     private JarArchiver jarArchiver;

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java?rev=731252&r1=731251&r2=731252&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
 Sun Jan  4 05:11:57 2009
@@ -58,9 +58,7 @@
     /**
      * Maven SCM Manager.
      *
-     * @parameter 
expression="${component.org.apache.maven.scm.manager.ScmManager}"
-     * @required
-     * @readonly
+     * @component
      */
     protected ScmManager scmManager;
 

Modified: 
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java?rev=731252&r1=731251&r2=731252&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
 Sun Jan  4 05:11:57 2009
@@ -118,8 +118,7 @@
     /**
      * The Jar archiver.
      *
-     * @parameter 
expression="${component.org.codehaus.plexus.archiver.Archiver#jar}"
-     * @required
+     * @component role="org.codehaus.plexus.archiver.Archiver" roleHint="jar"
      */
     private JarArchiver jarArchiver;
 

Modified: 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java?rev=731252&r1=731251&r2=731252&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java
 Sun Jan  4 05:11:57 2009
@@ -45,10 +45,9 @@
     extends AbstractWarMojo
 {
     /**
-     * The Jar archiver.
+     * The War archiver.
      *
-     * @parameter 
expression="${component.org.codehaus.plexus.archiver.Archiver#war}"
-     * @required
+     * @component role="org.codehaus.plexus.archiver.Archiver" roleHint="war"
      */
     private WarArchiver warArchiver;
 

Modified: 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java?rev=731252&r1=731251&r2=731252&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
 Sun Jan  4 05:11:57 2009
@@ -80,10 +80,9 @@
     private String packagingExcludes;
 
     /**
-     * The Jar archiver.
+     * The War archiver.
      *
-     * @parameter 
expression="${component.org.codehaus.plexus.archiver.Archiver#war}"
-     * @required
+     * @component role="org.codehaus.plexus.archiver.Archiver" roleHint="war"
      */
     private WarArchiver warArchiver;

Reply via email to