Author: hboutemy
Date: Thu Oct 30 07:42:35 2014
New Revision: 1635417
URL: http://svn.apache.org/r1635417
Log:
upgraded parent pom
Modified:
maven/shared/trunk/file-management/pom.xml
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperUtil.java
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
Modified: maven/shared/trunk/file-management/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/pom.xml?rev=1635417&r1=1635416&r2=1635417&view=diff
==============================================================================
--- maven/shared/trunk/file-management/pom.xml (original)
+++ maven/shared/trunk/file-management/pom.xml Thu Oct 30 07:42:35 2014
@@ -25,7 +25,7 @@ under the License.
<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/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperUtil.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperUtil.java?rev=1635417&r1=1635416&r2=1635417&view=diff
==============================================================================
---
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperUtil.java
(original)
+++
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperUtil.java
Thu Oct 30 07:42:35 2014
@@ -117,7 +117,8 @@ public final class MapperUtil
try
{
- FileNameMapper m = (FileNameMapper)
Thread.currentThread().getContextClassLoader().loadClass( classname
).newInstance();
+ FileNameMapper m =
+ (FileNameMapper)
Thread.currentThread().getContextClassLoader().loadClass( classname
).newInstance();
m.setFrom( mapper.getFrom() );
m.setTo( mapper.getTo() );
Modified:
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java?rev=1635417&r1=1635416&r2=1635417&view=diff
==============================================================================
---
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
(original)
+++
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
Thu Oct 30 07:42:35 2014
@@ -284,8 +284,8 @@ public class FileSetManager
if ( messages != null && messages.isDebugEnabled() )
{
- messages
- .addDebugMessage( "Found deletable paths: " + String.valueOf(
deletablePaths ).replace( ',', '\n' ) ).flush();
+ String paths = String.valueOf( deletablePaths ).replace( ',', '\n'
);
+ messages.addDebugMessage( "Found deletable paths: " + paths
).flush();
}
List warnMessages = new LinkedList();
@@ -421,8 +421,8 @@ public class FileSetManager
{
if ( verbose && messages != null )
{
- messages
- .addInfoMessage( "Adding symbolic link dirs which were
previously excluded to the list being deleted." ).flush();
+ messages.addInfoMessage( "Adding symbolic link dirs which were
previously excluded"
+ + " to the list being deleted."
).flush();
}
// we need to see which entries were only excluded because they're
symlinks...
@@ -442,7 +442,8 @@ public class FileSetManager
if ( messages != null && messages.isDebugEnabled() )
{
- messages.addDebugMessage( "Symlinks marked for deletion
(originally mismarked): " + linksForDeletion ).flush();
+ messages.addDebugMessage( "Symlinks marked for deletion
(originally mismarked): "
+ + linksForDeletion ).flush();
}
excludes.removeAll( includedDirsAndSymlinks );
@@ -478,8 +479,8 @@ public class FileSetManager
{
if ( verbose && messages != null )
{
- messages
- .addInfoMessage( "Adding symbolic link files which were
previously excluded to the list being deleted." ).flush();
+ messages.addInfoMessage( "Adding symbolic link files which
were previously excluded "
+ + "to the list being deleted."
).flush();
}
// we need to see which entries were only excluded because they're
symlinks...
@@ -499,7 +500,8 @@ public class FileSetManager
if ( messages != null && messages.isDebugEnabled() )
{
- messages.addDebugMessage( "Symlinks marked for deletion
(originally mismarked): " + linksForDeletion ).flush();
+ messages.addDebugMessage( "Symlinks marked for deletion
(originally mismarked): "
+ + linksForDeletion ).flush();
}
excludes.removeAll( includedFilesAndSymlinks );
@@ -514,7 +516,8 @@ public class FileSetManager
/**
* Removes all parent directories of the already excluded
files/directories from the given set of deletable
- * directories. I.e. if "subdir/excluded.txt" should not be deleted,
"subdir" should be excluded from deletion, too.
+ * directories. I.e. if "subdir/excluded.txt" should not be deleted,
"subdir" should be excluded from deletion,
+ * too.
*
* @param excludedPaths The relative paths of the files/directories which
are excluded from deletion, must not be
* <code>null</code>.
