[MNG-8179] Upgrade Parent to 43

apache · Jul 9, 2024 · 80e43d8 · 80e43d8
1 parent fd8f99e
commit 80e43d8
Show file tree

Hide file tree

Showing 110 changed files with 556 additions and 139 deletions.
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/ExtensibleEnums.java b/api/maven-api-core/src/main/java/org/apache/maven/api/ExtensibleEnums.java
@@ -18,7 +18,11 @@
  */
 package org.apache.maven.api;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
 
 abstract class ExtensibleEnums {
 

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Lifecycle.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Lifecycle.java
@@ -18,7 +18,9 @@
  */
 package org.apache.maven.api;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
 
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/PathScope.java b/api/maven-api-core/src/main/java/org/apache/maven/api/PathScope.java
@@ -18,7 +18,7 @@
  */
 package org.apache.maven.api;
 
-import java.util.*;
+import java.util.Set;
 
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;

diff --git a/...pi-core/src/main/java/org/apache/maven/api/services/ArtifactCoordinateFactoryRequest.java b/...pi-core/src/main/java/org/apache/maven/api/services/ArtifactCoordinateFactoryRequest.java
@@ -177,6 +177,7 @@ private static class DefaultArtifactFactoryRequestArtifact extends BaseRequest
             private final String type;
             private final String coordinateString;
 
+            @SuppressWarnings("checkstyle:ParameterNumber")
             DefaultArtifactFactoryRequestArtifact(
                     @Nonnull Session session,
                     String groupId,

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ChecksumAlgorithmService.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ChecksumAlgorithmService.java
@@ -18,7 +18,8 @@
  */
 package org.apache.maven.api.services;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.nio.file.Path;
 import java.util.Collection;

diff --git a/...maven-api-core/src/main/java/org/apache/maven/api/services/DependencyResolverRequest.java b/...maven-api-core/src/main/java/org/apache/maven/api/services/DependencyResolverRequest.java
@@ -360,6 +360,7 @@ static class DefaultDependencyResolverRequest extends BaseRequest implements Dep
              * @param rootArtifact The root dependency whose transitive dependencies should be collected, may be {@code
              *                     null}.
              */
+            @SuppressWarnings("checkstyle:ParameterNumber")
             DefaultDependencyResolverRequest(
                     @Nonnull Session session,
                     @Nonnull RequestType requestType,

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectManager.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectManager.java
@@ -19,9 +19,17 @@
 package org.apache.maven.api.services;
 
 import java.nio.file.Path;
-import java.util.*;
-
-import org.apache.maven.api.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.apache.maven.api.Artifact;
+import org.apache.maven.api.Project;
+import org.apache.maven.api.ProjectScope;
+import org.apache.maven.api.RemoteRepository;
+import org.apache.maven.api.Service;
+import org.apache.maven.api.Session;
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.Nullable;

diff --git a/api/maven-api-di/src/main/java/org/apache/maven/api/di/Inject.java b/api/maven-api-di/src/main/java/org/apache/maven/api/di/Inject.java
@@ -22,7 +22,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 @Target({FIELD, CONSTRUCTOR, METHOD})

diff --git a/api/maven-api-di/src/main/java/org/apache/maven/api/di/Named.java b/api/maven-api-di/src/main/java/org/apache/maven/api/di/Named.java
@@ -21,7 +21,6 @@
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 
-import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 @Qualifier

diff --git a/api/maven-api-di/src/main/java/org/apache/maven/api/di/Typed.java b/api/maven-api-di/src/main/java/org/apache/maven/api/di/Typed.java
@@ -22,7 +22,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 @Target({FIELD, METHOD, TYPE})

diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/AbstractSession.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/AbstractSession.java
@@ -60,7 +60,31 @@
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.Nullable;
 import org.apache.maven.api.model.Repository;
-import org.apache.maven.api.services.*;
+import org.apache.maven.api.services.ArtifactCoordinateFactory;
+import org.apache.maven.api.services.ArtifactDeployer;
+import org.apache.maven.api.services.ArtifactDeployerException;
+import org.apache.maven.api.services.ArtifactFactory;
+import org.apache.maven.api.services.ArtifactInstaller;
+import org.apache.maven.api.services.ArtifactInstallerException;
+import org.apache.maven.api.services.ArtifactManager;
+import org.apache.maven.api.services.ArtifactResolver;
+import org.apache.maven.api.services.ArtifactResolverException;
+import org.apache.maven.api.services.DependencyCoordinateFactory;
+import org.apache.maven.api.services.DependencyResolver;
+import org.apache.maven.api.services.DependencyResolverException;
+import org.apache.maven.api.services.DependencyResolverRequest;
+import org.apache.maven.api.services.LanguageRegistry;
+import org.apache.maven.api.services.LocalRepositoryManager;
+import org.apache.maven.api.services.Lookup;
+import org.apache.maven.api.services.LookupException;
+import org.apache.maven.api.services.PackagingRegistry;
+import org.apache.maven.api.services.PathScopeRegistry;
+import org.apache.maven.api.services.ProjectScopeRegistry;
+import org.apache.maven.api.services.RepositoryFactory;
+import org.apache.maven.api.services.TypeRegistry;
+import org.apache.maven.api.services.VersionParser;
+import org.apache.maven.api.services.VersionRangeResolver;
+import org.apache.maven.api.services.VersionResolver;
 import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;

diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java
@@ -29,7 +29,6 @@
 import org.apache.maven.api.services.ArtifactDeployerException;
 import org.apache.maven.api.services.ArtifactDeployerRequest;
 import org.eclipse.aether.deployment.DeployRequest;
-import org.eclipse.aether.deployment.DeployResult;
 import org.eclipse.aether.deployment.DeploymentException;
 
 import static org.apache.maven.internal.impl.Utils.nonNull;
@@ -52,7 +51,7 @@ public void deploy(@Nonnull ArtifactDeployerRequest request) {
                     .setRepository(session.toRepository(repository))
                     .setArtifacts(session.toArtifacts(artifacts));
 
-            DeployResult result = session.getRepositorySystem().deploy(session.getSession(), deployRequest);
+            session.getRepositorySystem().deploy(session.getSession(), deployRequest);
         } catch (DeploymentException e) {
             throw new ArtifactDeployerException("Unable to deploy artifacts", e);
         }

diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java
@@ -27,7 +27,6 @@
 import org.apache.maven.api.services.ArtifactInstallerRequest;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.installation.InstallRequest;
-import org.eclipse.aether.installation.InstallResult;
 import org.eclipse.aether.installation.InstallationException;
 
 import static org.apache.maven.internal.impl.Utils.nonNull;
@@ -51,7 +50,7 @@ public void install(ArtifactInstallerRequest request) throws ArtifactInstallerEx
             InstallRequest installRequest =
                     new InstallRequest().setArtifacts(session.toArtifacts(request.getArtifacts()));
 
-            InstallResult result = repositorySystem.install(session.getSession(), installRequest);
+            repositorySystem.install(session.getSession(), installRequest);
         } catch (InstallationException e) {
             throw new ArtifactInstallerException(e.getMessage(), e);
         }

diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolver.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolver.java
@@ -28,17 +28,26 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import org.apache.maven.api.*;
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.ArtifactCoordinate;
 import org.apache.maven.api.Dependency;
+import org.apache.maven.api.DependencyCoordinate;
+import org.apache.maven.api.DependencyScope;
 import org.apache.maven.api.Node;
+import org.apache.maven.api.PathScope;
 import org.apache.maven.api.PathType;
+import org.apache.maven.api.Project;
+import org.apache.maven.api.RemoteRepository;
 import org.apache.maven.api.Session;
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.di.Named;
 import org.apache.maven.api.di.Singleton;
-import org.apache.maven.api.services.*;
+import org.apache.maven.api.services.ArtifactResolverException;
+import org.apache.maven.api.services.DependencyResolver;
+import org.apache.maven.api.services.DependencyResolverException;
+import org.apache.maven.api.services.DependencyResolverRequest;
+import org.apache.maven.api.services.DependencyResolverResult;
+import org.apache.maven.api.services.ProjectManager;
 import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.collection.CollectRequest;

diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsValidator.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsValidator.java
@@ -40,6 +40,7 @@ public class DefaultSettingsValidator {
 
     private static final String ILLEGAL_REPO_ID_CHARS = "\\/:\"<>|?*"; // ILLEGAL_FS_CHARS
 
+    @SuppressWarnings("checkstyle:MethodLength")
     public void validate(Settings settings, boolean isProjectSettings, List<BuilderProblem> problems) {
         if (isProjectSettings) {
             String msgS = "is not supported on project settings.";

diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsXmlFactory.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsXmlFactory.java
@@ -27,7 +27,6 @@
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.di.Named;
 import org.apache.maven.api.di.Singleton;
-import org.apache.maven.api.model.InputSource;
 import org.apache.maven.api.services.xml.ToolchainsXmlFactory;
 import org.apache.maven.api.services.xml.XmlReaderException;
 import org.apache.maven.api.services.xml.XmlReaderRequest;
@@ -53,10 +52,6 @@ public PersistedToolchains read(@Nonnull XmlReaderRequest request) throws XmlRea
             throw new IllegalArgumentException("reader or inputStream must be non null");
         }
         try {
-            InputSource source = null;
-            if (request.getModelId() != null || request.getLocation() != null) {
-                source = new InputSource(request.getModelId(), request.getLocation());
-            }
             MavenToolchainsStaxReader xml = new MavenToolchainsStaxReader();
             xml.setAddDefaultEntities(request.isAddDefaultEntities());
             if (reader != null) {

diff --git a/...c/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementImporter.java b/...c/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementImporter.java
@@ -37,7 +37,7 @@
 import org.apache.maven.api.services.ModelBuilderRequest;
 import org.apache.maven.api.services.ModelProblem.Version;
 import org.apache.maven.api.services.ModelProblemCollector;
-import org.apache.maven.api.services.model.*;
+import org.apache.maven.api.services.model.DependencyManagementImporter;
 
 /**
  * Handles the import of dependency management from other models into the target model.

diff --git a/...c/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementInjector.java b/...c/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementInjector.java
@@ -32,7 +32,7 @@
 import org.apache.maven.api.model.Model;
 import org.apache.maven.api.services.ModelBuilderRequest;
 import org.apache.maven.api.services.ModelProblemCollector;
-import org.apache.maven.api.services.model.*;
+import org.apache.maven.api.services.model.DependencyManagementInjector;
 
 /**
  * Handles injection of dependency management into the model.

diff --git a/...-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultInheritanceAssembler.java b/...-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultInheritanceAssembler.java
@@ -35,7 +35,7 @@
 import org.apache.maven.api.model.Reporting;
 import org.apache.maven.api.services.ModelBuilderRequest;
 import org.apache.maven.api.services.ModelProblemCollector;
-import org.apache.maven.api.services.model.*;
+import org.apache.maven.api.services.model.InheritanceAssembler;
 
 /**
  * Handles inheritance of model values.

diff --git a/.../src/main/java/org/apache/maven/internal/impl/model/DefaultLifecycleBindingsInjector.java b/.../src/main/java/org/apache/maven/internal/impl/model/DefaultLifecycleBindingsInjector.java
@@ -43,7 +43,7 @@
 import org.apache.maven.api.services.ModelProblem.Version;
 import org.apache.maven.api.services.ModelProblemCollector;
 import org.apache.maven.api.services.PackagingRegistry;
-import org.apache.maven.api.services.model.*;
+import org.apache.maven.api.services.model.LifecycleBindingsInjector;
 
 /**
  * Handles injection of plugin executions induced by the lifecycle bindings for a packaging.

diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java
@@ -78,7 +78,25 @@
 import org.apache.maven.api.services.Source;
 import org.apache.maven.api.services.SuperPomProvider;
 import org.apache.maven.api.services.VersionParserException;
-import org.apache.maven.api.services.model.*;
+import org.apache.maven.api.services.model.DependencyManagementImporter;
+import org.apache.maven.api.services.model.DependencyManagementInjector;
+import org.apache.maven.api.services.model.InheritanceAssembler;
+import org.apache.maven.api.services.model.LifecycleBindingsInjector;
+import org.apache.maven.api.services.model.ModelBuildingEvent;
+import org.apache.maven.api.services.model.ModelBuildingListener;
+import org.apache.maven.api.services.model.ModelInterpolator;
+import org.apache.maven.api.services.model.ModelNormalizer;
+import org.apache.maven.api.services.model.ModelPathTranslator;
+import org.apache.maven.api.services.model.ModelProcessor;
+import org.apache.maven.api.services.model.ModelUrlNormalizer;
+import org.apache.maven.api.services.model.ModelValidator;
+import org.apache.maven.api.services.model.ModelVersionParser;
+import org.apache.maven.api.services.model.PluginConfigurationExpander;
+import org.apache.maven.api.services.model.PluginManagementInjector;
+import org.apache.maven.api.services.model.ProfileActivationContext;
+import org.apache.maven.api.services.model.ProfileInjector;
+import org.apache.maven.api.services.model.ProfileSelector;
+import org.apache.maven.api.services.model.WorkspaceModelResolver;
 import org.apache.maven.api.services.xml.XmlReaderException;
 import org.apache.maven.api.services.xml.XmlReaderRequest;
 import org.apache.maven.internal.impl.resolver.DefaultModelCache;

diff --git a/...api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelInterpolator.java b/...api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelInterpolator.java
@@ -39,7 +39,10 @@
 import org.apache.maven.api.services.ModelBuilderRequest;
 import org.apache.maven.api.services.ModelProblem;
 import org.apache.maven.api.services.ModelProblemCollector;
-import org.apache.maven.api.services.model.*;
+import org.apache.maven.api.services.model.ModelInterpolator;
+import org.apache.maven.api.services.model.PathTranslator;
+import org.apache.maven.api.services.model.RootLocator;
+import org.apache.maven.api.services.model.UrlNormalizer;
 import org.apache.maven.model.v4.MavenTransformer;
 import org.codehaus.plexus.interpolation.AbstractDelegatingValueSource;
 import org.codehaus.plexus.interpolation.AbstractValueSource;

diff --git a/...n-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelNormalizer.java b/...n-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelNormalizer.java
@@ -33,7 +33,7 @@
 import org.apache.maven.api.model.Plugin;
 import org.apache.maven.api.services.ModelBuilderRequest;
 import org.apache.maven.api.services.ModelProblemCollector;
-import org.apache.maven.api.services.model.*;
+import org.apache.maven.api.services.model.ModelNormalizer;
 
 /**
  * Handles normalization of a model.

diff --git a/...i-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelPathTranslator.java b/...i-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelPathTranslator.java
@@ -32,7 +32,8 @@
 import org.apache.maven.api.model.Reporting;
 import org.apache.maven.api.model.Resource;
 import org.apache.maven.api.services.ModelBuilderRequest;
-import org.apache.maven.api.services.model.*;
+import org.apache.maven.api.services.model.ModelPathTranslator;
+import org.apache.maven.api.services.model.PathTranslator;
 
 /**
  * Resolves relative paths within a model against a specific base directory.

diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProcessor.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProcessor.java
@@ -32,7 +32,7 @@
 import org.apache.maven.api.di.Named;
 import org.apache.maven.api.di.Singleton;
 import org.apache.maven.api.model.Model;
-import org.apache.maven.api.services.model.*;
+import org.apache.maven.api.services.model.ModelProcessor;
 import org.apache.maven.api.services.xml.ModelXmlFactory;
 import org.apache.maven.api.services.xml.XmlReaderRequest;
 import org.apache.maven.api.spi.ModelParser;

diff --git a/...pl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelTransformerContext.java b/...pl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelTransformerContext.java
@@ -26,7 +26,7 @@
 
 import org.apache.maven.api.model.Model;
 import org.apache.maven.api.services.ModelTransformerContext;
-import org.apache.maven.api.services.model.*;
+import org.apache.maven.api.services.model.ModelProcessor;
 
 /**
  *

diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelValidator.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelValidator.java
@@ -68,7 +68,8 @@
 import org.apache.maven.api.services.ModelBuilderRequest;
 import org.apache.maven.api.services.ModelProblem.Version;
 import org.apache.maven.api.services.ModelProblemCollector;
-import org.apache.maven.api.services.model.*;
+import org.apache.maven.api.services.model.ModelValidator;
+import org.apache.maven.api.services.model.ModelVersionProcessor;
 import org.apache.maven.model.v4.MavenModelVersion;
 import org.apache.maven.model.v4.MavenTransformer;
 
@@ -294,6 +295,7 @@ public DefaultModelValidator(ModelVersionProcessor versionProcessor) {
     }
 
     @Override
+    @SuppressWarnings("checkstyle:MethodLength")
     public void validateFileModel(Model m, ModelBuilderRequest request, ModelProblemCollector problems) {
 
         Parent parent = m.getParent();
@@ -632,6 +634,7 @@ private void validate20RawPlugins(
     }
 
     @Override
+    @SuppressWarnings("checkstyle:MethodLength")
     public void validateEffectiveModel(Model m, ModelBuilderRequest request, ModelProblemCollector problems) {
         validateStringNotEmpty("modelVersion", problems, Severity.ERROR, Version.BASE, m.getModelVersion(), m);
 

diff --git a/...impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelVersionProcessor.java b/...impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelVersionProcessor.java
@@ -24,7 +24,7 @@
 import org.apache.maven.api.di.Named;
 import org.apache.maven.api.di.Singleton;
 import org.apache.maven.api.services.ModelBuilderRequest;
-import org.apache.maven.api.services.model.*;
+import org.apache.maven.api.services.model.ModelVersionProcessor;
 
 /**
  * Maven default implementation of the {@link ModelVersionProcessor} to support

diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultPathTranslator.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultPathTranslator.java
@@ -23,7 +23,7 @@
 
 import org.apache.maven.api.di.Named;
 import org.apache.maven.api.di.Singleton;
-import org.apache.maven.api.services.model.*;
+import org.apache.maven.api.services.model.PathTranslator;
 
 /**
  * Resolves relative paths against a specific base directory.

diff --git a/...l/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileActivationContext.java b/...l/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileActivationContext.java
@@ -25,7 +25,7 @@
 import java.util.Properties;
 import java.util.stream.Collectors;
 
-import org.apache.maven.api.services.model.*;
+import org.apache.maven.api.services.model.ProfileActivationContext;
 
 /**
  * Describes the environmental context used to determine the activation status of profiles.