You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2015/11/07 12:23:28 UTC
svn commit: r1713107 -
/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
Author: khmarbaise
Date: Sat Nov 7 11:23:28 2015
New Revision: 1713107
URL: http://svn.apache.org/viewvc?rev=1713107&view=rev
Log:
[MSHARED-456] Removed @Deprecated marked code
Removed the implementation code of the removed interface methods.
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
Modified: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java?rev=1713107&r1=1713106&r2=1713107&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java (original)
+++ maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java Sat Nov 7 11:23:28 2015
@@ -28,9 +28,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Resource;
-import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.utils.PathTool;
import org.apache.maven.shared.utils.ReaderFactory;
import org.apache.maven.shared.utils.StringUtils;
@@ -83,33 +81,6 @@ public class DefaultMavenResourcesFilter
}
/** {@inheritDoc} */
- public void filterResources( List<Resource> resources, File outputDirectory, MavenProject mavenProject,
- String encoding, List<String> fileFilters, List<String> nonFilteredFileExtensions,
- MavenSession mavenSession )
- throws MavenFilteringException
- {
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( resources, outputDirectory, mavenProject, encoding, fileFilters,
- nonFilteredFileExtensions, mavenSession );
- mavenResourcesExecution.setUseDefaultFilterWrappers( true );
- // mavenResourcesExecution.setEscapeWindowsPaths( false );
-
- filterResources( mavenResourcesExecution );
- }
-
- /** {@inheritDoc} */
- public void filterResources( List<Resource> resources, File outputDirectory, String encoding,
- List<FileUtils.FilterWrapper> filterWrappers, File resourcesBaseDirectory,
- List<String> nonFilteredFileExtensions )
- throws MavenFilteringException
- {
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( resources, outputDirectory, encoding, filterWrappers, resourcesBaseDirectory,
- nonFilteredFileExtensions );
- filterResources( mavenResourcesExecution );
- }
-
- /** {@inheritDoc} */
public boolean filteredFileExtension( String fileName, List<String> userNonFilteredFileExtensions )
{
List<String> nonFilteredFileExtensions = new ArrayList<String>( getDefaultNonFilteredFileExtensions() );