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 1EDBF8145 for ; Mon, 5 Sep 2011 21:38:52 +0000 (UTC) Received: (qmail 30356 invoked by uid 500); 5 Sep 2011 21:38:52 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 30249 invoked by uid 500); 5 Sep 2011 21:38:51 -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 30238 invoked by uid 99); 5 Sep 2011 21:38:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Sep 2011 21:38:50 +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, 05 Sep 2011 21:38:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3208B238888F; Mon, 5 Sep 2011 21:38:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1165423 - in /maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote: BundleRemoteResourcesMojo.java ProcessRemoteResourcesMojo.java Date: Mon, 05 Sep 2011 21:38:29 -0000 To: commits@maven.apache.org From: rfscholte@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110905213829.3208B238888F@eris.apache.org> Author: rfscholte Date: Mon Sep 5 21:38:28 2011 New Revision: 1165423 URL: http://svn.apache.org/viewvc?rev=1165423&view=rev Log: Fix MRRESOURCES-57: Incorrect documentation of outputDirectory? Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java?rev=1165423&r1=1165422&r2=1165423&view=diff ============================================================================== --- maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java (original) +++ maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java Mon Sep 5 21:38:28 2011 @@ -54,14 +54,14 @@ public class BundleRemoteResourcesMojo /** * The directory which contains the resources you want packaged up in this resource bundle. * - * @parameter expression="${basedir}/src/main/resources" + * @parameter default-value="${basedir}/src/main/resources" */ private File resourcesDirectory; /** * The directory where you want the resource bundle manifest written to. * - * @parameter expression="${project.build.outputDirectory}" + * @parameter default-value="${project.build.outputDirectory}" */ private File outputDirectory; @@ -88,7 +88,7 @@ public class BundleRemoteResourcesMojo * * @since 1.1 * @optional - * @parameter expression="${project.build.sourceEncoding}" + * @parameter default-value="${project.build.sourceEncoding}" */ private String sourceEncoding; Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java?rev=1165423&r1=1165422&r2=1165423&view=diff ============================================================================== --- maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java (original) +++ maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java Mon Sep 5 21:38:28 2011 @@ -189,7 +189,7 @@ public class ProcessRemoteResourcesMojo /** * The local repository taken from Maven's runtime. Typically $HOME/.m2/repository. * - * @parameter expression="${localRepository}" + * @parameter default-value="${localRepository}" * @readonly * @required */ @@ -198,7 +198,7 @@ public class ProcessRemoteResourcesMojo /** * List of Remote Repositories used by the resolver * - * @parameter expression="${project.remoteArtifactRepositories}" + * @parameter default-value="${project.remoteArtifactRepositories}" * @readonly * @required */ @@ -207,7 +207,7 @@ public class ProcessRemoteResourcesMojo /** * The current Maven project. * - * @parameter expression="${project}" + * @parameter default-value="${project}" * @readonly * @required */ @@ -216,14 +216,14 @@ public class ProcessRemoteResourcesMojo /** * The directory where processed resources will be placed for packaging. * - * @parameter expression="${project.build.directory}/maven-shared-archive-resources" + * @parameter default-value="${project.build.directory}/maven-shared-archive-resources" */ private File outputDirectory; /** * The directory containing extra information appended to the generated resources. * - * @parameter expression="${basedir}/src/main/appended-resources" + * @parameter default-value="${basedir}/src/main/appended-resources" */ private File appendedResourcesDirectory; @@ -313,7 +313,7 @@ public class ProcessRemoteResourcesMojo /** * The list of resources defined for the project. * - * @parameter expression="${project.resources}" + * @parameter default-value="${project.build.resources}" * @readonly * @required */ @@ -356,7 +356,7 @@ public class ProcessRemoteResourcesMojo /** * The Maven session. * - * @parameter expression="${session}" + * @parameter default-value="${session}" * @readonly * @required */