[MSHARED-456] Removed @Deprecated marked code
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1711699 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java b/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
index 40ad1a2..fb3f9d3 100644
--- a/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
@@ -51,21 +51,6 @@
implements DefaultFilterInfo
{
- /**
- * @see org.apache.maven.shared.filtering.MavenFileFilter#getDefaultFilterWrappers(org.apache.maven.project.MavenProject,
- * java.util.List, boolean, org.apache.maven.execution.MavenSession)
- * @deprecated
- */
- @Nonnull
- public List<FileUtils.FilterWrapper> getDefaultFilterWrappers( final MavenProject mavenProject,
- List<String> filters,
- final boolean escapedBackslashesInFilePath,
- MavenSession mavenSession )
- throws MavenFilteringException
- {
- return getDefaultFilterWrappers( mavenProject, filters, escapedBackslashesInFilePath, mavenSession, null );
- }
-
@Nonnull
public List<FileUtils.FilterWrapper> getDefaultFilterWrappers( final MavenProject mavenProject,
List<String> filters,
diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultFilterInfo.java b/src/main/java/org/apache/maven/shared/filtering/DefaultFilterInfo.java
index 17143b8..79d61b7 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultFilterInfo.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultFilterInfo.java
@@ -32,33 +32,6 @@
*/
public interface DefaultFilterInfo
{
- // CHECKSTYLE_OFF: LineLength
- /**
- * Will return the default FileUtils.FilterWrappers.
- * <p/>
- * <ul>
- * <li>interpolate with token ${} and values from sysProps, project.properties, filters and project filters.</li>
- * <li>interpolate with token @ @ and values from sysProps, project.properties, filters and project filters.</li>
- * <li>interpolate with token ${} and values from mavenProject interpolation.</li>
- * <li>interpolation with token @ @ and values from mavenProject interpolation</li>
- * </ul>
- * <b>This method is now deprecated and no escape mechanism will be used.</b>
- *
- * @param mavenProject The maven project
- * @param filters {@link java.util.List} of properties file
- * @param escapedBackslashesInFilePath true to escape backslashes in file path.
- * @param mavenSession The maven session which will be used.
- * @throws MavenFilteringException in case of failure.
- * @return {@link java.util.List} of FileUtils.FilterWrapper
- * @deprecated use
- * {@link #getDefaultFilterWrappers(org.apache.maven.project.MavenProject, java.util.List, boolean, org.apache.maven.execution.MavenSession, org.apache.maven.shared.filtering.MavenResourcesExecution)}
- */
- // CHECKSTYLE_ON: LineLength
- @Nonnull
- List<FileUtils.FilterWrapper> getDefaultFilterWrappers( MavenProject mavenProject, List<String> filters,
- boolean escapedBackslashesInFilePath,
- MavenSession mavenSession )
- throws MavenFilteringException;
/**
* @param mavenProject The maven project
diff --git a/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java b/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
index 3512036..f2a0c62 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
@@ -511,7 +511,9 @@
* @param givenRecursionInterceptor {@link RecursionInterceptor}
* @return this
*/
+ // CHECKSTYLE_OFF: LineLength
public MultiDelimiterInterpolatorFilterReaderLineEnding setRecursionInterceptor( RecursionInterceptor givenRecursionInterceptor )
+ // CHECKSTYLE_ON: LineLength
{
this.recursionInterceptor = givenRecursionInterceptor;
return this;
