From 6ae66d37cf330ac3b057516523aa5c707fcf6096 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 27 Nov 2020 09:41:46 -0500 Subject: [PATCH 1/3] replace deprecated method no longer needed in Java 7+ --- src/main/java/org/apache/maven/plugins/ear/EarMojo.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java index 90571fa4..d0a8c131 100644 --- a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java +++ b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java @@ -27,9 +27,11 @@ import java.nio.charset.StandardCharsets; import java.nio.file.FileVisitResult; import java.nio.file.Files; +import java.nio.file.LinkOption; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.SimpleFileVisitor; +import java.nio.file.StandardCopyOption; import java.nio.file.attribute.BasicFileAttributes; import java.util.ArrayList; import java.util.Arrays; @@ -468,7 +470,8 @@ private void copyModules( final JavaEEVersion javaEEVersion, if ( sourceFile.lastModified() > destinationFile.lastModified() ) { getLog().info( "Copying artifact [" + module + "] to [" + module.getUri() + "]" ); - FileUtils.copyFile( sourceFile, destinationFile ); + Files.copy( sourceFile.toPath(), destinationFile.toPath(), LinkOption.NOFOLLOW_LINKS, + StandardCopyOption.REPLACE_EXISTING ); if ( module.changeManifestClasspath() && ( skinnyWars || module.getLibDir() == null ) ) { @@ -708,7 +711,8 @@ private void copyFile( File source, File target ) } else { - FileUtils.copyFile( source, target ); + Files.copy( source.toPath(), target.toPath(), LinkOption.NOFOLLOW_LINKS, + StandardCopyOption.REPLACE_EXISTING ); } } From d0917dc44e49792555aea72000ce70573b9f9823 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 27 Nov 2020 14:53:10 -0500 Subject: [PATCH 2/3] create parent directory --- .../org/apache/maven/plugins/ear/EarMojo.java | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java index d0a8c131..e3fd4927 100644 --- a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java +++ b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java @@ -470,9 +470,9 @@ private void copyModules( final JavaEEVersion javaEEVersion, if ( sourceFile.lastModified() > destinationFile.lastModified() ) { getLog().info( "Copying artifact [" + module + "] to [" + module.getUri() + "]" ); - Files.copy( sourceFile.toPath(), destinationFile.toPath(), LinkOption.NOFOLLOW_LINKS, - StandardCopyOption.REPLACE_EXISTING ); - + createParentIfNecessary( destinationFile ); + Files.copy( sourceFile.toPath(), destinationFile.toPath(), + LinkOption.NOFOLLOW_LINKS, StandardCopyOption.REPLACE_EXISTING ); if ( module.changeManifestClasspath() && ( skinnyWars || module.getLibDir() == null ) ) { changeManifestClasspath( module, destinationFile, javaEEVersion ); @@ -698,15 +698,9 @@ public String getMappedFileName( String pName ) private void copyFile( File source, File target ) throws MavenFilteringException, IOException, MojoExecutionException { + createParentIfNecessary( target ); if ( filtering && !isNonFilteredExtension( source.getName() ) ) { - // Silly that we have to do this ourselves - File parentDirectory = target.getParentFile(); - if ( parentDirectory != null && !parentDirectory.exists() ) - { - Files.createDirectories( parentDirectory.toPath() ); - } - mavenFileFilter.copyFile( source, target, true, getFilterWrappers(), encoding ); } else @@ -716,6 +710,17 @@ private void copyFile( File source, File target ) } } + private void createParentIfNecessary( File target ) + throws IOException + { + // Silly that we have to do this ourselves + File parentDirectory = target.getParentFile(); + if ( parentDirectory != null && !parentDirectory.exists() ) + { + Files.createDirectories( parentDirectory.toPath() ); + } + } + /** * @param fileName the name of the file which should be checked * @return {@code true} if the name is part of the non filtered extensions; {@code false} otherwise From 7625a3d312d5834efc1ebdb0e1168d9917b1a787 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 6 Dec 2020 09:17:29 -0500 Subject: [PATCH 3/3] line break --- src/main/java/org/apache/maven/plugins/ear/EarMojo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java index b6bb793b..611e5a5e 100644 --- a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java +++ b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java @@ -485,7 +485,8 @@ private void copyModules( final JavaEEVersion javaEEVersion, createParentIfNecessary( destinationFile ); Files.copy( sourceFile.toPath(), destinationFile.toPath(), LinkOption.NOFOLLOW_LINKS, StandardCopyOption.REPLACE_EXISTING ); - if ( module.changeManifestClasspath() && ( skinnyWars || module.getLibDir() == null ) ) { + if ( module.changeManifestClasspath() && ( skinnyWars || module.getLibDir() == null ) ) + { changeManifestClasspath( module, destinationFile, javaEEVersion ); } }