From a3b54b4956ca7f7ab6b80a14292cb08e5d1a358d Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Wed, 18 Nov 2026 02:47:01 +0000 Subject: [PATCH 1/2] Simplify redundant code --- .../fromConfiguration/TestRequireExplicitDependencies.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestRequireExplicitDependencies.java b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestRequireExplicitDependencies.java index 8bc74b7c2..326d72c3b 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestRequireExplicitDependencies.java +++ b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestRequireExplicitDependencies.java @@ -119,7 +119,7 @@ void skipsTheCheckForAGoalInvokedFromTheCommandLine(CopyMojo mojo) throws Except // the check passes; the execution then fails later, while resolving the artifact Exception e = assertThrows(Exception.class, mojo::execute); - assertFalse((e instanceof MojoFailureException), String.valueOf(e)); + assertFalse(e instanceof MojoFailureException, String.valueOf(e)); } @Test From 106c997164e30cfb8e77304376fd30c271332a22 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Wed, 18 Nov 2026 02:48:09 +0000 Subject: [PATCH 2/2] Replace plexus-utils StringUtils and FileUtils calls with the JDK --- .../dependency/PurgeLocalRepositoryMojo.java | 50 +++++++++++++++++-- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java b/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java index 4231305f9..be4a86a05 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java +++ b/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java @@ -22,6 +22,11 @@ import java.io.File; import java.io.IOException; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -59,7 +64,6 @@ import org.apache.maven.shared.artifact.filter.resolve.transform.EclipseAetherFilterTransformer; import org.apache.maven.shared.utils.logging.MessageBuilder; import org.apache.maven.shared.utils.logging.MessageUtils; -import org.codehaus.plexus.util.FileUtils; import org.eclipse.aether.artifact.ArtifactType; import org.eclipse.aether.artifact.ArtifactTypeRegistry; import org.eclipse.aether.artifact.DefaultArtifact; @@ -446,7 +450,7 @@ private void manualPurge(List theIncludes) throws MojoExecutionException if (purgeDir.exists()) { getLog().debug("Deleting directory: " + purgeDir); try { - FileUtils.deleteDirectory(purgeDir); + PurgeLocalRepositoryMojo.deleteDirectory(purgeDir.toPath()); } catch (IOException e) { throw new MojoExecutionException("Unable to purge directory: " + purgeDir); } @@ -672,7 +676,7 @@ private void purgeArtifacts(MavenProject theProject, Set artifacts) { if (deleteTarget.isDirectory()) { try { - FileUtils.deleteDirectory(deleteTarget); + PurgeLocalRepositoryMojo.deleteDirectory(deleteTarget.toPath()); } catch (IOException e) { getLog().warn("Unable to purge local repository location: " + deleteTarget, e); } @@ -794,4 +798,44 @@ public boolean isSkip() { public void setSkip(boolean skip) { this.skip = skip; } + + static void deleteDirectory(final Path directory) throws IOException { + if (!Files.exists(directory)) { + return; + } + final IOException[] failure = new IOException[1]; + Files.walkFileTree(directory, new SimpleFileVisitor() { + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { + try { + Files.delete(file); + } catch (IOException e) { + failure[0] = e; + } + return FileVisitResult.CONTINUE; + } + + @Override + public FileVisitResult visitFileFailed(Path file, IOException exc) { + failure[0] = exc; + return FileVisitResult.CONTINUE; + } + + @Override + public FileVisitResult postVisitDirectory(Path dir, IOException exc) { + if (exc != null) { + failure[0] = exc; + } + try { + Files.delete(dir); + } catch (IOException e) { + failure[0] = e; + } + return FileVisitResult.CONTINUE; + } + }); + if (failure[0] != null) { + throw failure[0]; + } + } }