commit 28887880e05e02ea90054e005dd543ec5aa9fb63
author olivier lamy <olamy@apache.org> Fri May 29 07:00:02 2020 +1000
committer olivier lamy <olamy@apache.org> Fri May 29 07:00:02 2020 +1000
tree 2dcef7e5b255604556718770d471d6191c11f955
parent 17fe0c18929be13fb75b00d76628dc7146f85aec

just nit changes

Signed-off-by: olivier lamy <olamy@apache.org>

src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java

diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
index da690c3..ab73c41 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
@@ -149,7 +149,7 @@
 
             if ( getLogger().isDebugEnabled() )
             {
-                String ls = System.getProperty( "line.separator" );
+                String ls = System.lineSeparator();
                 StringBuilder debugMessage =
                     new StringBuilder( "resource with targetPath " ).append( resource.getTargetPath() ).append( ls );
                 debugMessage.append( "directory " ).append( resource.getDirectory() ).append( ls );
@@ -400,24 +400,22 @@
             reader = wrapper.getReader( reader );
         }
 
-        StringWriter writer = new StringWriter();
-
-        try
+        try ( StringWriter writer = new StringWriter() )
         {
             IOUtil.copy( reader, writer );
+            String filteredFilename = writer.toString();
+
+            if ( getLogger().isDebugEnabled() )
+            {
+                getLogger().debug( "renaming filename " + name + " to " + filteredFilename );
+            }
+            return filteredFilename;
         }
         catch ( IOException e )
         {
             throw new MavenFilteringException( "Failed filtering filename" + name, e );
         }
 
-        String filteredFilename = writer.toString();
-
-        if ( getLogger().isDebugEnabled() )
-        {
-            getLogger().debug( "renaming filename " + name + " to " + filteredFilename );
-        }
-        return filteredFilename;
     }
 
 }

src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java

diff --git a/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java b/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
index 7e8e61f..8e81598 100644
--- a/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
+++ b/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
@@ -20,9 +20,10 @@
  */
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
@@ -87,7 +88,7 @@
 
         final Properties fileProps = new Properties();
         
-        try ( FileInputStream inStream = new FileInputStream( propFile ) )
+        try ( InputStream inStream = Files.newInputStream( propFile.toPath() ) )
         {
             fileProps.load( inStream );
         }