This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch maven-resources-plugin-4.x in repository https://gitbox.apache.org/repos/asf/maven-resources-plugin.git
commit c86ae2b42f1d96324cdd0fc9fe3dd27316422ca4 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 03:20:32 2026 +0000 Use System.lineSeparator(), @Override and try-with-resources --- .../java/org/apache/maven/plugins/resources/CopyResourcesMojo.java | 6 ++++++ src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java | 1 + .../java/org/apache/maven/plugins/resources/TestResourcesMojo.java | 5 +++++ .../org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java | 2 ++ .../maven/plugins/resources/stub/MavenProjectResourcesStub.java | 2 ++ 5 files changed, 16 insertions(+) diff --git a/src/main/java/org/apache/maven/plugins/resources/CopyResourcesMojo.java b/src/main/java/org/apache/maven/plugins/resources/CopyResourcesMojo.java index 8bb5c1c..1973a76 100644 --- a/src/main/java/org/apache/maven/plugins/resources/CopyResourcesMojo.java +++ b/src/main/java/org/apache/maven/plugins/resources/CopyResourcesMojo.java @@ -48,31 +48,37 @@ public class CopyResourcesMojo extends ResourcesMojo { private List<Resource> resources; /** {@inheritDoc} */ + @Override public Path getOutputDirectory() { return outputDirectory; } /** {@inheritDoc} */ + @Override public void setOutputDirectory(Path outputDirectory) { this.outputDirectory = outputDirectory; } /** {@inheritDoc} */ + @Override public List<Resource> getResources() { return resources; } /** {@inheritDoc} */ + @Override public void setResources(List<Resource> resources) { this.resources = resources; } /** {@inheritDoc} */ + @Override public List<String> getFilters() { return filters; } /** {@inheritDoc} */ + @Override public void setFilters(List<String> filters) { this.filters = filters; } diff --git a/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java b/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java index 81d8cd7..fc0d046 100644 --- a/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java +++ b/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java @@ -476,6 +476,7 @@ public class ResourcesMojo implements org.apache.maven.api.plugin.Mojo { private Log logger; /** {@inheritDoc} */ + @Override public void execute() throws MojoException { if (isSkip()) { getLog().info("Skipping the execution."); diff --git a/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java b/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java index 8f361e0..4db9c13 100644 --- a/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java +++ b/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java @@ -74,6 +74,7 @@ public class TestResourcesMojo extends ResourcesMojo { /** * {@inheritDoc} */ + @Override public void execute() throws MojoException { // isSkip() reads ResourcesMojo's own field. Both classes declare a private // "skip", so the two collapse into a single descriptor parameter and the @@ -99,21 +100,25 @@ public class TestResourcesMojo extends ResourcesMojo { } /** {@inheritDoc} */ + @Override public Path getOutputDirectory() { return outputDirectory; } /** {@inheritDoc} */ + @Override public void setOutputDirectory(Path outputDirectory) { this.outputDirectory = outputDirectory; } /** {@inheritDoc} */ + @Override public List<Resource> getResources() { return resources; } /** {@inheritDoc} */ + @Override public void setResources(List<Resource> resources) { this.resources = resources; } diff --git a/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java b/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java index 320fbc2..3134655 100644 --- a/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java +++ b/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java @@ -39,6 +39,7 @@ class BasicPropertyUtilsTest extends AbstractPropertyUtilsTest { protected static final String PROP_FILE_NAME = "target/test-classes/unit/propertiesutils-test/basic.properties"; + @Override protected Path getPropertyFile() { Path propFile = Paths.get(getBasedir(), PROP_FILE_NAME); @@ -49,6 +50,7 @@ class BasicPropertyUtilsTest extends AbstractPropertyUtilsTest { return propFile; } + @Override protected Path getValidationFile() { Path validationFile = Paths.get(getBasedir(), VALIDATION_FILE_NAME); diff --git a/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectResourcesStub.java b/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectResourcesStub.java index 2ac1d92..7aceefd 100644 --- a/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectResourcesStub.java +++ b/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectResourcesStub.java @@ -152,10 +152,12 @@ public class MavenProjectResourcesStub extends MavenProjectBuildStub { .withTestResources(concat(getModel().getBuild().getTestResources(), resource)))); } + @Override public String getOutputDirectory() { return getBuild().getOutputDirectory(); } + @Override public String getTestOutputDirectory() { return getBuild().getTestOutputDirectory(); }
