svn commit: r1616880 - in /maven/plugins/trunk/maven-acr-plugin: pom.xml src/main/java/org/apache/maven/plugin/acr/AcrMojo.java

[kh...@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.
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-filtering</artifactId>
-      <version>1.1</version>
+      <version>1.2</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

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<FileUtils.FilterWrapper> filterWrappers =
+                    List<FilterWrapper> filterWrappers =
                         mavenFileFilter.getDefaultFilterWrappers( project, filters, escapeBackslashesInFilePath,
                                                                   this.session, mavenResourcesExecution );