svn commit: r1635407 - in /maven/shared/trunk/maven-filtering: ./ src/main/java/org/apache/maven/shared/filtering/

[hboutemy]

Author: hboutemy
Date: Thu Oct 30 06:53:49 2014
New Revision: 1635407

URL: http://svn.apache.org/r1635407
Log:
upgraded parent pom

Modified:
    maven/shared/trunk/maven-filtering/pom.xml
    
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
    
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
    
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java

Modified: maven/shared/trunk/maven-filtering/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=1635407&r1=1635406&r2=1635407&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/pom.xml (original)
+++ maven/shared/trunk/maven-filtering/pom.xml Thu Oct 30 06:53:49 2014
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.shared</groupId>
     <artifactId>maven-shared-components</artifactId>
-    <version>20</version>
+    <version>21</version>
     <relativePath>../maven-shared-components/pom.xml</relativePath>
   </parent>
 

Modified: 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java?rev=1635407&r1=1635406&r2=1635407&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
 (original)
+++ 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
 Thu Oct 30 06:53:49 2014
@@ -98,7 +98,8 @@ public class AbstractMavenFilteringReque
      * @param filters The list of filters.
      * @param mavenSession The MavenSession.
      */
-    protected AbstractMavenFilteringRequest( MavenProject mavenProject, 
List<String> filters, MavenSession mavenSession )
+    protected AbstractMavenFilteringRequest( MavenProject mavenProject, 
List<String> filters,
+                                             MavenSession mavenSession )
     {
         initDefaults();
         this.mavenProject = mavenProject;

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=1635407&r1=1635406&r2=1635407&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
 Thu Oct 30 06:53:49 2014
@@ -274,7 +274,8 @@ public class DefaultMavenResourcesFilter
 
                 mavenFileFilter.copyFile( source, destinationFile, 
resource.isFiltering() && filteredExt,
                                           
mavenResourcesExecution.getFilterWrappers(),
-                                          
mavenResourcesExecution.getEncoding(), mavenResourcesExecution.isOverwrite() );
+                                          
mavenResourcesExecution.getEncoding(),
+                                          
mavenResourcesExecution.isOverwrite() );
             }
 
             // deal with deleted source files

Modified: 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java?rev=1635407&r1=1635406&r2=1635407&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
 (original)
+++ 
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
 Thu Oct 30 06:53:49 2014
@@ -508,7 +508,8 @@ public class MultiDelimiterInterpolatorF
      * @param givenRecursionInterceptor {@link RecursionInterceptor}
      * @return this
      */
-    public MultiDelimiterInterpolatorFilterReaderLineEnding 
setRecursionInterceptor( RecursionInterceptor givenRecursionInterceptor )
+    public MultiDelimiterInterpolatorFilterReaderLineEnding 
setRecursionInterceptor(
+                                                                    
RecursionInterceptor givenRecursionInterceptor )
     {
         this.recursionInterceptor = givenRecursionInterceptor;
         return this;