Bump Maven to 3.9.11 while keep prerequisites on 3.6.3

Remove redundant dependencies and code cleanup to remove warnings

Author: slachiewicz

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,40 +98,22 @@ 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>
       <groupId>org.codehaus.plexus</groupId>
       <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>

src/it/user-filters/invoker.properties

@@ -5,14 +5,14 @@
 # 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
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.systemPropertiesFile = test.properties
+invoker.userPropertiesFile = test.properties

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.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 @@
  * @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 void execute() throws MojoExecutionException {
 
         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");
         }

src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java

@@ -34,11 +34,7 @@
  * @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.

src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java

@@ -26,7 +26,6 @@
 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 @@ protected boolean validateProperties(Properties prop) {
      *
      * @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);
         }
     }
 }

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 void testResourceDirectoryStructure() throws Exception {
         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 void testResourceDirectoryStructureRelativePath() throws Exception {
         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 void testResourceEncoding() throws Exception {
         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 void testResourceInclude() throws Exception {
         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 void testResourceExclude() throws Exception {
      */
     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 void testResourceTargetPath() throws Exception {
      */
     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 void testResourceSystemPropertiesFiltering() throws Exception {
      */
     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 void testResourceProjectPropertiesFiltering() throws Exception {
      */
     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 void testProjectPropertyFilteringPropertyDestination() throws Exception {
      */
     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 void testPropertyFilesFiltering() throws Exception {
      */
     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 void testPropertyFilesExtra() throws Exception {
      */
     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 void testPropertyFilesMainAndExtra() throws Exception {
      */
     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 void testPropertyFilesFilteringTokensInFilters() throws Exception {
 
     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 void testWindowsPathEscapingDisabled() throws Exception {
 
     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();