Merge branch 'master' into fix-write-test

Author: Vincent Potucek

compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java

@@ -32,7 +32,6 @@
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.repository.legacy.repository.ArtifactRepositoryFactory;
 import org.apache.maven.wagon.ResourceDoesNotExistException;
@@ -176,27 +175,6 @@ private ArtifactRepository createStringRepo() {
                 "id", "string://url", new ArtifactRepositoryLayoutStub(), null, null);
     }
 
-    /**
-     * Build an ArtifactRepository object.
-     *
-     * @param id
-     * @param url
-     * @return
-     */
-    private ArtifactRepository getRepo(String id, String url) {
-        return artifactRepositoryFactory.createArtifactRepository(id, url, new DefaultRepositoryLayout(), null, null);
-    }
-
-    /**
-     * Build an ArtifactRepository object.
-     *
-     * @param id
-     * @return
-     */
-    private ArtifactRepository getRepo(String id) {
-        return getRepo(id, "http://something");
-    }
-
     @Test
     void testDefaultWagonManager() throws Exception {
         assertWagon("a");

compat/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java

@@ -1587,13 +1587,6 @@ private void enableOnPresentOption(
         enableOnPresentOption(commandLine, String.valueOf(option), setting);
     }
 
-    private void enableOnAbsentOption(
-            final CommandLine commandLine, final char option, final Consumer<Boolean> setting) {
-        if (!commandLine.hasOption(option)) {
-            setting.accept(true);
-        }
-    }
-
     int calculateDegreeOfConcurrency(String threadConfiguration) {
         try {
             if (threadConfiguration.endsWith("C")) {

impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultLifecycleBindingsInjector.java

@@ -24,8 +24,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.apache.maven.api.Packaging;
 import org.apache.maven.api.di.Inject;
@@ -108,18 +106,6 @@ private void addPlugin(Map<Plugin, Plugin> plugins, Plugin plugin) {
         }
     }
 
-    private static String getExecutionId(Plugin plugin, String goal) {
-        Set<String> existingIds = plugin != null
-                ? plugin.getExecutions().stream().map(PluginExecution::getId).collect(Collectors.toSet())
-                : Set.of();
-        String base = "default-" + goal;
-        String id = base;
-        for (int index = 1; existingIds.contains(id); index++) {
-            id = base + '-' + index;
-        }
-        return id;
-    }
-
     /**
      *  The domain-specific model merger for lifecycle bindings
      */

impl/maven-xml/src/main/java/org/apache/maven/internal/xml/XmlNodeImpl.java

@@ -332,8 +332,4 @@ private static <T> boolean addToStringField(StringBuilder sb, T o, Function<T, B
         }
         return w;
     }
-
-    private static boolean isEmpty(String str) {
-        return str == null || str.isEmpty();
-    }
 }