Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E4955200828 for ; Fri, 13 May 2016 21:20:02 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E34AA16099F; Fri, 13 May 2016 19:20:02 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 39A611602BE for ; Fri, 13 May 2016 21:20:02 +0200 (CEST) Received: (qmail 72070 invoked by uid 500); 13 May 2016 19:20:01 -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 72061 invoked by uid 99); 13 May 2016 19:20:01 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 May 2016 19:20:01 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 0624E1A045A for ; Fri, 13 May 2016 19:20:01 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.999 X-Spam-Level: X-Spam-Status: No, score=0.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id mTCJ3OgDyGII for ; Fri, 13 May 2016 19:20:00 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTP id E8C565F1E3 for ; Fri, 13 May 2016 19:19:59 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 9B102E0098 for ; Fri, 13 May 2016 19:19:58 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 2926A3A0113 for ; Fri, 13 May 2016 19:19:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1743728 - /maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java Date: Fri, 13 May 2016 19:19:57 -0000 To: commits@maven.apache.org From: khmarbaise@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160513191958.2926A3A0113@svn01-us-west.apache.org> archived-at: Fri, 13 May 2016 19:20:03 -0000 Author: khmarbaise Date: Fri May 13 19:19:57 2016 New Revision: 1743728 URL: http://svn.apache.org/viewvc?rev=1743728&view=rev Log: [MRESOURCES-223] Define the escapeString by default with "\" o Defined default escapeString with "\" and improved the docs a little bit. Modified: maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java Modified: maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java?rev=1743728&r1=1743727&r2=1743728&view=diff ============================================================================== --- maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java (original) +++ maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java Fri May 13 19:19:57 2016 @@ -133,11 +133,13 @@ public class ResourcesMojo protected MavenSession session; /** - * Expression preceded with the String won't be interpolated \${foo} will be replaced with ${foo} - * + * Expression preceded with the String won't be interpolated. For + * example {@code \${foo}} will be replaced with {@code ${foo}}. + *
+ * Note: With 3.0.0 a default value has been defined. * @since 2.3 */ - @Parameter( property = "maven.resources.escapeString" ) + @Parameter( property = "maven.resources.escapeString", defaultValue = "\\" ) protected String escapeString; /**