This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch agent/pr308-on-master in repository https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
commit cd778981264167d3158e3c924a83250275ab5fdd Author: Efe Gökdemir <[email protected]> AuthorDate: Fri Oct 16 08:56:55 2026 +0300 fix: remove redundant output path overload --- .../resources/remote/AbstractProcessRemoteResourcesMojo.java | 9 ++------- .../plugin/resources/remote/RemoteResourcesMojoTest.java | 11 ++++++++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/apache/maven/plugin/resources/remote/AbstractProcessRemoteResourcesMojo.java b/src/main/java/org/apache/maven/plugin/resources/remote/AbstractProcessRemoteResourcesMojo.java index 12bb90b..6897f59 100644 --- a/src/main/java/org/apache/maven/plugin/resources/remote/AbstractProcessRemoteResourcesMojo.java +++ b/src/main/java/org/apache/maven/plugin/resources/remote/AbstractProcessRemoteResourcesMojo.java @@ -974,7 +974,7 @@ public abstract class AbstractProcessRemoteResourcesMojo extends AbstractMojo { // Don't overwrite resource that are already being provided. - File outputFile = resolveOutputFile(outputDirectory, canonicalOutputDirectory, projectResource); + File outputFile = resolveOutputFile(outputDirectory, projectResource, canonicalOutputDirectory); FileUtils.mkdir(outputFile.getParentFile().getAbsolutePath()); @@ -1032,12 +1032,7 @@ public abstract class AbstractProcessRemoteResourcesMojo extends AbstractMojo { } } - static File resolveOutputFile(File outputDirectory, String resourceName) - throws IOException, MojoExecutionException { - return resolveOutputFile(outputDirectory, outputDirectory.getCanonicalFile(), resourceName); - } - - private static File resolveOutputFile(File outputDirectory, File canonicalOutputDirectory, String resourceName) + static File resolveOutputFile(File outputDirectory, String resourceName, File canonicalOutputDirectory) throws IOException, MojoExecutionException { if (new File(resourceName).isAbsolute()) { throw new MojoExecutionException("Absolute remote resource paths are not allowed: " + resourceName); diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java b/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java index b8f605e..5351967 100644 --- a/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java +++ b/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java @@ -91,9 +91,11 @@ public class RemoteResourcesMojoTest extends AbstractMojoTestCase { public void testRemoteResourceCannotEscapeOutputDirectory() throws Exception { File outputDirectory = new File("target/remote-resource-output"); + File canonicalOutputDirectory = outputDirectory.getCanonicalFile(); try { - AbstractProcessRemoteResourcesMojo.resolveOutputFile(outputDirectory, "../outside.txt"); + AbstractProcessRemoteResourcesMojo.resolveOutputFile( + outputDirectory, "../outside.txt", canonicalOutputDirectory); fail("expected a resource outside the output directory to be rejected"); } catch (MojoExecutionException e) { assertTrue(e.getMessage().contains("must remain within the output directory")); @@ -101,13 +103,16 @@ public class RemoteResourcesMojoTest extends AbstractMojoTestCase { try { AbstractProcessRemoteResourcesMojo.resolveOutputFile( - outputDirectory, new File(outputDirectory.getParentFile(), "absolute.txt").getAbsolutePath()); + outputDirectory, + new File(outputDirectory.getParentFile(), "absolute.txt").getAbsolutePath(), + canonicalOutputDirectory); fail("expected an absolute resource path outside the output directory to be rejected"); } catch (MojoExecutionException e) { assertTrue(e.getMessage().contains("Absolute remote resource paths are not allowed")); } - File outputFile = AbstractProcessRemoteResourcesMojo.resolveOutputFile(outputDirectory, "nested/resource.txt"); + File outputFile = AbstractProcessRemoteResourcesMojo.resolveOutputFile( + outputDirectory, "nested/resource.txt", canonicalOutputDirectory); assertEquals(new File(outputDirectory, "nested/resource.txt").getCanonicalFile(), outputFile); }
