commit 3f5223e35d560fd791e96845c9f86c6ee098c8da
author Karl Heinz Marbaise <khmarbaise@apache.org> Wed Nov 11 13:57:22 2015 +0000
committer Karl Heinz Marbaise <khmarbaise@apache.org> Wed Nov 11 13:57:22 2015 +0000
tree 0d032723ccd4de28c30780d7d33e22c597d35052
parent 3938bf6cc285121b454fd23b5c2e5e363bfd09b6

[MRESOURCES-188] Upgrade to Maven 3.0 compatiblity + JDK 1.6
Upgraded maven-filtering from 3.0.0-SNAPSHOT to 3.0.0 release.


git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1713843 13f79535-47bb-0310-9956-ffa450edef68

pom.xml

diff --git a/pom.xml b/pom.xml
index a764172..b5a294d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
   </distributionManagement>
 
   <properties>
-    <mavenFilteringVersion>3.0.0-SNAPSHOT</mavenFilteringVersion>
+    <mavenFilteringVersion>3.0.0</mavenFilteringVersion>
     <mavenVersion>3.0</mavenVersion>
     <!--
       ! Here we start with JDK 6 for release 3.X

src/test/java/org/apache/maven/plugin/resources/filters/ItFilter.java

diff --git a/src/test/java/org/apache/maven/plugin/resources/filters/ItFilter.java b/src/test/java/org/apache/maven/plugin/resources/filters/ItFilter.java
index e17ff13..6d1292c 100644
--- a/src/test/java/org/apache/maven/plugin/resources/filters/ItFilter.java
+++ b/src/test/java/org/apache/maven/plugin/resources/filters/ItFilter.java
@@ -25,8 +25,6 @@
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.filtering.MavenFilteringException;
 import org.apache.maven.shared.filtering.MavenResourcesExecution;
 import org.apache.maven.shared.filtering.MavenResourcesFiltering;
@@ -45,12 +43,12 @@
     /** 
      * @see org.apache.maven.shared.filtering.MavenResourcesFiltering#filterResources(java.util.List, java.io.File, org.apache.maven.project.MavenProject, java.lang.String, java.util.List, java.util.List, org.apache.maven.execution.MavenSession)
      */
-    public void filterResources( List resources, File outputDirectory, MavenProject mavenProject, String encoding,
-                                 List fileFilters, List nonFilteredFileExtensions, MavenSession mavenSession )
-        throws MavenFilteringException
-    {
-        //no op
-    }
+//    public void filterResources( List resources, File outputDirectory, MavenProject mavenProject, String encoding,
+//                                 List fileFilters, List nonFilteredFileExtensions, MavenSession mavenSession )
+//        throws MavenFilteringException
+//    {
+//        //no op
+//    }
 
     /** 
      * @see org.apache.maven.shared.filtering.MavenResourcesFiltering#filterResources(java.util.List, java.io.File, java.lang.String, java.util.List, java.io.File, java.util.List)
@@ -65,16 +63,16 @@
     /** 
      * @see org.apache.maven.shared.filtering.MavenResourcesFiltering#getDefaultNonFilteredFileExtensions()
      */
-    public List getDefaultNonFilteredFileExtensions()
+    public List<String> getDefaultNonFilteredFileExtensions()
     {
         //  no op
-        return Collections.EMPTY_LIST;
+        return Collections.<String>emptyList();
     }
 
     /** 
-     * @see org.apache.maven.shared.filtering.MavenResourcesFiltering#filteredFileExtension(java.lang.String, java.util.List)
+     * @see org.apache.maven.shared.filtering.MavenResourcesFiltering#filteredFileExtension(String, List)
      */
-    public boolean filteredFileExtension( String fileName, List userNonFilteredFileExtensions )
+    public boolean filteredFileExtension( String fileName, List<String> userNonFilteredFileExtensions )
     {
         return false;
     }