Merge remote-tracking branch 'origin/master' into MNG-8523

# Conflicts:
#	impl/maven-core/src/test/java/org/apache/maven/internal/transformation/AbstractRepositoryTestCase.java
#	impl/maven-core/src/test/java/org/apache/maven/internal/transformation/impl/ConsumerPomBuilderTest.java

Author: gnodet

compat/maven-compat/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java

@@ -35,10 +35,10 @@
 import org.apache.maven.execution.DefaultMavenExecutionResult;
 import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.MavenSession;
+import org.apache.maven.impl.InternalSession;
 import org.apache.maven.internal.impl.DefaultLookup;
 import org.apache.maven.internal.impl.DefaultSessionFactory;
 import org.apache.maven.internal.impl.InternalMavenSession;
-import org.apache.maven.internal.impl.InternalSession;
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Exclusion;

compat/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java

@@ -33,10 +33,10 @@
 import org.apache.maven.execution.DefaultMavenExecutionRequest;
 import org.apache.maven.execution.DefaultMavenExecutionResult;
 import org.apache.maven.execution.MavenSession;
+import org.apache.maven.impl.InternalSession;
 import org.apache.maven.internal.impl.DefaultLookup;
 import org.apache.maven.internal.impl.DefaultSession;
 import org.apache.maven.internal.impl.InternalMavenSession;
-import org.apache.maven.internal.impl.InternalSession;
 import org.apache.maven.model.building.ModelBuildingException;
 import org.apache.maven.model.building.ModelProblem;
 import org.apache.maven.repository.RepositorySystem;

compat/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleBindingsInjector.java

@@ -38,7 +38,7 @@
 import org.apache.maven.api.model.PluginExecution;
 import org.apache.maven.api.services.LifecycleRegistry;
 import org.apache.maven.api.services.PackagingRegistry;
-import org.apache.maven.internal.impl.model.DefaultLifecycleBindingsInjector;
+import org.apache.maven.impl.model.DefaultLifecycleBindingsInjector;
 
 import static org.apache.maven.api.Lifecycle.DEFAULT;
 

compat/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTestType.java

@@ -22,7 +22,7 @@
 import java.lang.reflect.Field;
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.internal.impl.resolver.DefaultArtifactDescriptorReader;
+import org.apache.maven.impl.resolver.DefaultArtifactDescriptorReader;
 import org.eclipse.aether.impl.ArtifactDescriptorReader;
 import org.eclipse.aether.impl.ArtifactResolver;
 import org.junit.jupiter.api.BeforeEach;

compat/maven-compat/src/test/java/org/apache/maven/project/TestModelResolver.java

@@ -21,7 +21,7 @@
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.apache.maven.internal.impl.resolver.DefaultModelResolver;
+import org.apache.maven.impl.resolver.DefaultModelResolver;
 
 @Named
 @Singleton

compat/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java

@@ -34,9 +34,9 @@
 import org.apache.maven.execution.DefaultMavenExecutionRequest;
 import org.apache.maven.execution.DefaultMavenExecutionResult;
 import org.apache.maven.execution.MavenSession;
-import org.apache.maven.internal.impl.DefaultRepositoryFactory;
+import org.apache.maven.impl.DefaultRepositoryFactory;
+import org.apache.maven.impl.InternalSession;
 import org.apache.maven.internal.impl.DefaultSession;
-import org.apache.maven.internal.impl.InternalSession;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Repository;
 import org.apache.maven.model.RepositoryPolicy;

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

@@ -26,7 +26,7 @@
 import org.apache.maven.api.services.Interpolator;
 import org.apache.maven.api.xml.XmlNode;
 import org.apache.maven.extension.internal.CoreExtensionEntry;
-import org.apache.maven.internal.impl.model.DefaultInterpolator;
+import org.apache.maven.impl.model.DefaultInterpolator;
 import org.apache.maven.internal.xml.XmlNodeImpl;
 import org.apache.maven.internal.xml.XmlPlexusConfiguration;
 import org.apache.maven.model.v4.MavenTransformer;

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

@@ -48,16 +48,16 @@
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.extension.internal.CoreExports;
 import org.apache.maven.extension.internal.CoreExtensionEntry;
-import org.apache.maven.internal.impl.DefaultArtifactCoordinatesFactory;
+import org.apache.maven.impl.DefaultArtifactCoordinatesFactory;
+import org.apache.maven.impl.DefaultArtifactResolver;
+import org.apache.maven.impl.DefaultModelVersionParser;
+import org.apache.maven.impl.DefaultRepositoryFactory;
+import org.apache.maven.impl.DefaultVersionParser;
+import org.apache.maven.impl.DefaultVersionRangeResolver;
+import org.apache.maven.impl.InternalSession;
+import org.apache.maven.impl.model.DefaultInterpolator;
 import org.apache.maven.internal.impl.DefaultArtifactManager;
-import org.apache.maven.internal.impl.DefaultArtifactResolver;
-import org.apache.maven.internal.impl.DefaultModelVersionParser;
-import org.apache.maven.internal.impl.DefaultRepositoryFactory;
 import org.apache.maven.internal.impl.DefaultSession;
-import org.apache.maven.internal.impl.DefaultVersionParser;
-import org.apache.maven.internal.impl.DefaultVersionRangeResolver;
-import org.apache.maven.internal.impl.InternalSession;
-import org.apache.maven.internal.impl.model.DefaultInterpolator;
 import org.apache.maven.plugin.PluginResolutionException;
 import org.apache.maven.plugin.internal.DefaultPluginDependenciesResolver;
 import org.apache.maven.resolver.MavenChainedWorkspaceReader;

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

@@ -44,7 +44,7 @@
 import java.util.Set;
 import java.util.function.UnaryOperator;
 
-import org.apache.maven.internal.impl.model.DefaultInterpolator;
+import org.apache.maven.impl.model.DefaultInterpolator;
 
 /**
  * Enhancement of the standard <code>Properties</code>

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

@@ -26,7 +26,7 @@
 import java.util.StringTokenizer;
 import java.util.function.UnaryOperator;
 
-import org.apache.maven.internal.impl.model.DefaultInterpolator;
+import org.apache.maven.impl.model.DefaultInterpolator;
 
 @Deprecated
 public class MavenPropertiesLoader {