This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch maven-resources-plugin-3.x
in repository https://gitbox.apache.org/repos/asf/maven-resources-plugin.git
The following commit(s) were added to refs/heads/maven-resources-plugin-3.x by
this push:
new d7c4d28 Bump Maven to 3.9.11 while keep prerequisites on 3.6.3
d7c4d28 is described below
commit d7c4d28d06ddf400f3a30a167c24e8f4f9c76cc4
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sat Nov 15 14:10:43 2025 +0100
Bump Maven to 3.9.11 while keep prerequisites on 3.6.3
Remove redundant dependencies and code cleanup to remove warnings
---
pom.xml | 35 ++++------------
src/it/user-filters/invoker.properties | 6 +--
.../maven/plugins/resources/ResourcesMojo.java | 12 +++---
.../maven/plugins/resources/TestResourcesMojo.java | 6 +--
.../resources/AbstractPropertyUtilsTest.java | 14 +------
.../maven/plugins/resources/ResourcesMojoTest.java | 49 +++++++---------------
.../maven/plugins/resources/TestResourcesTest.java | 13 +-----
.../maven/plugins/resources/filters/ItFilter.java | 5 ++-
.../resources/stub/MavenProjectBuildStub.java | 8 +---
9 files changed, 42 insertions(+), 106 deletions(-)
diff --git a/pom.xml b/pom.xml
index 26858af..45ccf84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@ under the License.
</contributors>
<prerequisites>
- <maven>${mavenVersion}</maven>
+ <maven>3.6.3</maven>
</prerequisites>
<scm>
@@ -72,7 +72,7 @@ under the License.
<properties>
<mavenFilteringVersion>3.4.0</mavenFilteringVersion>
- <mavenVersion>3.2.5</mavenVersion>
+ <mavenVersion>3.9.11</mavenVersion>
<javaVersion>8</javaVersion>
<project.build.outputTimestamp>2023-03-21T12:01:37Z</project.build.outputTimestamp>
@@ -98,28 +98,15 @@ under the License.
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-settings</artifactId>
- <version>${mavenVersion}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>${version.maven-plugin-tools}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-interpolation</artifactId>
- <version>1.29</version>
- <scope>runtime</scope>
- </dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
- <version>0.3.5</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -127,11 +114,6 @@ under the License.
<artifactId>plexus-utils</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-xml</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-filtering</artifactId>
@@ -147,14 +129,6 @@ under the License.
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.19.0</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- <version>${mavenVersion}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
@@ -174,6 +148,11 @@ under the License.
<version>1.6.3</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
diff --git a/src/it/user-filters/invoker.properties
b/src/it/user-filters/invoker.properties
index 9ae0353..2517f30 100644
--- a/src/it/user-filters/invoker.properties
+++ b/src/it/user-filters/invoker.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.systemPropertiesFile = test.properties
\ No newline at end of file
+invoker.userPropertiesFile = test.properties
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 a622653..27dd610 100644
--- a/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java
@@ -18,7 +18,10 @@
*/
package org.apache.maven.plugins.resources;
+import javax.inject.Inject;
+
import java.io.File;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -32,7 +35,6 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -50,7 +52,7 @@ import
org.apache.maven.shared.filtering.MavenResourcesFiltering;
* @author Andreas Hoheneder
* @author William Ferguson
*/
-@Mojo(name = "resources", defaultPhase = LifecyclePhase.PROCESS_RESOURCES,
requiresProject = true, threadSafe = true)
+@Mojo(name = "resources", defaultPhase = LifecyclePhase.PROCESS_RESOURCES,
threadSafe = true)
public class ResourcesMojo extends AbstractMojo {
/**
@@ -125,13 +127,13 @@ public class ResourcesMojo extends AbstractMojo {
/**
*
*/
- @Component(role = MavenResourcesFiltering.class, hint = "default")
+ @Inject
protected MavenResourcesFiltering mavenResourcesFiltering;
/**
*
*/
- @Component(role = MavenResourcesFiltering.class)
+ @Inject
protected Map<String, MavenResourcesFiltering> mavenResourcesFilteringMap;
/**
@@ -297,7 +299,7 @@ public class ResourcesMojo extends AbstractMojo {
if (StringUtils.isBlank(encoding) &&
isFilteringEnabled(getResources())) {
getLog().warn("File encoding has not been set, using platform
encoding "
- + System.getProperty("file.encoding")
+ + Charset.defaultCharset().displayName()
+ ". Build is platform dependent!");
getLog().warn("See
https://maven.apache.org/general.html#encoding-warning";);
}
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 f7a1ada..f69344c 100644
--- a/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java
@@ -34,11 +34,7 @@ import org.apache.maven.plugins.annotations.Parameter;
* @author <a href="[email protected]">Michal Maczka</a>
* @author <a href="mailto:[email protected]";>Jason van Zyl</a>
*/
-@Mojo(
- name = "testResources",
- defaultPhase = LifecyclePhase.PROCESS_TEST_RESOURCES,
- requiresProject = true,
- threadSafe = true)
+@Mojo(name = "testResources", defaultPhase =
LifecyclePhase.PROCESS_TEST_RESOURCES, threadSafe = true)
public class TestResourcesMojo extends ResourcesMojo {
/**
* The output directory into which to copy the resources.
diff --git
a/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java
b/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java
index 2f7579b..e5774a8 100644
---
a/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java
+++
b/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java
@@ -26,7 +26,6 @@ import java.util.Enumeration;
import java.util.Properties;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.codehaus.plexus.util.IOUtil;
/**
* Base class for propertyutils test case
@@ -78,19 +77,10 @@ public abstract class AbstractPropertyUtilsTest extends
AbstractMojoTestCase {
*
* @param validationPropFile
*/
- private void loadValidationProperties(File validationPropFile) {
+ private void loadValidationProperties(File validationPropFile) throws
IOException {
validationProp = new Properties();
- InputStream in = null;
-
- try {
- in = Files.newInputStream(validationPropFile.toPath());
+ try (InputStream in =
Files.newInputStream(validationPropFile.toPath())) {
validationProp.load(in);
- in.close();
- in = null;
- } catch (IOException ex) {
- // TODO: do error handling
- } finally {
- IOUtil.close(in);
}
}
}
diff --git
a/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
b/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
index 71bc0b5..ba13678 100644
--- a/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
@@ -41,22 +41,17 @@ public class ResourcesMojoTest extends AbstractMojoTestCase
{
/**
* test mojo lookup, test harness should be working fine
- *
- * @throws Exception
*/
public void testHarnessEnvironment() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
assertNotNull(mojo);
}
- /**
- * @throws Exception
- */
public void testResourceDirectoryStructure() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("resourceDirectoryStructure");
List<Resource> resources = project.getBuild().getResources();
@@ -86,12 +81,9 @@ public class ResourcesMojoTest extends AbstractMojoTestCase {
assertTrue(FileUtils.fileExists(resourcesDir + "/notpackage/test"));
}
- /**
- * @throws Exception
- */
public void testResourceDirectoryStructureRelativePath() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("resourceDirectoryStructure_RelativePath");
List<Resource> resources = project.getBuild().getResources();
@@ -122,12 +114,9 @@ public class ResourcesMojoTest extends
AbstractMojoTestCase {
assertTrue(FileUtils.fileExists(resourcesDir + "/notpackage/test"));
}
- /**
- * @throws Exception
- */
public void testResourceEncoding() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("encoding");
List<Resource> resources = project.getBuild().getResources();
@@ -151,12 +140,9 @@ public class ResourcesMojoTest extends
AbstractMojoTestCase {
assertTrue(FileUtils.fileExists(resourcesDir + "/file4.txt"));
}
- /**
- * @throws Exception
- */
public void testResourceInclude() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("resourceInclude");
List<Resource> resources = project.getBuild().getResources();
@@ -202,12 +188,9 @@ public class ResourcesMojoTest extends
AbstractMojoTestCase {
assertFalse(FileUtils.fileExists(resourcesDir +
"/notpackage/nottest/file.txt"));
}
- /**
- * @throws Exception
- */
public void testResourceExclude() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("resourceExclude");
List<Resource> resources = project.getBuild().getResources();
@@ -259,7 +242,7 @@ public class ResourcesMojoTest extends AbstractMojoTestCase
{
*/
public void testResourceTargetPath() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("resourceTargetPath");
List<Resource> resources = project.getBuild().getResources();
@@ -296,7 +279,7 @@ public class ResourcesMojoTest extends AbstractMojoTestCase
{
*/
public void testResourceSystemPropertiesFiltering() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("resourceSystemProperties_Filtering");
List<Resource> resources = project.getBuild().getResources();
@@ -342,7 +325,7 @@ public class ResourcesMojoTest extends AbstractMojoTestCase
{
*/
public void testResourceProjectPropertiesFiltering() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("resourceProjectProperties_Filtering");
List<Resource> resources = project.getBuild().getResources();
@@ -373,7 +356,7 @@ public class ResourcesMojoTest extends AbstractMojoTestCase
{
*/
public void testProjectPropertyFilteringPropertyDestination() throws
Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project =
new
MavenProjectResourcesStub("resourcePojectProperty_Filtering_PropertyDestination");
List<Resource> resources = project.getBuild().getResources();
@@ -408,7 +391,7 @@ public class ResourcesMojoTest extends AbstractMojoTestCase
{
*/
public void testPropertyFilesFiltering() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("resourcePropertyFiles_Filtering");
List<Resource> resources = project.getBuild().getResources();
LinkedList<String> filterList = new LinkedList<>();
@@ -441,7 +424,7 @@ public class ResourcesMojoTest extends AbstractMojoTestCase
{
*/
public void testPropertyFilesExtra() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("resourcePropertyFiles_Extra");
List<Resource> resources = project.getBuild().getResources();
LinkedList<String> filterList = new LinkedList<>();
@@ -474,7 +457,7 @@ public class ResourcesMojoTest extends AbstractMojoTestCase
{
*/
public void testPropertyFilesMainAndExtra() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("resourcePropertyFiles_MainAndExtra");
List<Resource> resources = project.getBuild().getResources();
LinkedList<String> filterList = new LinkedList<>();
@@ -518,7 +501,7 @@ public class ResourcesMojoTest extends AbstractMojoTestCase
{
*/
public void testPropertyFilesFilteringTokensInFilters() throws Exception {
final File testPom = new File(getBasedir(), defaultPomFilePath);
- final ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources",
testPom);
+ final ResourcesMojo mojo = lookupMojo("resources", testPom);
final MavenProjectResourcesStub project =
new
MavenProjectResourcesStub("resourcePropertyFiles_Filtering_TokensInFilters");
final List<Resource> resources = project.getBuild().getResources();
@@ -550,7 +533,7 @@ public class ResourcesMojoTest extends AbstractMojoTestCase
{
public void testWindowsPathEscapingDisabled() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("windows-paths");
List<Resource> resources = project.getBuild().getResources();
@@ -586,7 +569,7 @@ public class ResourcesMojoTest extends AbstractMojoTestCase
{
public void testWindowsPathEscapingEnabled() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
+ ResourcesMojo mojo = lookupMojo("resources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("windows-paths");
List<Resource> resources = project.getBuild().getResources();
diff --git
a/src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java
b/src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java
index efa37c5..2647b14 100644
--- a/src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java
+++ b/src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java
@@ -30,28 +30,19 @@ import org.codehaus.plexus.util.FileUtils;
public class TestResourcesTest extends AbstractMojoTestCase {
private final String defaultPomFilePath =
"/target/test-classes/unit/resources-test/plugin-config.xml";
- protected void setUp() throws Exception {
- super.setUp();
- }
-
/**
* test mojo lookup, test harness should be working fine
- *
- * @throws Exception
*/
public void testHarnessEnvironment() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- ResourcesMojo mojo = (ResourcesMojo) lookupMojo("testResources",
testPom);
+ ResourcesMojo mojo = lookupMojo("testResources", testPom);
assertNotNull(mojo);
}
- /**
- * @throws Exception
- */
public void testTestResourceDirectoryCreation() throws Exception {
File testPom = new File(getBasedir(), defaultPomFilePath);
- TestResourcesMojo mojo = (TestResourcesMojo)
lookupMojo("testResources", testPom);
+ TestResourcesMojo mojo = lookupMojo("testResources", testPom);
MavenProjectResourcesStub project = new
MavenProjectResourcesStub("testResourceDirectoryStructure");
List<Resource> resources = project.getBuild().getResources();
diff --git
a/src/test/java/org/apache/maven/plugins/resources/filters/ItFilter.java
b/src/test/java/org/apache/maven/plugins/resources/filters/ItFilter.java
index c0ebd2d..d7c2504 100644
--- a/src/test/java/org/apache/maven/plugins/resources/filters/ItFilter.java
+++ b/src/test/java/org/apache/maven/plugins/resources/filters/ItFilter.java
@@ -27,11 +27,12 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.io.FileUtils;
import org.apache.maven.shared.filtering.MavenFilteringException;
import org.apache.maven.shared.filtering.MavenResourcesExecution;
import org.apache.maven.shared.filtering.MavenResourcesFiltering;
+import static org.apache.commons.io.FileUtils.writeLines;
+
/**
* @author Olivier Lamy
* @since 2.5
@@ -72,7 +73,7 @@ public class ItFilter implements MavenResourcesFiltering {
.getMavenSession()
.getSystemProperties()
.getProperty("toto"));
- FileUtils.writeLines(f, lines);
+ writeLines(f, lines);
} catch (IOException e) {
throw new MavenFilteringException(e.getMessage(), e);
}
diff --git
a/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBuildStub.java
b/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBuildStub.java
index 0d01e11..fb8beff 100644
---
a/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBuildStub.java
+++
b/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBuildStub.java
@@ -120,13 +120,7 @@ public class MavenProjectBuildStub extends
MavenProjectBasicStub {
* @return
*/
private boolean isValidPath(String path) {
- boolean bRetVal = true;
-
- if (path.startsWith("c:") || path.startsWith("..") ||
path.startsWith("/") || path.startsWith("\\")) {
- bRetVal = false;
- }
-
- return bRetVal;
+ return !path.startsWith("c:") && !path.startsWith("..") &&
!path.startsWith("/") && !path.startsWith("\\");
}
private void setupBuild() {
