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 845F711365 for ; Fri, 8 Aug 2014 21:14:35 +0000 (UTC) Received: (qmail 84591 invoked by uid 500); 8 Aug 2014 21:14:35 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 84526 invoked by uid 500); 8 Aug 2014 21:14:35 -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 84516 invoked by uid 99); 8 Aug 2014 21:14:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Aug 2014 21:14:35 +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; Fri, 08 Aug 2014 21:14:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D15612388831; Fri, 8 Aug 2014 21:14:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1616880 - in /maven/plugins/trunk/maven-acr-plugin: pom.xml src/main/java/org/apache/maven/plugin/acr/AcrMojo.java Date: Fri, 08 Aug 2014 21:14:13 -0000 To: commits@maven.apache.org From: khmarbaise@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140808211413.D15612388831@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: khmarbaise Date: Fri Aug 8 21:14:13 2014 New Revision: 1616880 URL: http://svn.apache.org/r1616880 Log: [MACR-10] - Upgrade of maven-filtering from 1.1 to 1.2 Modified: maven/plugins/trunk/maven-acr-plugin/pom.xml maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java Modified: maven/plugins/trunk/maven-acr-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-acr-plugin/pom.xml?rev=1616880&r1=1616879&r2=1616880&view=diff ============================================================================== --- maven/plugins/trunk/maven-acr-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-acr-plugin/pom.xml Fri Aug 8 21:14:13 2014 @@ -90,7 +90,7 @@ under the License. org.apache.maven.shared maven-filtering - 1.1 + 1.2 org.codehaus.plexus Modified: maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java?rev=1616880&r1=1616879&r2=1616880&view=diff ============================================================================== --- maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java (original) +++ maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java Fri Aug 8 21:14:13 2014 @@ -19,6 +19,10 @@ package org.apache.maven.plugin.acr; * under the License. */ +import java.io.File; +import java.io.IOException; +import java.util.List; + import org.apache.commons.io.IOUtils; import org.apache.commons.io.input.XmlStreamReader; import org.apache.maven.archiver.MavenArchiveConfiguration; @@ -36,16 +40,13 @@ import org.apache.maven.project.MavenPro import org.apache.maven.shared.filtering.MavenFileFilter; import org.apache.maven.shared.filtering.MavenFilteringException; import org.apache.maven.shared.filtering.MavenResourcesExecution; +import org.apache.maven.shared.utils.io.FileUtils.FilterWrapper; import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.jar.JarArchiver; import org.codehaus.plexus.archiver.jar.ManifestException; import org.codehaus.plexus.util.FileUtils; -import java.io.File; -import java.io.IOException; -import java.util.List; - /** * Build a JavaEE Application Client jar file from the current project. * @@ -200,7 +201,7 @@ public class AcrMojo getLog().debug( "Filtering deployment descriptor." ); MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(); mavenResourcesExecution.setEscapeString( escapeString ); - List filterWrappers = + List filterWrappers = mavenFileFilter.getDefaultFilterWrappers( project, filters, escapeBackslashesInFilePath, this.session, mavenResourcesExecution );