Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D1FC2C05D for ; Mon, 11 Jun 2012 21:40:59 +0000 (UTC) Received: (qmail 95933 invoked by uid 500); 11 Jun 2012 21:40:59 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 95880 invoked by uid 500); 11 Jun 2012 21:40:59 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 95873 invoked by uid 99); 11 Jun 2012 21:40:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jun 2012 21:40:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jun 2012 21:40:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BE35C23889E1; Mon, 11 Jun 2012 21:40:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1349029 - in /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency: ./ fromConfiguration/ resolvers/ Date: Mon, 11 Jun 2012 21:40:37 -0000 To: commits@maven.apache.org From: hboutemy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120611214037.BE35C23889E1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hboutemy Date: Mon Jun 11 21:40:36 2012 New Revision: 1349029 URL: http://svn.apache.org/viewvc?rev=1349029&view=rev Log: use default-value instead of expression for readonly parameters Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.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/AnalyzeDepMgt.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDuplicateMojo.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PropertiesMojo.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java?rev=1349029&r1=1349028&r2=1349029&view=diff ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java Mon Jun 11 21:40:36 2012 @@ -64,7 +64,7 @@ public abstract class AbstractAnalyzeMoj /** * The Maven project to analyze. * - * @parameter expression="${project}" + * @parameter default-value="${project}" * @required * @readonly */ @@ -126,7 +126,7 @@ public abstract class AbstractAnalyzeMoj /** * Flag to use for scriptable output * - * @parameter expression="${basedir}" + * @parameter default-value="${basedir}" * @readonly * @since 2.0-alpha-5 */ @@ -135,7 +135,7 @@ public abstract class AbstractAnalyzeMoj /** * Target folder * - * @parameter expression="${project.build.directory}" + * @parameter default-value="${project.build.directory}" * @readonly * @since 2.0-alpha-5 */ 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=1349029&r1=1349028&r2=1349029&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 Mon Jun 11 21:40:36 2012 @@ -84,7 +84,7 @@ public abstract class AbstractDependency /** * Location of the local repository. * - * @parameter expression="${localRepository}" + * @parameter default-value="${localRepository}" * @readonly * @required */ @@ -93,7 +93,7 @@ public abstract class AbstractDependency /** * List of Remote Repositories used by the resolver * - * @parameter expression="${project.remoteArtifactRepositories}" + * @parameter default-value="${project.remoteArtifactRepositories}" * @readonly * @required */ @@ -109,7 +109,7 @@ public abstract class AbstractDependency /** * POM * - * @parameter expression="${project}" + * @parameter default-value="${project}" * @readonly * @required */ @@ -118,7 +118,7 @@ public abstract class AbstractDependency /** * Contains the full list of projects in the reactor. * - * @parameter expression="${reactorProjects}" + * @parameter default-value="${reactorProjects}" * @required * @readonly */ 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?rev=1349029&r1=1349028&r2=1349029&view=diff ============================================================================== --- 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 Mon Jun 11 21:40:36 2012 @@ -60,7 +60,7 @@ public class AnalyzeDepMgt /** * * - * @parameter expression="${project}" + * @parameter default-value="${project}" * @required * @readonly */ Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDuplicateMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDuplicateMojo.java?rev=1349029&r1=1349028&r2=1349029&view=diff ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDuplicateMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDuplicateMojo.java Mon Jun 11 21:40:36 2012 @@ -52,7 +52,7 @@ public class AnalyzeDuplicateMojo /** * The Maven project to analyze. * - * @parameter expression="${project}" + * @parameter default-value="${project}" * @required * @readonly */ Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java?rev=1349029&r1=1349028&r2=1349029&view=diff ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java Mon Jun 11 21:40:36 2012 @@ -54,7 +54,7 @@ public class AnalyzeReportMojo /** * The Maven project to analyze. * - * @parameter expression="${project}" + * @parameter default-value="${project}" * @required * @readonly */ @@ -79,7 +79,7 @@ public class AnalyzeReportMojo /** * Target folder * - * @parameter expression="${project.build.directory}" + * @parameter default-value="${project.build.directory}" * @readonly * @since 2.0-alpha-5 */ Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java?rev=1349029&r1=1349028&r2=1349029&view=diff ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java Mon Jun 11 21:40:36 2012 @@ -76,6 +76,7 @@ public class BuildClasspathMojo /** * The file to write the classpath string. If undefined, it just prints the classpath as [INFO]. * This parameter is deprecated. Use outputFile instead. + * * @parameter expression="${mdep.cpFile}" * @deprecated use outputFile instead * @since 2.0 Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java?rev=1349029&r1=1349028&r2=1349029&view=diff ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java Mon Jun 11 21:40:36 2012 @@ -89,7 +89,7 @@ public class GetMojo /** * - * @parameter expression="${localRepository}" + * @parameter default-value="${localRepository}" * @readonly */ private ArtifactRepository localRepository; @@ -164,7 +164,7 @@ public class GetMojo /** * - * @parameter expression="${project.remoteArtifactRepositories}" + * @parameter default-value="${project.remoteArtifactRepositories}" * @required * @readonly */ Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PropertiesMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PropertiesMojo.java?rev=1349029&r1=1349028&r2=1349029&view=diff ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PropertiesMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PropertiesMojo.java Mon Jun 11 21:40:36 2012 @@ -45,7 +45,7 @@ public class PropertiesMojo /** * The current Maven project * - * @parameter expression="${project}" + * @parameter default-value="${project}" * @readonly */ protected MavenProject project; Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java?rev=1349029&r1=1349028&r2=1349029&view=diff ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java Mon Jun 11 21:40:36 2012 @@ -80,7 +80,7 @@ public class TreeMojo /** * The Maven project. * - * @parameter expression="${project}" + * @parameter default-value="${project}" * @required * @readonly */ @@ -89,7 +89,7 @@ public class TreeMojo /** * The artifact repository to use. * - * @parameter expression="${localRepository}" + * @parameter default-value="${localRepository}" * @required * @readonly */ @@ -225,13 +225,13 @@ public class TreeMojo */ private DependencyNode rootNode; - /** - * Whether to append outputs into the output file or overwrite it. - * - * @parameter expression="${appendOutput}" default-value="false" - * @since 2.2 - */ - private boolean appendOutput; + /** + * Whether to append outputs into the output file or overwrite it. + * + * @parameter expression="${appendOutput}" default-value="false" + * @since 2.2 + */ + private boolean appendOutput; // Mojo methods ----------------------------------------------------------- Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java?rev=1349029&r1=1349028&r2=1349029&view=diff ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java Mon Jun 11 21:40:36 2012 @@ -101,7 +101,7 @@ public abstract class AbstractFromConfig /** * To search for artifacts within the reactor and ensure consistent behaviour between Maven 2 and Maven 3. * - * @parameter expression="${reactorProjects}" + * @parameter default-value="${reactorProjects}" * @required * @readonly */ Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java?rev=1349029&r1=1349028&r2=1349029&view=diff ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java Mon Jun 11 21:40:36 2012 @@ -49,7 +49,7 @@ public class ResolvePluginsMojo /** * Remote repositories which will be searched for plugins. * - * @parameter expression="${project.pluginArtifactRepositories}" + * @parameter default-value="${project.pluginArtifactRepositories}" * @required * @readonly */