diff --git a/compat/maven-compat/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java b/compat/maven-compat/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java index 0201b2fd0a62..436411615668 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java +++ b/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; diff --git a/compat/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/compat/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java index a7b89c933e9e..56f62cf65dc5 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java +++ b/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; diff --git a/compat/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleBindingsInjector.java b/compat/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleBindingsInjector.java index 970b74a7501d..6823e043a0ee 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleBindingsInjector.java +++ b/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; diff --git a/compat/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTestType.java b/compat/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTestType.java index dc21aa03a3e2..7d7e2169f9e7 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTestType.java +++ b/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; diff --git a/compat/maven-compat/src/test/java/org/apache/maven/project/TestModelResolver.java b/compat/maven-compat/src/test/java/org/apache/maven/project/TestModelResolver.java index 1d83b8ccf8bf..ba64b5cbcd7c 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/project/TestModelResolver.java +++ b/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 diff --git a/compat/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java index 5feff152534b..ee287309a371 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java +++ b/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; diff --git a/compat/maven-embedder/src/main/java/org/apache/maven/cli/ExtensionConfigurationModule.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/ExtensionConfigurationModule.java index 85bcc8cb1cbb..5c768ca6858f 100644 --- a/compat/maven-embedder/src/main/java/org/apache/maven/cli/ExtensionConfigurationModule.java +++ b/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; diff --git a/compat/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java index 5dc8858b829e..321bde249d82 100644 --- a/compat/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java +++ b/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; diff --git a/compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenProperties.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenProperties.java index 0a1d955f86d5..606eb65b5c10 100644 --- a/compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenProperties.java +++ b/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 Properties diff --git a/compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenPropertiesLoader.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenPropertiesLoader.java index 62bfe2c8382b..7061445bc68b 100644 --- a/compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenPropertiesLoader.java +++ b/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 { diff --git a/compat/maven-embedder/src/test/java/org/apache/maven/cli/props/MavenPropertiesTest.java b/compat/maven-embedder/src/test/java/org/apache/maven/cli/props/MavenPropertiesTest.java index 6ae68b4dce04..122049e81a93 100644 --- a/compat/maven-embedder/src/test/java/org/apache/maven/cli/props/MavenPropertiesTest.java +++ b/compat/maven-embedder/src/test/java/org/apache/maven/cli/props/MavenPropertiesTest.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; -import org.apache.maven.internal.impl.model.DefaultInterpolator; +import org.apache.maven.impl.model.DefaultInterpolator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/compat/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java index 546e7d0eef48..f451f219aca3 100644 --- a/compat/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java +++ b/compat/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java @@ -51,7 +51,7 @@ * The domain-specific model merger for the Maven POM, overriding generic code from parent class when necessary with * more adapted algorithms. * - * @deprecated use {@link org.apache.maven.internal.impl.model.MavenModelMerger} instead + * @deprecated use {@link org.apache.maven.impl.model.MavenModelMerger} instead */ @Deprecated(since = "4.0.0") public class MavenModelMerger extends ModelMerger { diff --git a/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java index 81411087869f..c20b4241b237 100644 --- a/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java +++ b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java @@ -36,7 +36,7 @@ import org.apache.maven.settings.building.SettingsProblemCollector; /** - * @deprecated since 4.0.0, use {@link org.apache.maven.internal.impl.DefaultSettingsValidator} instead + * @deprecated since 4.0.0, use {@link org.apache.maven.impl.DefaultSettingsValidator} instead */ @Named @Singleton diff --git a/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java index f74b415d8a40..62f18cc7a38f 100644 --- a/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java +++ b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java @@ -18,13 +18,14 @@ */ package org.apache.maven.settings.validation; +import org.apache.maven.impl.DefaultSettingsValidator; import org.apache.maven.settings.Settings; import org.apache.maven.settings.building.SettingsProblemCollector; /** * Validate a model settings * - * @deprecated since 4.0.0, use {@link org.apache.maven.internal.impl.DefaultSettingsValidator} instead + * @deprecated since 4.0.0, use {@link DefaultSettingsValidator} instead */ @Deprecated(since = "4.0.0") public interface SettingsValidator { diff --git a/compat/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java b/compat/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java index 76d10e90511c..cc346e8bfc27 100644 --- a/compat/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java +++ b/compat/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java @@ -27,7 +27,7 @@ import org.apache.maven.building.Source; import org.apache.maven.building.StringSource; -import org.apache.maven.internal.impl.DefaultToolchainsXmlFactory; +import org.apache.maven.impl.DefaultToolchainsXmlFactory; import org.apache.maven.toolchain.io.DefaultToolchainsReader; import org.apache.maven.toolchain.io.DefaultToolchainsWriter; import org.apache.maven.toolchain.io.ToolchainsParseException; diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/extensions/BootstrapCoreExtensionManager.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/extensions/BootstrapCoreExtensionManager.java index 944504f30404..29d1ec399b16 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/extensions/BootstrapCoreExtensionManager.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/extensions/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; diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/extensions/ExtensionConfigurationModule.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/extensions/ExtensionConfigurationModule.java index f9778a42baf8..d686577bff79 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/extensions/ExtensionConfigurationModule.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/extensions/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; diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java index da4046a2dcde..e839ebfb1390 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java @@ -69,7 +69,7 @@ import org.apache.maven.cling.utils.CLIReportingUtils; import org.apache.maven.eventspy.internal.EventSpyDispatcher; import org.apache.maven.execution.MavenExecutionRequest; -import org.apache.maven.internal.impl.SettingsUtilsV4; +import org.apache.maven.impl.SettingsUtilsV4; import org.apache.maven.jline.FastTerminal; import org.apache.maven.jline.MessageUtils; import org.apache.maven.logging.BuildEventListener; diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/Utils.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/Utils.java index 792e882068b7..f781be4b6b33 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/Utils.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/Utils.java @@ -33,7 +33,7 @@ import org.apache.maven.api.services.model.RootLocator; import org.apache.maven.cling.logging.Slf4jConfiguration; import org.apache.maven.execution.MavenExecutionRequest; -import org.apache.maven.internal.impl.model.DefaultInterpolator; +import org.apache.maven.impl.model.DefaultInterpolator; import org.codehaus.plexus.logging.Logger; import static java.util.Objects.requireNonNull; diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/props/MavenProperties.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/props/MavenProperties.java index a7d624cc5d9d..da01bf6a9650 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/props/MavenProperties.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/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 Properties diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/props/MavenPropertiesLoader.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/props/MavenPropertiesLoader.java index 3bfb64a6399f..469b22938a33 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/props/MavenPropertiesLoader.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/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; public class MavenPropertiesLoader { diff --git a/impl/maven-cli/src/test/java/org/apache/maven/cling/transfer/FileSizeFormatTest.java b/impl/maven-cli/src/test/java/org/apache/maven/cling/transfer/FileSizeFormatTest.java index d64245017829..6151219ac5d4 100644 --- a/impl/maven-cli/src/test/java/org/apache/maven/cling/transfer/FileSizeFormatTest.java +++ b/impl/maven-cli/src/test/java/org/apache/maven/cling/transfer/FileSizeFormatTest.java @@ -22,7 +22,7 @@ import org.apache.maven.api.services.MessageBuilder; import org.apache.maven.cling.transfer.FileSizeFormat.ScaleUnit; -import org.apache.maven.internal.impl.DefaultMessageBuilder; +import org.apache.maven.impl.DefaultMessageBuilder; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/impl/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/impl/maven-core/src/main/java/org/apache/maven/ReactorReader.java index d2f13e21a726..8735d1deab6b 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/ReactorReader.java +++ b/impl/maven-core/src/main/java/org/apache/maven/ReactorReader.java @@ -48,7 +48,7 @@ import org.apache.maven.eventspy.EventSpy; import org.apache.maven.execution.ExecutionEvent; import org.apache.maven.execution.MavenSession; -import org.apache.maven.internal.impl.resolver.MavenWorkspaceReader; +import org.apache.maven.impl.resolver.MavenWorkspaceReader; import org.apache.maven.project.MavenProject; import org.apache.maven.project.artifact.ProjectArtifact; import org.eclipse.aether.artifact.Artifact; diff --git a/impl/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java b/impl/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java index 4a9e359d4a34..a093e4d90933 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java +++ b/impl/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java @@ -34,7 +34,7 @@ import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; -import org.apache.maven.internal.impl.resolver.artifact.MavenArtifactProperties; +import org.apache.maven.impl.resolver.artifact.MavenArtifactProperties; import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession; diff --git a/impl/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java b/impl/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java index 8fa6e4098a30..400e1653cc31 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java +++ b/impl/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java @@ -33,7 +33,7 @@ import org.apache.maven.api.Session; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.RepositoryCache; -import org.apache.maven.internal.impl.SettingsUtilsV4; +import org.apache.maven.impl.SettingsUtilsV4; import org.apache.maven.model.Profile; import org.apache.maven.monitor.event.EventDispatcher; import org.apache.maven.plugin.descriptor.PluginDescriptor; diff --git a/impl/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java b/impl/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java index a36f48536cbd..7cbe9b7c0a8d 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java +++ b/impl/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java @@ -33,7 +33,7 @@ /** * MojoExecutionScope */ -public class MojoExecutionScope extends org.apache.maven.internal.impl.di.MojoExecutionScope +public class MojoExecutionScope extends org.apache.maven.impl.di.MojoExecutionScope implements Scope, MojoExecutionListener { public void seed(Class clazz, Provider value) { diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java index 371c345f3dac..70702ee23067 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java @@ -38,7 +38,7 @@ import org.apache.maven.api.xml.XmlNode; import org.apache.maven.eventspy.internal.EventSpyDispatcher; import org.apache.maven.execution.MavenExecutionRequest; -import org.apache.maven.internal.impl.resolver.MavenSessionBuilderSupplier; +import org.apache.maven.impl.resolver.MavenSessionBuilderSupplier; import org.apache.maven.internal.xml.XmlNodeImpl; import org.apache.maven.internal.xml.XmlPlexusConfiguration; import org.apache.maven.model.ModelBase; diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/aether/TypeRegistryAdapter.java b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/TypeRegistryAdapter.java index 405d7d97f690..96e65dfcea84 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/aether/TypeRegistryAdapter.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/TypeRegistryAdapter.java @@ -21,7 +21,7 @@ import org.apache.maven.api.PathType; import org.apache.maven.api.Type; import org.apache.maven.api.services.TypeRegistry; -import org.apache.maven.internal.impl.resolver.type.DefaultType; +import org.apache.maven.impl.resolver.type.DefaultType; import org.eclipse.aether.artifact.ArtifactType; import org.eclipse.aether.artifact.ArtifactTypeRegistry; diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java index 707334346476..2257c97239fa 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java @@ -33,10 +33,11 @@ import org.apache.maven.api.annotations.Nonnull; import org.apache.maven.api.di.SessionScoped; import org.apache.maven.api.services.ArtifactManager; +import org.apache.maven.impl.DefaultArtifact; import org.apache.maven.project.MavenProject; import org.eclipse.sisu.Typed; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.nonNull; @Named @Typed diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultMojoExecution.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultMojoExecution.java index 4e49e4869389..b331601092b1 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultMojoExecution.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultMojoExecution.java @@ -37,6 +37,7 @@ import org.apache.maven.api.plugin.descriptor.PluginDescriptor; import org.apache.maven.api.plugin.descriptor.lifecycle.Lifecycle; import org.apache.maven.api.xml.XmlNode; +import org.apache.maven.impl.DefaultNode; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.eclipse.aether.graph.DependencyNode; diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPackagingRegistry.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPackagingRegistry.java index 534c9fb02f09..d865d12b4a96 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPackagingRegistry.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPackagingRegistry.java @@ -42,6 +42,7 @@ import org.apache.maven.api.services.PackagingRegistry; import org.apache.maven.api.services.TypeRegistry; import org.apache.maven.api.spi.PackagingProvider; +import org.apache.maven.impl.ExtensibleEnumRegistries; import org.apache.maven.lifecycle.mapping.LifecycleMapping; import org.apache.maven.lifecycle.mapping.LifecycleMojo; import org.apache.maven.lifecycle.mapping.LifecyclePhase; diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPluginXmlFactory.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPluginXmlFactory.java index ad45224e4cd9..78b8a01a2ea3 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPluginXmlFactory.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPluginXmlFactory.java @@ -39,9 +39,9 @@ import org.apache.maven.plugin.descriptor.io.PluginDescriptorStaxReader; import org.apache.maven.plugin.descriptor.io.PluginDescriptorStaxWriter; -import static org.apache.maven.internal.impl.StaxLocation.getLocation; -import static org.apache.maven.internal.impl.StaxLocation.getMessage; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.StaxLocation.getLocation; +import static org.apache.maven.impl.StaxLocation.getMessage; +import static org.apache.maven.impl.Utils.nonNull; @Named @Singleton diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java index 359f84094a12..285935f3fc01 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java @@ -38,11 +38,13 @@ import org.apache.maven.api.annotations.Nullable; import org.apache.maven.api.model.DependencyManagement; import org.apache.maven.api.model.Model; +import org.apache.maven.impl.MappedCollection; +import org.apache.maven.impl.MappedList; import org.apache.maven.project.MavenProject; import org.apache.maven.project.artifact.ProjectArtifact; import org.eclipse.aether.util.artifact.ArtifactIdUtils; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.nonNull; public class DefaultProject implements Project { diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java index efc6d3e7855a..f77536fc289f 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java @@ -41,6 +41,8 @@ import org.apache.maven.api.services.ProjectBuilderResult; import org.apache.maven.api.services.Source; import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.impl.DefaultDependencyResolverResult; +import org.apache.maven.impl.MappedCollection; import org.apache.maven.model.building.ModelProblem; import org.apache.maven.model.building.ModelSource2; import org.apache.maven.project.DefaultProjectBuildingRequest; diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java index 526bae16dd70..59b141d57007 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java @@ -43,12 +43,14 @@ import org.apache.maven.api.model.Resource; import org.apache.maven.api.services.ArtifactManager; import org.apache.maven.api.services.ProjectManager; +import org.apache.maven.impl.MappedList; +import org.apache.maven.impl.PropertiesAsMap; import org.apache.maven.project.MavenProject; import org.eclipse.sisu.Typed; import static java.util.stream.Collectors.toList; -import static org.apache.maven.internal.impl.Utils.map; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.map; +import static org.apache.maven.impl.Utils.nonNull; @Named @Typed diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java index a3f48734fef8..f87c95310eb3 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java @@ -40,6 +40,9 @@ import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.bridge.MavenRepositorySystem; import org.apache.maven.execution.MavenSession; +import org.apache.maven.impl.AbstractSession; +import org.apache.maven.impl.DefaultRemoteRepository; +import org.apache.maven.impl.PropertiesAsMap; import org.apache.maven.plugin.MojoExecution; import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptor; @@ -48,8 +51,8 @@ import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession; -import static org.apache.maven.internal.impl.Utils.map; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.map; +import static org.apache.maven.impl.Utils.nonNull; public class DefaultSession extends AbstractSession implements InternalMavenSession { diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSessionFactory.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSessionFactory.java index 9e6cc6c1875f..68f3c758cbb5 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSessionFactory.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSessionFactory.java @@ -25,6 +25,7 @@ import org.apache.maven.api.services.Lookup; import org.apache.maven.bridge.MavenRepositorySystem; import org.apache.maven.execution.MavenSession; +import org.apache.maven.impl.InternalSession; import org.apache.maven.rtinfo.RuntimeInformation; import org.eclipse.aether.RepositorySystem; diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainManager.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainManager.java index ca509bc1e15d..3370ba517512 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainManager.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainManager.java @@ -32,6 +32,7 @@ import org.apache.maven.api.services.ToolchainManager; import org.apache.maven.api.services.ToolchainManagerException; import org.apache.maven.execution.MavenSession; +import org.apache.maven.impl.MappedList; import org.apache.maven.toolchain.DefaultToolchainManagerPrivate; import org.apache.maven.toolchain.MisconfiguredToolchainException; import org.apache.maven.toolchain.ToolchainPrivate; diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java index 6bc183aa5203..bafa45c08ae0 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java @@ -38,10 +38,10 @@ import org.apache.maven.artifact.handler.manager.LegacyArtifactHandlerManager; import org.apache.maven.eventspy.AbstractEventSpy; import org.apache.maven.execution.ExecutionEvent; -import org.apache.maven.internal.impl.resolver.type.DefaultType; +import org.apache.maven.impl.resolver.type.DefaultType; import static java.util.function.Function.identity; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.nonNull; @Named @Singleton diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/InternalMavenSession.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/InternalMavenSession.java index e165dfd8e6c5..af0d32d2f916 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/InternalMavenSession.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/InternalMavenSession.java @@ -25,8 +25,9 @@ import org.apache.maven.api.Session; import org.apache.maven.api.annotations.Nullable; import org.apache.maven.execution.MavenSession; +import org.apache.maven.impl.InternalSession; -import static org.apache.maven.internal.impl.Utils.cast; +import static org.apache.maven.impl.Utils.cast; public interface InternalMavenSession extends InternalSession { diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java index 65e771e06f65..ceec7f761b9e 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java @@ -40,7 +40,7 @@ import org.apache.maven.api.services.ModelBuilderResult; import org.apache.maven.api.services.ModelSource; import org.apache.maven.api.services.model.LifecycleBindingsInjector; -import org.apache.maven.internal.impl.InternalSession; +import org.apache.maven.impl.InternalSession; import org.apache.maven.model.v4.MavenModelVersion; import org.apache.maven.project.MavenProject; import org.eclipse.aether.RepositorySystemSession; diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java index 783ab1567e90..dabedd6c32e3 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java @@ -20,7 +20,7 @@ import org.apache.maven.api.services.MessageBuilder; import org.apache.maven.api.services.MessageBuilderFactory; -import org.apache.maven.internal.impl.DefaultMessageBuilderFactory; +import org.apache.maven.impl.DefaultMessageBuilderFactory; import org.apache.maven.plugin.MojoExecution; import org.apache.maven.project.MavenProject; diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultMojoExecutionConfigurator.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultMojoExecutionConfigurator.java index 9bdd7504416b..bd4e0c1707d9 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultMojoExecutionConfigurator.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultMojoExecutionConfigurator.java @@ -30,7 +30,7 @@ import org.apache.maven.api.services.MessageBuilder; import org.apache.maven.api.services.MessageBuilderFactory; import org.apache.maven.api.xml.XmlNode; -import org.apache.maven.internal.impl.DefaultMessageBuilderFactory; +import org.apache.maven.impl.DefaultMessageBuilderFactory; import org.apache.maven.internal.xml.XmlNodeImpl; import org.apache.maven.lifecycle.MojoExecutionConfigurator; import org.apache.maven.model.Plugin; diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanExecutor.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanExecutor.java index 45dabc299b2b..edea3b3c4c0b 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanExecutor.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanExecutor.java @@ -54,9 +54,9 @@ import org.apache.maven.execution.ProjectDependencyGraph; import org.apache.maven.execution.ProjectExecutionEvent; import org.apache.maven.execution.ProjectExecutionListener; +import org.apache.maven.impl.util.PhasingExecutor; import org.apache.maven.internal.MultilineMessageHelper; import org.apache.maven.internal.impl.DefaultLifecycleRegistry; -import org.apache.maven.internal.impl.util.PhasingExecutor; import org.apache.maven.internal.transformation.ConsumerPomArtifactTransformer; import org.apache.maven.internal.xml.XmlNodeImpl; import org.apache.maven.lifecycle.LifecycleExecutionException; diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java index c522428a98d5..0c089a67ee92 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java @@ -23,7 +23,7 @@ import java.util.Properties; import org.apache.maven.execution.MavenSession; -import org.apache.maven.internal.impl.model.reflection.ReflectionValueExtractor; +import org.apache.maven.impl.model.reflection.ReflectionValueExtractor; import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.project.MavenProject; diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java index f4244b4960d4..3264fce446ae 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java @@ -27,7 +27,7 @@ import org.apache.maven.api.MojoExecution; import org.apache.maven.api.Project; import org.apache.maven.api.Session; -import org.apache.maven.internal.impl.model.reflection.ReflectionValueExtractor; +import org.apache.maven.impl.model.reflection.ReflectionValueExtractor; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; import org.codehaus.plexus.component.configurator.expression.TypeAwareExpressionEvaluator; diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java index c7c5a28be35b..e40586fba549 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java @@ -30,6 +30,7 @@ import org.apache.maven.RepositoryUtils; import org.apache.maven.api.DependencyScope; +import org.apache.maven.impl.resolver.RelocatedArtifact; import org.apache.maven.model.Dependency; import org.apache.maven.model.Plugin; import org.apache.maven.plugin.PluginResolutionException; @@ -117,9 +118,7 @@ public Artifact resolve(Plugin plugin, List repositories, Repo if (logger.isWarnEnabled() && !result.getRelocations().isEmpty()) { String message = - pluginArtifact instanceof org.apache.maven.internal.impl.resolver.RelocatedArtifact relocated - ? ": " + relocated.getMessage() - : ""; + pluginArtifact instanceof RelocatedArtifact relocated ? ": " + relocated.getMessage() : ""; logger.warn( "The artifact {} has been relocated to {}{}", result.getRelocations().get(0), diff --git a/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java index e2d43f0dbce6..a5fc26c60c63 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java +++ b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java @@ -73,8 +73,8 @@ import org.apache.maven.artifact.InvalidRepositoryException; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.bridge.MavenRepositorySystem; -import org.apache.maven.internal.impl.InternalSession; -import org.apache.maven.internal.impl.resolver.ArtifactDescriptorUtils; +import org.apache.maven.impl.InternalSession; +import org.apache.maven.impl.resolver.ArtifactDescriptorUtils; import org.apache.maven.model.building.DefaultModelProblem; import org.apache.maven.model.building.FileModelSource; import org.apache.maven.model.building.ModelBuildingRequest; diff --git a/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java index f814a3213615..ab8407e6257d 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java +++ b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java @@ -30,6 +30,7 @@ import org.apache.maven.RepositoryUtils; import org.apache.maven.api.DependencyScope; import org.apache.maven.artifact.Artifact; +import org.apache.maven.impl.resolver.RelocatedArtifact; import org.apache.maven.model.Dependency; import org.apache.maven.model.DependencyManagement; import org.apache.maven.model.Exclusion; @@ -170,10 +171,7 @@ public DependencyResolutionResult resolve(DependencyResolutionRequest request) if (!child.getRelocations().isEmpty()) { org.eclipse.aether.artifact.Artifact artifact = child.getDependency().getArtifact(); - String message = - artifact instanceof org.apache.maven.internal.impl.resolver.RelocatedArtifact relocated - ? relocated.getMessage() - : null; + String message = artifact instanceof RelocatedArtifact relocated ? relocated.getMessage() : null; logger.warn("The artifact " + child.getRelocations().get(0) + " has been relocated to " + artifact + (message != null ? ": " + message : "")); } diff --git a/impl/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java b/impl/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java index 7de2e9c7c173..f8605c4cda77 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java +++ b/impl/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Set; -import org.apache.maven.internal.impl.resolver.ArtifactDescriptorUtils; +import org.apache.maven.impl.resolver.ArtifactDescriptorUtils; import org.apache.maven.model.Dependency; import org.apache.maven.model.Parent; import org.apache.maven.model.Repository; diff --git a/impl/maven-core/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java b/impl/maven-core/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java index f6263fc3cb00..06ac4b0a0cf1 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java +++ b/impl/maven-core/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; import org.apache.maven.api.model.Model; -import org.apache.maven.internal.impl.resolver.MavenWorkspaceReader; +import org.apache.maven.impl.resolver.MavenWorkspaceReader; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.repository.WorkspaceReader; import org.eclipse.aether.repository.WorkspaceRepository; diff --git a/impl/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java b/impl/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java index 9938a9c46cac..31cfc0f7af73 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java +++ b/impl/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java @@ -28,7 +28,7 @@ /** * SessionScope */ -public class SessionScope extends org.apache.maven.internal.impl.di.SessionScope implements Scope { +public class SessionScope extends org.apache.maven.impl.di.SessionScope implements Scope { public void seed(Class clazz, Provider value) { getScopeState().seed(clazz, value::get); diff --git a/impl/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java b/impl/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java index c6e2ea8b98f5..e2ef69ff7294 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java +++ b/impl/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java @@ -18,7 +18,7 @@ */ package org.apache.maven.settings; -import org.apache.maven.internal.impl.SettingsUtilsV4; +import org.apache.maven.impl.SettingsUtilsV4; /** * Several convenience methods to handle settings diff --git a/impl/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java b/impl/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java index 8484b60200be..e5808efe9f65 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java +++ b/impl/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java @@ -35,11 +35,11 @@ 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.impl.resolver.MavenSessionBuilderSupplier; 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.internal.impl.resolver.MavenSessionBuilderSupplier; import org.apache.maven.model.Build; import org.apache.maven.model.Dependency; import org.apache.maven.model.Exclusion; diff --git a/impl/maven-core/src/test/java/org/apache/maven/DefaultMavenTest.java b/impl/maven-core/src/test/java/org/apache/maven/DefaultMavenTest.java index bde71c31c0e3..c0157dea63c5 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/DefaultMavenTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/DefaultMavenTest.java @@ -31,7 +31,7 @@ import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenExecutionResult; import org.apache.maven.execution.MavenSession; -import org.apache.maven.internal.impl.resolver.MavenWorkspaceReader; +import org.apache.maven.impl.resolver.MavenWorkspaceReader; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectHelper; import org.junit.jupiter.api.Test; diff --git a/impl/maven-core/src/test/java/org/apache/maven/MavenTestHelper.java b/impl/maven-core/src/test/java/org/apache/maven/MavenTestHelper.java index 358ab86ebe6d..3bf131c975b2 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/MavenTestHelper.java +++ b/impl/maven-core/src/test/java/org/apache/maven/MavenTestHelper.java @@ -22,9 +22,9 @@ 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.InternalSession; import org.codehaus.plexus.PlexusContainer; import org.eclipse.aether.DefaultRepositorySystemSession; diff --git a/impl/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java b/impl/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java index 1b09f72af8cd..a612235510d3 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java @@ -35,7 +35,7 @@ import org.apache.maven.execution.MavenSession; import org.apache.maven.execution.ProjectActivation; import org.apache.maven.execution.ProjectDependencyGraph; -import org.apache.maven.internal.impl.model.DefaultModelProcessor; +import org.apache.maven.impl.model.DefaultModelProcessor; import org.apache.maven.model.Dependency; import org.apache.maven.model.Parent; import org.apache.maven.model.building.Result; diff --git a/impl/maven-core/src/test/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmServiceTest.java b/impl/maven-core/src/test/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmServiceTest.java index a4530c6226a0..2f69e51c8753 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmServiceTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmServiceTest.java @@ -28,6 +28,7 @@ import java.util.Map; import org.apache.maven.api.services.ChecksumAlgorithmService; +import org.apache.maven.impl.DefaultChecksumAlgorithmService; import org.eclipse.aether.internal.impl.checksum.DefaultChecksumAlgorithmFactorySelector; import org.eclipse.aether.internal.impl.checksum.Md5ChecksumAlgorithmFactory; import org.eclipse.aether.internal.impl.checksum.Sha1ChecksumAlgorithmFactory; diff --git a/impl/maven-core/src/test/java/org/apache/maven/internal/impl/DefaultProjectManagerTest.java b/impl/maven-core/src/test/java/org/apache/maven/internal/impl/DefaultProjectManagerTest.java index 63cd868adb4d..560fd9941b6b 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/internal/impl/DefaultProjectManagerTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/internal/impl/DefaultProjectManagerTest.java @@ -24,6 +24,8 @@ import org.apache.maven.api.ProducedArtifact; import org.apache.maven.api.Project; import org.apache.maven.api.services.ArtifactManager; +import org.apache.maven.impl.DefaultModelVersionParser; +import org.apache.maven.impl.DefaultVersionParser; import org.apache.maven.project.MavenProject; import org.eclipse.aether.util.version.GenericVersionScheme; import org.junit.jupiter.api.Test; diff --git a/impl/maven-core/src/test/java/org/apache/maven/internal/impl/PropertiesAsMapTest.java b/impl/maven-core/src/test/java/org/apache/maven/internal/impl/PropertiesAsMapTest.java index 1d7036f70a6a..b0afd8632c22 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/internal/impl/PropertiesAsMapTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/internal/impl/PropertiesAsMapTest.java @@ -24,6 +24,7 @@ import java.util.Properties; import java.util.Set; +import org.apache.maven.impl.PropertiesAsMap; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/impl/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java b/impl/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java index a176e3e52046..d497d3d289b3 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java +++ b/impl/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java @@ -53,7 +53,9 @@ import org.apache.maven.execution.DefaultMavenExecutionResult; import org.apache.maven.execution.MavenSession; import org.apache.maven.execution.scope.internal.MojoExecutionScope; -import org.apache.maven.internal.impl.resolver.MavenSessionBuilderSupplier; +import org.apache.maven.impl.DefaultLocalRepository; +import org.apache.maven.impl.InternalSession; +import org.apache.maven.impl.resolver.MavenSessionBuilderSupplier; import org.apache.maven.rtinfo.RuntimeInformation; import org.apache.maven.session.scope.internal.SessionScope; import org.apache.maven.toolchain.DefaultToolchainManagerPrivate; diff --git a/impl/maven-core/src/test/java/org/apache/maven/internal/transformation/AbstractRepositoryTestCase.java b/impl/maven-core/src/test/java/org/apache/maven/internal/transformation/AbstractRepositoryTestCase.java index 45a456a93761..ad4aec5741d8 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/internal/transformation/AbstractRepositoryTestCase.java +++ b/impl/maven-core/src/test/java/org/apache/maven/internal/transformation/AbstractRepositoryTestCase.java @@ -27,10 +27,10 @@ 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.impl.model.DefaultInterpolator; import org.apache.maven.internal.impl.DefaultSession; -import org.apache.maven.internal.impl.InternalSession; -import org.apache.maven.internal.impl.model.DefaultInterpolator; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.testing.PlexusTest; import org.eclipse.aether.DefaultRepositorySystemSession; diff --git a/impl/maven-core/src/test/java/org/apache/maven/internal/transformation/impl/ConsumerPomBuilderTest.java b/impl/maven-core/src/test/java/org/apache/maven/internal/transformation/impl/ConsumerPomBuilderTest.java index 4b2525821076..ef8ee384ee8e 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/internal/transformation/impl/ConsumerPomBuilderTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/internal/transformation/impl/ConsumerPomBuilderTest.java @@ -36,8 +36,8 @@ import org.apache.maven.api.services.model.ModelResolverException; import org.apache.maven.di.Injector; import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.impl.InternalSession; import org.apache.maven.internal.impl.InternalMavenSession; -import org.apache.maven.internal.impl.InternalSession; import org.apache.maven.internal.transformation.AbstractRepositoryTestCase; import org.apache.maven.project.MavenProject; import org.junit.jupiter.api.BeforeEach; diff --git a/impl/maven-core/src/test/java/org/apache/maven/model/ModelBuilderTest.java b/impl/maven-core/src/test/java/org/apache/maven/model/ModelBuilderTest.java index 8fecf35980c4..f164d794481c 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/model/ModelBuilderTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/model/ModelBuilderTest.java @@ -31,9 +31,9 @@ import org.apache.maven.execution.DefaultMavenExecutionResult; import org.apache.maven.execution.MavenExecutionRequest; 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.project.DefaultProjectBuildingRequest; import org.apache.maven.project.ProjectBuilder; import org.apache.maven.project.ProjectBuildingResult; diff --git a/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java b/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java index a0121c6ff999..5e2e65bfb034 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java @@ -41,7 +41,7 @@ import org.apache.maven.execution.DefaultMavenExecutionResult; import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenSession; -import org.apache.maven.internal.impl.model.reflection.IntrospectionException; +import org.apache.maven.impl.model.reflection.IntrospectionException; import org.apache.maven.model.Build; import org.apache.maven.model.Dependency; import org.apache.maven.model.Model; diff --git a/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java b/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java index 35601b9c2bc5..d49165b0d1ff 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java +++ b/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java @@ -43,12 +43,12 @@ import org.apache.maven.execution.DefaultMavenExecutionResult; import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenSession; +import org.apache.maven.impl.model.reflection.IntrospectionException; import org.apache.maven.internal.impl.DefaultLookup; import org.apache.maven.internal.impl.DefaultMojoExecution; import org.apache.maven.internal.impl.DefaultProject; import org.apache.maven.internal.impl.DefaultSession; import org.apache.maven.internal.impl.InternalMavenSession; -import org.apache.maven.internal.impl.model.reflection.IntrospectionException; import org.apache.maven.model.Build; import org.apache.maven.model.Model; import org.apache.maven.model.building.DefaultModelBuildingRequest; diff --git a/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java index 1a963559db60..0f06cf8019fd 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java @@ -29,8 +29,8 @@ import org.apache.maven.api.services.model.ModelCache; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.impl.InternalSession; import org.apache.maven.internal.impl.InternalMavenSession; -import org.apache.maven.internal.impl.InternalSession; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/impl/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleBindingsInjector.java b/impl/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleBindingsInjector.java index 3a7bc1a2bf1e..b8f6f197a448 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleBindingsInjector.java +++ b/impl/maven-core/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; diff --git a/impl/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/impl/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java index 5cc27d231346..e62e35ff8efd 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java @@ -32,8 +32,8 @@ import org.apache.maven.MavenTestHelper; import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; import org.apache.maven.bridge.MavenRepositorySystem; +import org.apache.maven.impl.InternalSession; import org.apache.maven.internal.impl.InternalMavenSession; -import org.apache.maven.internal.impl.InternalSession; import org.apache.maven.model.Model; import org.apache.maven.model.Plugin; import org.apache.maven.model.PluginExecution; diff --git a/impl/maven-core/src/test/java/org/apache/maven/session/scope/SessionScopeProxyTest.java b/impl/maven-core/src/test/java/org/apache/maven/session/scope/SessionScopeProxyTest.java index 8db44f55d977..b7752a6a759b 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/session/scope/SessionScopeProxyTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/session/scope/SessionScopeProxyTest.java @@ -24,7 +24,7 @@ import org.apache.maven.SessionScoped; import org.apache.maven.api.Session; -import org.apache.maven.internal.impl.di.OutOfScopeException; +import org.apache.maven.impl.di.OutOfScopeException; import org.apache.maven.session.scope.internal.SessionScope; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; diff --git a/impl/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java b/impl/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java index 8c65f68ce568..791b0df1978b 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java @@ -32,7 +32,7 @@ import org.apache.maven.api.settings.Profile; import org.apache.maven.api.settings.Repository; import org.apache.maven.api.settings.Settings; -import org.apache.maven.internal.impl.SettingsUtilsV4; +import org.apache.maven.impl.SettingsUtilsV4; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/AbstractNode.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractNode.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/AbstractNode.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractNode.java index f3e8987f1756..7c92aa0e5ff1 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/AbstractNode.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractNode.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.Collections; import java.util.List; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/AbstractSession.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractSession.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/AbstractSession.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractSession.java index 75d32bc04be8..ade3a7dde843 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/AbstractSession.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/AbstractSession.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.io.File; import java.nio.file.Path; @@ -95,8 +95,8 @@ import org.eclipse.aether.artifact.ArtifactType; import org.eclipse.aether.transfer.TransferResource; -import static org.apache.maven.internal.impl.Utils.map; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.map; +import static org.apache.maven.impl.Utils.nonNull; public abstract class AbstractSession implements InternalSession { diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/AetherDependencyWrapper.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/AetherDependencyWrapper.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/AetherDependencyWrapper.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/AetherDependencyWrapper.java index 39bf82517431..a9721290c267 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/AetherDependencyWrapper.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/AetherDependencyWrapper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.Objects; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifact.java similarity index 96% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifact.java index 238339e29c05..18d25e43a23b 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifact.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.Objects; @@ -25,7 +25,7 @@ import org.apache.maven.api.Version; import org.apache.maven.api.annotations.Nonnull; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.nonNull; /** * A wrapper class around a maven resolver artifact. diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinates.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinates.java similarity index 96% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinates.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinates.java index 3ffd62c28946..8e1fa9ec33cf 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinates.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinates.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.Objects; @@ -24,7 +24,7 @@ import org.apache.maven.api.VersionConstraint; import org.apache.maven.api.annotations.Nonnull; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.nonNull; /** * A wrapper class around a maven resolver artifact. diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinatesFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinatesFactory.java similarity index 96% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinatesFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinatesFactory.java index 03f7aba22780..a587db4d9ae3 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinatesFactory.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactCoordinatesFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import org.apache.maven.api.ArtifactCoordinates; import org.apache.maven.api.annotations.Nonnull; @@ -26,7 +26,7 @@ import org.apache.maven.api.services.ArtifactCoordinatesFactoryRequest; import org.eclipse.aether.artifact.ArtifactType; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.nonNull; @Named @Singleton diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactDeployer.java similarity index 95% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactDeployer.java index c0d29fffe127..b255762b2175 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactDeployer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.Collection; @@ -31,7 +31,7 @@ import org.eclipse.aether.deployment.DeployRequest; import org.eclipse.aether.deployment.DeploymentException; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.nonNull; /** * Implementation of {@link ArtifactDeployer} service. diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactFactory.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactFactory.java index d9d42c7371a4..6cc0f62aa387 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactFactory.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import org.apache.maven.api.Artifact; import org.apache.maven.api.ProducedArtifact; @@ -27,7 +27,7 @@ import org.apache.maven.api.services.ArtifactFactoryRequest; import org.eclipse.aether.artifact.ArtifactType; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.nonNull; @Named @Singleton diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactInstaller.java similarity index 95% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactInstaller.java index edb87b9aba7d..81b9869265c9 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactInstaller.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import org.apache.maven.api.annotations.Nonnull; import org.apache.maven.api.di.Inject; @@ -29,7 +29,7 @@ import org.eclipse.aether.installation.InstallRequest; import org.eclipse.aether.installation.InstallationException; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.nonNull; @Named @Singleton diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactResolver.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactResolver.java index 49f699166614..a64be28b868a 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultArtifactResolver.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.nio.file.Path; import java.util.ArrayList; @@ -40,7 +40,7 @@ import org.eclipse.aether.resolution.ArtifactResolutionException; import org.eclipse.aether.resolution.ArtifactResult; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.nonNull; @Named @Singleton diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultBuilderProblem.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultBuilderProblem.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultBuilderProblem.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultBuilderProblem.java index b69a23110f66..bf223cc0daa1 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultBuilderProblem.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultBuilderProblem.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import org.apache.maven.api.services.BuilderProblem; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmService.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultChecksumAlgorithmService.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmService.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultChecksumAlgorithmService.java index d910b77fcad7..5dbe218cc684 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmService.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultChecksumAlgorithmService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; @@ -41,7 +41,7 @@ import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactory; import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactorySelector; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.nonNull; @Named @Singleton diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependency.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependency.java index a9c8d1429710..8bf6333e25f2 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependency.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.Objects; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinates.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyCoordinates.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinates.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyCoordinates.java index 4310f646e925..9128e122c986 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinates.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyCoordinates.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.Collection; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinatesFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyCoordinatesFactory.java similarity index 95% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinatesFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyCoordinatesFactory.java index 00a40021466c..97a6eb19f5c5 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinatesFactory.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyCoordinatesFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import org.apache.maven.api.DependencyCoordinates; import org.apache.maven.api.Exclusion; @@ -27,8 +27,8 @@ import org.apache.maven.api.services.DependencyCoordinatesFactoryRequest; import org.eclipse.aether.artifact.ArtifactType; -import static org.apache.maven.internal.impl.Utils.map; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.map; +import static org.apache.maven.impl.Utils.nonNull; @Named @Singleton diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolver.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolver.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolver.java index adfed73704e4..4b4fc43e512e 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolver.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolver.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.io.IOException; import java.nio.file.Path; @@ -61,9 +61,9 @@ import org.eclipse.aether.util.graph.manager.DependencyManagerUtils; import org.eclipse.aether.util.graph.transformer.ConflictResolver; -import static org.apache.maven.internal.impl.Utils.cast; -import static org.apache.maven.internal.impl.Utils.map; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.cast; +import static org.apache.maven.impl.Utils.map; +import static org.apache.maven.impl.Utils.nonNull; @Named @Singleton diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolverResult.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolverResult.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolverResult.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolverResult.java index 4e20eb4bb9c8..9464ed7f11d5 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolverResult.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolverResult.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.io.IOException; import java.lang.module.ModuleDescriptor; @@ -51,7 +51,7 @@ * * @see DefaultDependencyResolver#resolve(DependencyResolverRequest) */ -class DefaultDependencyResolverResult implements DependencyResolverResult { +public class DefaultDependencyResolverResult implements DependencyResolverResult { /** * The exceptions that occurred while building the dependency graph. */ @@ -102,7 +102,8 @@ class DefaultDependencyResolverResult implements DependencyResolverResult { * @param root the root node of the dependency graph * @param count estimated number of dependencies */ - DefaultDependencyResolverResult(PathModularizationCache cache, List exceptions, Node root, int count) { + public DefaultDependencyResolverResult( + PathModularizationCache cache, List exceptions, Node root, int count) { this.cache = cache; this.exceptions = exceptions; this.root = root; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDownloadedArtifact.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDownloadedArtifact.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDownloadedArtifact.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDownloadedArtifact.java index 613f8a666d8b..e5dc30e80918 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDownloadedArtifact.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDownloadedArtifact.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.nio.file.Path; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultLocalRepository.java similarity index 94% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultLocalRepository.java index 3ca2d59f790f..1f73a8eb0553 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultLocalRepository.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.nio.file.Path; import org.apache.maven.api.LocalRepository; import org.apache.maven.api.annotations.Nonnull; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.nonNull; public class DefaultLocalRepository implements LocalRepository { diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepositoryManager.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultLocalRepositoryManager.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepositoryManager.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultLocalRepositoryManager.java index 32c98135cf76..4cf41ed3d8ac 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepositoryManager.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultLocalRepositoryManager.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.nio.file.Path; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilder.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultMessageBuilder.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilder.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultMessageBuilder.java index 692b1e37e549..09ed9e71a838 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilder.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultMessageBuilder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import org.apache.maven.api.annotations.Experimental; import org.apache.maven.api.annotations.Nonnull; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilderFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultMessageBuilderFactory.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilderFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultMessageBuilderFactory.java index b8fceef119e5..e023dcf64ce2 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilderFactory.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultMessageBuilderFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import org.apache.maven.api.annotations.Experimental; import org.apache.maven.api.annotations.Nonnull; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelUrlNormalizer.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelUrlNormalizer.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelUrlNormalizer.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelUrlNormalizer.java index f593ed430132..36bdb746b59a 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelUrlNormalizer.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelUrlNormalizer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import org.apache.maven.api.di.Inject; import org.apache.maven.api.di.Named; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelVersionParser.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelVersionParser.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelVersionParser.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelVersionParser.java index 8627245ca89e..586d1b26bbae 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelVersionParser.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelVersionParser.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.regex.Pattern; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelXmlFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelXmlFactory.java similarity index 95% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelXmlFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelXmlFactory.java index 40609bb4a2f3..8505beccf384 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelXmlFactory.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultModelXmlFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.io.InputStream; import java.io.OutputStream; @@ -40,9 +40,9 @@ import org.apache.maven.model.v4.MavenStaxReader; import org.apache.maven.model.v4.MavenStaxWriter; -import static org.apache.maven.internal.impl.StaxLocation.getLocation; -import static org.apache.maven.internal.impl.StaxLocation.getMessage; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.StaxLocation.getLocation; +import static org.apache.maven.impl.StaxLocation.getMessage; +import static org.apache.maven.impl.Utils.nonNull; @Named @Singleton diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultNode.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultNode.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultNode.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultNode.java index a8b953ad9b3b..35cb4191171e 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultNode.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultNode.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.ArrayList; import java.util.List; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultPluginConfigurationExpander.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultPluginConfigurationExpander.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultPluginConfigurationExpander.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultPluginConfigurationExpander.java index 3276bb955867..26b3ccd001f5 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultPluginConfigurationExpander.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultPluginConfigurationExpander.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.ArrayList; import java.util.List; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultProducedArtifact.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultProducedArtifact.java similarity index 96% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultProducedArtifact.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultProducedArtifact.java index 1033ea924ca8..42ab1d1e72ab 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultProducedArtifact.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultProducedArtifact.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import org.apache.maven.api.ProducedArtifact; import org.apache.maven.api.annotations.Nonnull; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultRemoteRepository.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultRemoteRepository.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultRemoteRepository.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultRemoteRepository.java index dc41e41e99cd..7bb02e4d5b53 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultRemoteRepository.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultRemoteRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import org.apache.maven.api.RemoteRepository; import org.apache.maven.api.annotations.Nonnull; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultRepositoryFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultRepositoryFactory.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultRepositoryFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultRepositoryFactory.java index c2f4801fa47e..a035b4ee4f03 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultRepositoryFactory.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultRepositoryFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.nio.file.Path; import java.util.List; @@ -32,7 +32,7 @@ import org.eclipse.aether.impl.RemoteRepositoryManager; import org.eclipse.aether.repository.RepositoryPolicy; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.nonNull; @Named @Singleton diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsBuilder.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsBuilder.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsBuilder.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsBuilder.java index 1936ab647d48..0d63698b3577 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsBuilder.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsBuilder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import javax.xml.stream.Location; import javax.xml.stream.XMLStreamException; @@ -53,7 +53,7 @@ import org.apache.maven.api.settings.RepositoryPolicy; import org.apache.maven.api.settings.Server; import org.apache.maven.api.settings.Settings; -import org.apache.maven.internal.impl.model.DefaultInterpolator; +import org.apache.maven.impl.model.DefaultInterpolator; import org.apache.maven.settings.v4.SettingsMerger; import org.apache.maven.settings.v4.SettingsTransformer; import org.codehaus.plexus.components.secdispatcher.Dispatcher; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsValidator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsValidator.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsValidator.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsValidator.java index 31e68864cf72..21284afa0c31 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsValidator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.HashSet; import java.util.List; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsXmlFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsXmlFactory.java similarity index 95% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsXmlFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsXmlFactory.java index cb58c4ad0760..fd1749cd0e06 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsXmlFactory.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsXmlFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.io.InputStream; import java.io.OutputStream; @@ -36,8 +36,8 @@ import org.apache.maven.settings.v4.SettingsStaxReader; import org.apache.maven.settings.v4.SettingsStaxWriter; -import static org.apache.maven.internal.impl.StaxLocation.getLocation; -import static org.apache.maven.internal.impl.StaxLocation.getMessage; +import static org.apache.maven.impl.StaxLocation.getLocation; +import static org.apache.maven.impl.StaxLocation.getMessage; @Named @Singleton diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultSuperPomProvider.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSuperPomProvider.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultSuperPomProvider.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSuperPomProvider.java index c035af5de7ba..bfc199fe63b5 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultSuperPomProvider.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSuperPomProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.io.IOException; import java.io.InputStream; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsBuilder.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultToolchainsBuilder.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsBuilder.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultToolchainsBuilder.java index 7f6738256827..0a5507763fa9 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsBuilder.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultToolchainsBuilder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import javax.xml.stream.Location; import javax.xml.stream.XMLStreamException; @@ -40,7 +40,7 @@ import org.apache.maven.api.services.xml.XmlReaderException; import org.apache.maven.api.services.xml.XmlReaderRequest; import org.apache.maven.api.toolchain.PersistedToolchains; -import org.apache.maven.internal.impl.model.DefaultInterpolator; +import org.apache.maven.impl.model.DefaultInterpolator; import org.apache.maven.toolchain.v4.MavenToolchainsMerger; import org.apache.maven.toolchain.v4.MavenToolchainsTransformer; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsXmlFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultToolchainsXmlFactory.java similarity index 93% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsXmlFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultToolchainsXmlFactory.java index cb6f44add783..d707ac824b89 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsXmlFactory.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultToolchainsXmlFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.io.InputStream; import java.io.OutputStream; @@ -37,9 +37,9 @@ import org.apache.maven.toolchain.v4.MavenToolchainsStaxReader; import org.apache.maven.toolchain.v4.MavenToolchainsStaxWriter; -import static org.apache.maven.internal.impl.StaxLocation.getLocation; -import static org.apache.maven.internal.impl.StaxLocation.getMessage; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.StaxLocation.getLocation; +import static org.apache.maven.impl.StaxLocation.getMessage; +import static org.apache.maven.impl.Utils.nonNull; @Named @Singleton diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultTransport.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultTransport.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultTransport.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultTransport.java index 5eabf7f64aab..f93e5f8d5d66 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultTransport.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultTransport.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultTransportProvider.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultTransportProvider.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultTransportProvider.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultTransportProvider.java index 1ffab518820d..1530f9d75a0d 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultTransportProvider.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultTransportProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.net.URI; import java.net.URISyntaxException; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultUrlNormalizer.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultUrlNormalizer.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultUrlNormalizer.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultUrlNormalizer.java index c3b7bcb5a5d9..dbbe5b37d636 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultUrlNormalizer.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultUrlNormalizer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import org.apache.maven.api.di.Named; import org.apache.maven.api.di.Singleton; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionParser.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionParser.java similarity index 95% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionParser.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionParser.java index 16d7b670bfab..f6d01ce02af1 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionParser.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionParser.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import org.apache.maven.api.Version; import org.apache.maven.api.VersionConstraint; @@ -27,7 +27,7 @@ import org.apache.maven.api.services.VersionParser; import org.apache.maven.api.services.model.ModelVersionParser; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.nonNull; /** * A wrapper class around a resolver version that works as model version parser as well. diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionRangeResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionRangeResolver.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionRangeResolver.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionRangeResolver.java index f3006e7f3da2..74c2f75b1337 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionRangeResolver.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionRangeResolver.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.List; import java.util.Map; @@ -39,7 +39,7 @@ import org.eclipse.aether.resolution.VersionRangeResult; import static java.util.Objects.requireNonNull; -import static org.apache.maven.internal.impl.Utils.map; +import static org.apache.maven.impl.Utils.map; @Named @Singleton diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionResolver.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionResolver.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionResolver.java index 45b0f089122b..bc824cd256f2 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionResolver.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultVersionResolver.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.List; import java.util.Optional; @@ -35,7 +35,7 @@ import org.eclipse.aether.resolution.VersionResolutionException; import org.eclipse.aether.resolution.VersionResult; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.nonNull; @Named @Singleton diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/ExtensibleEnumRegistries.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/ExtensibleEnumRegistries.java similarity index 95% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/ExtensibleEnumRegistries.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/ExtensibleEnumRegistries.java index f8bc69e538b9..5be25fad7236 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/ExtensibleEnumRegistries.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/ExtensibleEnumRegistries.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.List; import java.util.Locale; @@ -42,7 +42,7 @@ import org.apache.maven.api.spi.PathScopeProvider; import org.apache.maven.api.spi.ProjectScopeProvider; -import static org.apache.maven.internal.impl.Utils.nonNull; +import static org.apache.maven.impl.Utils.nonNull; public class ExtensibleEnumRegistries { @@ -90,7 +90,7 @@ public abstract static class DefaultExtensibleEnumRegistry< protected final Map values; - DefaultExtensibleEnumRegistry(List

providers, T... builtinValues) { + public DefaultExtensibleEnumRegistry(List

providers, T... builtinValues) { values = Stream.concat( Stream.of(builtinValues), providers.stream().flatMap(p -> p.provides().stream())) .collect(Collectors.toUnmodifiableMap(t -> t.id().toLowerCase(Locale.ROOT), t -> t)); diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/InternalSession.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/InternalSession.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/InternalSession.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/InternalSession.java index df69c19f1bb4..ce01aa50f935 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/InternalSession.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/InternalSession.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.Collection; import java.util.List; @@ -33,7 +33,7 @@ import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession; -import static org.apache.maven.internal.impl.Utils.cast; +import static org.apache.maven.impl.Utils.cast; public interface InternalSession extends Session { diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/MappedCollection.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/MappedCollection.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/MappedCollection.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/MappedCollection.java index 3492e9c6a37a..156ff1a853f5 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/MappedCollection.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/MappedCollection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.AbstractCollection; import java.util.Collection; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/MappedList.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/MappedList.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/MappedList.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/MappedList.java index 78e590338e19..629a8b1cda2c 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/MappedList.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/MappedList.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.AbstractList; import java.util.List; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/PathModularization.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/PathModularization.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/PathModularization.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/PathModularization.java index 1b3cf9b0071b..db0c95099578 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/PathModularization.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/PathModularization.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.io.IOException; import java.io.InputStream; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/PathModularizationCache.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/PathModularizationCache.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/PathModularizationCache.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/PathModularizationCache.java index 650d9358df14..e04ce136da24 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/PathModularizationCache.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/PathModularizationCache.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.io.IOException; import java.nio.file.Path; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/PropertiesAsMap.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/PropertiesAsMap.java similarity index 95% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/PropertiesAsMap.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/PropertiesAsMap.java index dbb383556a09..cf71951c0956 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/PropertiesAsMap.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/PropertiesAsMap.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.AbstractMap; import java.util.AbstractSet; @@ -25,11 +25,11 @@ import java.util.NoSuchElementException; import java.util.Set; -class PropertiesAsMap extends AbstractMap { +public class PropertiesAsMap extends AbstractMap { private final Map properties; - PropertiesAsMap(Map properties) { + public PropertiesAsMap(Map properties) { this.properties = properties; } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/SettingsUtilsV4.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/SettingsUtilsV4.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/SettingsUtilsV4.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/SettingsUtilsV4.java index 9c2a33482d72..a4f2ba618f11 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/SettingsUtilsV4.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/SettingsUtilsV4.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/StaxLocation.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/StaxLocation.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/StaxLocation.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/StaxLocation.java index 2e0c19ad0094..5a103e74f765 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/StaxLocation.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/StaxLocation.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import javax.xml.stream.XMLStreamException; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/Utils.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/Utils.java similarity index 84% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/Utils.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/Utils.java index 2fb4ad3d338c..a3fcdf73d3d4 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/Utils.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/Utils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.Collection; import java.util.List; @@ -24,22 +24,22 @@ import java.util.function.Function; import java.util.stream.Collectors; -class Utils { - static T nonNull(T t) { +public class Utils { + public static T nonNull(T t) { if (t == null) { throw new IllegalArgumentException(); } return t; } - static T nonNull(T t, String name) { + public static T nonNull(T t, String name) { if (t == null) { throw new IllegalArgumentException(name + " cannot be null"); } return t; } - static T cast(Class clazz, Object o, String name) { + public static T cast(Class clazz, Object o, String name) { if (!clazz.isInstance(o)) { if (o == null) { throw new IllegalArgumentException(name + " is null"); @@ -49,7 +49,7 @@ static T cast(Class clazz, Object o, String name) { return clazz.cast(o); } - static List map(Collection list, Function mapper) { + public static List map(Collection list, Function mapper) { return list.stream().map(mapper).filter(Objects::nonNull).collect(Collectors.toList()); } } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/WrapperNode.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/WrapperNode.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/WrapperNode.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/WrapperNode.java index 9be682ac4ec9..4059e5cf2311 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/WrapperNode.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/WrapperNode.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.List; import java.util.Optional; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/di/MojoExecutionScope.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/di/MojoExecutionScope.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/di/MojoExecutionScope.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/di/MojoExecutionScope.java index 2128db3ac0ce..e851871682df 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/di/MojoExecutionScope.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/di/MojoExecutionScope.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.di; +package org.apache.maven.impl.di; import java.util.Collection; import java.util.HashMap; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/di/OutOfScopeException.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/di/OutOfScopeException.java similarity index 96% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/di/OutOfScopeException.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/di/OutOfScopeException.java index c437425415d2..e177b8d4e7eb 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/di/OutOfScopeException.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/di/OutOfScopeException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.di; +package org.apache.maven.impl.di; import org.apache.maven.di.impl.DIException; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/di/SessionScope.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/di/SessionScope.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/di/SessionScope.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/di/SessionScope.java index f1ebcc22fc6a..95a9a08af142 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/di/SessionScope.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/di/SessionScope.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.di; +package org.apache.maven.impl.di; import java.lang.annotation.Annotation; import java.lang.reflect.InvocationHandler; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementImporter.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultDependencyManagementImporter.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementImporter.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultDependencyManagementImporter.java index b0c4622e92eb..19ed567329ed 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementImporter.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultDependencyManagementImporter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.util.Collection; import java.util.HashSet; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementInjector.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultDependencyManagementInjector.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementInjector.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultDependencyManagementInjector.java index f85a946fa2f8..d5c7d5d3e1b1 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementInjector.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultDependencyManagementInjector.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.util.ArrayList; import java.util.Collections; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultInheritanceAssembler.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultInheritanceAssembler.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultInheritanceAssembler.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultInheritanceAssembler.java index 5c4040aa4e53..f9c4a9883ab2 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultInheritanceAssembler.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultInheritanceAssembler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.util.ArrayList; import java.util.HashMap; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultInterpolator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultInterpolator.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultInterpolator.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultInterpolator.java index bb96532cafd5..29c4ac324566 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultInterpolator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultInterpolator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.util.HashMap; import java.util.HashSet; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultLifecycleBindingsInjector.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultLifecycleBindingsInjector.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultLifecycleBindingsInjector.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultLifecycleBindingsInjector.java index 73b9e912a7e0..1435892a9aa9 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultLifecycleBindingsInjector.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultLifecycleBindingsInjector.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.util.ArrayList; import java.util.Collections; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java index edd3f8822cb2..e2c9d6164f6f 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.io.File; import java.io.IOException; @@ -110,7 +110,7 @@ import org.apache.maven.api.services.xml.XmlReaderRequest; import org.apache.maven.api.spi.ModelParserException; import org.apache.maven.api.spi.ModelTransformer; -import org.apache.maven.internal.impl.util.PhasingExecutor; +import org.apache.maven.impl.util.PhasingExecutor; import org.apache.maven.model.v4.MavenTransformer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilderResult.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilderResult.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilderResult.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilderResult.java index dd477ad1dd15..89f4b7ae3811 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilderResult.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilderResult.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.util.ArrayList; import java.util.List; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelCache.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelCache.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelCache.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelCache.java index 5318be60f6ee..5bf8df2aed20 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelCache.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelCache.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.util.List; import java.util.concurrent.ConcurrentHashMap; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelCacheFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelCacheFactory.java similarity index 96% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelCacheFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelCacheFactory.java index ed025d2ff40b..ad567d934da3 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelCacheFactory.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelCacheFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import org.apache.maven.api.di.Named; import org.apache.maven.api.di.Singleton; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelInterpolator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelInterpolator.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelInterpolator.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelInterpolator.java index 72fde20b36ee..6194c1289f61 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelInterpolator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelInterpolator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.nio.file.Path; import java.util.Arrays; @@ -44,7 +44,7 @@ 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.internal.impl.model.reflection.ReflectionValueExtractor; +import org.apache.maven.impl.model.reflection.ReflectionValueExtractor; import org.apache.maven.model.v4.MavenTransformer; @Named diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelNormalizer.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelNormalizer.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelNormalizer.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelNormalizer.java index ae482df29d8c..f36918f770aa 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelNormalizer.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelNormalizer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.util.ArrayList; import java.util.Collections; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelPathTranslator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelPathTranslator.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelPathTranslator.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelPathTranslator.java index 1974beb41906..8b78e00b5671 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelPathTranslator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelPathTranslator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.nio.file.Path; import java.util.ArrayList; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProblem.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelProblem.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProblem.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelProblem.java index 0787b0eec118..4be3249844a4 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProblem.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelProblem.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import org.apache.maven.api.model.Model; import org.apache.maven.api.services.ModelProblem; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProcessor.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelProcessor.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProcessor.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelProcessor.java index 784b6931cf84..9cea97207946 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProcessor.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelProcessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.io.IOException; import java.nio.file.Files; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelValidator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelValidator.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelValidator.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelValidator.java index ec0ee2af7c53..a6d6cabeb599 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelValidator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.io.File; import java.util.Arrays; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultPathTranslator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultPathTranslator.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultPathTranslator.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultPathTranslator.java index a10b8c68dff8..47cd073b8e57 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultPathTranslator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultPathTranslator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.io.File; import java.nio.file.Path; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultPluginManagementInjector.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultPluginManagementInjector.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultPluginManagementInjector.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultPluginManagementInjector.java index e1ef82b7bd91..4f10a4ca1f26 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultPluginManagementInjector.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultPluginManagementInjector.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.util.ArrayList; import java.util.Collections; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileActivationContext.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultProfileActivationContext.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileActivationContext.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultProfileActivationContext.java index 6735661484c5..cba06096048e 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileActivationContext.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultProfileActivationContext.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.io.File; import java.io.IOException; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileInjector.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultProfileInjector.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileInjector.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultProfileInjector.java index 28ca4384a254..234df08dcf91 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileInjector.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultProfileInjector.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.util.ArrayList; import java.util.Collections; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileSelector.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultProfileSelector.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileSelector.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultProfileSelector.java index 3415de844e98..407d35a71c23 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileSelector.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultProfileSelector.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.util.ArrayList; import java.util.Collection; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/FileToRawModelMerger.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/FileToRawModelMerger.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/FileToRawModelMerger.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/FileToRawModelMerger.java index 5c0c2f89c8d5..b98d057b30ba 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/FileToRawModelMerger.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/FileToRawModelMerger.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.util.Iterator; import java.util.Map; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/Graph.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/Graph.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/Graph.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/Graph.java index cea1d45e3d14..80291db4b376 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/Graph.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/Graph.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.util.Collection; import java.util.Collections; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/MavenBuildTimestamp.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/MavenBuildTimestamp.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/MavenBuildTimestamp.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/MavenBuildTimestamp.java index 412a8b53a996..d635113c4a78 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/MavenBuildTimestamp.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/MavenBuildTimestamp.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.time.Instant; import java.time.ZoneId; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/MavenModelMerger.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/MavenModelMerger.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/MavenModelMerger.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/MavenModelMerger.java index d340b280e043..5a9d4f3ac8f4 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/MavenModelMerger.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/MavenModelMerger.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/ModelData.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/ModelData.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/ModelData.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/ModelData.java index ef0bf75f3465..02666756f9a8 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/ModelData.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/ModelData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import org.apache.maven.api.model.Model; import org.apache.maven.api.services.ModelSource; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/ModelProblemUtils.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/ModelProblemUtils.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/ModelProblemUtils.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/ModelProblemUtils.java index db5ae845c574..d77037523795 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/ModelProblemUtils.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/ModelProblemUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.nio.file.Path; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/ConditionFunctions.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/ConditionFunctions.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/ConditionFunctions.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/ConditionFunctions.java index c154f4b5ed03..1a9087273962 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/ConditionFunctions.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/ConditionFunctions.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.profile; +package org.apache.maven.impl.model.profile; import java.util.List; @@ -25,7 +25,7 @@ import org.apache.maven.api.services.VersionParser; import org.apache.maven.api.services.model.ProfileActivationContext; -import static org.apache.maven.internal.impl.model.profile.ConditionParser.toInt; +import static org.apache.maven.impl.model.profile.ConditionParser.toInt; /** * Provides a set of functions for evaluating profile activation conditions. diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/ConditionParser.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/ConditionParser.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/ConditionParser.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/ConditionParser.java index 84e1a54419fe..f596946aa253 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/ConditionParser.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/ConditionParser.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.profile; +package org.apache.maven.impl.model.profile; import java.util.ArrayList; import java.util.List; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/ConditionProfileActivator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/ConditionProfileActivator.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/ConditionProfileActivator.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/ConditionProfileActivator.java index eb5787e4f944..5042986d688d 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/ConditionProfileActivator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/ConditionProfileActivator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.profile; +package org.apache.maven.impl.model.profile; import java.util.HashMap; import java.util.Map; @@ -33,9 +33,9 @@ import org.apache.maven.api.services.VersionParser; import org.apache.maven.api.services.model.ProfileActivationContext; import org.apache.maven.api.services.model.ProfileActivator; -import org.apache.maven.internal.impl.model.DefaultInterpolator; +import org.apache.maven.impl.model.DefaultInterpolator; -import static org.apache.maven.internal.impl.model.profile.ConditionParser.toBoolean; +import static org.apache.maven.impl.model.profile.ConditionParser.toBoolean; /** * This class is responsible for activating profiles based on conditions specified in the profile's activation section. diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/FileProfileActivator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/FileProfileActivator.java similarity index 96% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/FileProfileActivator.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/FileProfileActivator.java index 77abd8630720..6baf073bc357 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/FileProfileActivator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/FileProfileActivator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.profile; +package org.apache.maven.impl.model.profile; import org.apache.maven.api.di.Named; import org.apache.maven.api.di.Singleton; @@ -29,6 +29,7 @@ import org.apache.maven.api.services.ModelProblemCollector; import org.apache.maven.api.services.model.ProfileActivationContext; import org.apache.maven.api.services.model.ProfileActivator; +import org.apache.maven.impl.model.DefaultModelValidator; /** * Determines profile activation based on the existence/absence of some file. @@ -36,7 +37,7 @@ * system properties and user properties. * * @see ActivationFile - * @see org.apache.maven.internal.impl.model.DefaultModelValidator#validateRawModel + * @see DefaultModelValidator#validateRawModel */ @Named("file") @Singleton diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/JdkVersionProfileActivator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/JdkVersionProfileActivator.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/JdkVersionProfileActivator.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/JdkVersionProfileActivator.java index b3f95fa750a6..ae22bdd1ed63 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/JdkVersionProfileActivator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/JdkVersionProfileActivator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.profile; +package org.apache.maven.impl.model.profile; import java.util.ArrayList; import java.util.Arrays; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/OperatingSystemProfileActivator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/OperatingSystemProfileActivator.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/OperatingSystemProfileActivator.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/OperatingSystemProfileActivator.java index 3d6af38356a8..3aaa48bbcba8 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/OperatingSystemProfileActivator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/OperatingSystemProfileActivator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.profile; +package org.apache.maven.impl.model.profile; import java.util.Locale; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/Os.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/Os.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/Os.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/Os.java index 8ca920d293ad..e62c22cadfd2 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/Os.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/Os.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.profile; +package org.apache.maven.impl.model.profile; import java.util.Locale; import java.util.stream.Stream; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/PackagingProfileActivator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/PackagingProfileActivator.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/PackagingProfileActivator.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/PackagingProfileActivator.java index f291f9240e9d..2c07fee246eb 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/PackagingProfileActivator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/PackagingProfileActivator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.profile; +package org.apache.maven.impl.model.profile; import java.util.Objects; import java.util.Optional; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/PropertyProfileActivator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/PropertyProfileActivator.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/PropertyProfileActivator.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/PropertyProfileActivator.java index 6ac5e0d3b668..8b2114ad3633 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/PropertyProfileActivator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/profile/PropertyProfileActivator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.profile; +package org.apache.maven.impl.model.profile; import org.apache.maven.api.di.Named; import org.apache.maven.api.di.Singleton; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/ClassMap.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/reflection/ClassMap.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/ClassMap.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/reflection/ClassMap.java index 96e4ace8da08..ea045f18b479 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/ClassMap.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/reflection/ClassMap.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.reflection; +package org.apache.maven.impl.model.reflection; import java.lang.reflect.Method; import java.lang.reflect.Modifier; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/IntrospectionException.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/reflection/IntrospectionException.java similarity index 95% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/IntrospectionException.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/reflection/IntrospectionException.java index a36ed8be058e..bfe5e0611952 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/IntrospectionException.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/reflection/IntrospectionException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.reflection; +package org.apache.maven.impl.model.reflection; import java.io.Serial; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/MethodMap.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/reflection/MethodMap.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/MethodMap.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/reflection/MethodMap.java index 0e5e430f0fcf..5071b86d39b8 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/MethodMap.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/reflection/MethodMap.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.reflection; +package org.apache.maven.impl.model.reflection; import java.io.Serial; import java.lang.reflect.Method; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/ReflectionValueExtractor.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/reflection/ReflectionValueExtractor.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/ReflectionValueExtractor.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/reflection/ReflectionValueExtractor.java index 66d036e89a49..dc6c8a613e4a 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/ReflectionValueExtractor.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/reflection/ReflectionValueExtractor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.reflection; +package org.apache.maven.impl.model.reflection; import java.lang.ref.Reference; import java.lang.ref.WeakReference; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/DefaultRootLocator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/rootlocator/DefaultRootLocator.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/DefaultRootLocator.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/rootlocator/DefaultRootLocator.java index e874bd199e24..5e9859fadc65 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/DefaultRootLocator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/rootlocator/DefaultRootLocator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.rootlocator; +package org.apache.maven.impl.model.rootlocator; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/DotMvnRootDetector.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/rootlocator/DotMvnRootDetector.java similarity index 95% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/DotMvnRootDetector.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/rootlocator/DotMvnRootDetector.java index f0e5c7c00b41..85a35d07de0c 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/DotMvnRootDetector.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/rootlocator/DotMvnRootDetector.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.rootlocator; +package org.apache.maven.impl.model.rootlocator; import java.nio.file.Files; import java.nio.file.Path; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/PomXmlRootDetector.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/rootlocator/PomXmlRootDetector.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/PomXmlRootDetector.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/model/rootlocator/PomXmlRootDetector.java index 32959f90cbfa..506b6342537a 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/PomXmlRootDetector.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/rootlocator/PomXmlRootDetector.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.rootlocator; +package org.apache.maven.impl.model.rootlocator; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/ArtifactDescriptorReaderDelegate.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/ArtifactDescriptorReaderDelegate.java similarity index 96% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/ArtifactDescriptorReaderDelegate.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/ArtifactDescriptorReaderDelegate.java index cc6aef31fe9a..fc105b0dfdc3 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/ArtifactDescriptorReaderDelegate.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/ArtifactDescriptorReaderDelegate.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import java.util.ArrayList; import java.util.Collections; @@ -33,9 +33,9 @@ import org.apache.maven.api.model.Prerequisites; import org.apache.maven.api.model.Repository; import org.apache.maven.api.services.RepositoryFactory; -import org.apache.maven.internal.impl.InternalSession; -import org.apache.maven.internal.impl.resolver.artifact.MavenArtifactProperties; -import org.apache.maven.internal.impl.resolver.type.DefaultType; +import org.apache.maven.impl.InternalSession; +import org.apache.maven.impl.resolver.artifact.MavenArtifactProperties; +import org.apache.maven.impl.resolver.type.DefaultType; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.ArtifactProperties; import org.eclipse.aether.artifact.ArtifactType; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/ArtifactDescriptorUtils.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/ArtifactDescriptorUtils.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/ArtifactDescriptorUtils.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/ArtifactDescriptorUtils.java index 6edf21eb74f9..a7214d5b2904 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/ArtifactDescriptorUtils.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/ArtifactDescriptorUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import org.apache.maven.api.model.Repository; import org.eclipse.aether.artifact.Artifact; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultArtifactDescriptorReader.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultArtifactDescriptorReader.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultArtifactDescriptorReader.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultArtifactDescriptorReader.java index e046d1b14f39..3343c4678fb7 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultArtifactDescriptorReader.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultArtifactDescriptorReader.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import java.util.HashMap; import java.util.LinkedHashSet; @@ -37,8 +37,8 @@ import org.apache.maven.api.services.ModelSource; import org.apache.maven.api.services.ProblemCollector; import org.apache.maven.api.services.model.ModelResolverException; -import org.apache.maven.internal.impl.InternalSession; -import org.apache.maven.internal.impl.model.ModelProblemUtils; +import org.apache.maven.impl.InternalSession; +import org.apache.maven.impl.model.ModelProblemUtils; import org.eclipse.aether.RepositoryEvent; import org.eclipse.aether.RepositoryEvent.EventType; import org.eclipse.aether.RepositoryException; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultModelResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultModelResolver.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultModelResolver.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultModelResolver.java index 1b807a09250f..b2363a93e0a7 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultModelResolver.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultModelResolver.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import java.io.IOException; import java.io.InputStream; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultVersionRangeResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultVersionRangeResolver.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultVersionRangeResolver.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultVersionRangeResolver.java index 08d8adffbd6f..2adbff982646 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultVersionRangeResolver.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultVersionRangeResolver.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import java.io.InputStream; import java.nio.file.Files; @@ -31,7 +31,7 @@ import org.apache.maven.api.di.Named; import org.apache.maven.api.di.Singleton; import org.apache.maven.api.metadata.Versioning; -import org.apache.maven.internal.impl.DefaultModelVersionParser; +import org.apache.maven.impl.DefaultModelVersionParser; import org.apache.maven.metadata.v4.MetadataStaxReader; import org.eclipse.aether.RepositoryEvent; import org.eclipse.aether.RepositoryEvent.EventType; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultVersionResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultVersionResolver.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultVersionResolver.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultVersionResolver.java index 0694b9edbfe8..05a756cc2016 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultVersionResolver.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultVersionResolver.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import java.io.IOException; import java.io.InputStream; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/LocalSnapshotMetadata.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/LocalSnapshotMetadata.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/LocalSnapshotMetadata.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/LocalSnapshotMetadata.java index 51e71f9f6546..3d239e80ee78 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/LocalSnapshotMetadata.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/LocalSnapshotMetadata.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import java.io.File; import java.nio.file.Path; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/LocalSnapshotMetadataGenerator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/LocalSnapshotMetadataGenerator.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/LocalSnapshotMetadataGenerator.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/LocalSnapshotMetadataGenerator.java index 9d8eca513373..50c97507608b 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/LocalSnapshotMetadataGenerator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/LocalSnapshotMetadataGenerator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import java.time.Instant; import java.util.Collection; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenArtifactRelocationSource.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/MavenArtifactRelocationSource.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenArtifactRelocationSource.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/MavenArtifactRelocationSource.java index 636450558542..f412c3c55cfe 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenArtifactRelocationSource.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/MavenArtifactRelocationSource.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import org.apache.maven.api.model.Model; import org.eclipse.aether.RepositorySystemSession; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenMetadata.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/MavenMetadata.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenMetadata.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/MavenMetadata.java index 16e653e418eb..386983012351 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenMetadata.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/MavenMetadata.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import javax.xml.stream.XMLStreamException; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSessionBuilderSupplier.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/MavenSessionBuilderSupplier.java similarity index 96% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSessionBuilderSupplier.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/MavenSessionBuilderSupplier.java index cadf317de921..4758bddfd079 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSessionBuilderSupplier.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/MavenSessionBuilderSupplier.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import java.util.Arrays; import java.util.function.Supplier; import org.apache.maven.api.DependencyScope; -import org.apache.maven.internal.impl.resolver.artifact.FatArtifactTraverser; -import org.apache.maven.internal.impl.resolver.scopes.Maven4ScopeManagerConfiguration; -import org.apache.maven.internal.impl.resolver.type.DefaultTypeProvider; +import org.apache.maven.impl.resolver.artifact.FatArtifactTraverser; +import org.apache.maven.impl.resolver.scopes.Maven4ScopeManagerConfiguration; +import org.apache.maven.impl.resolver.type.DefaultTypeProvider; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession.CloseableSession; import org.eclipse.aether.RepositorySystemSession.SessionBuilder; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSnapshotMetadata.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/MavenSnapshotMetadata.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSnapshotMetadata.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/MavenSnapshotMetadata.java index 13c3b163da1f..2afd29441fff 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSnapshotMetadata.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/MavenSnapshotMetadata.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import java.nio.file.Path; import java.time.Instant; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenVersionScheme.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/MavenVersionScheme.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenVersionScheme.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/MavenVersionScheme.java index c146905892bf..c3295aac43d0 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenVersionScheme.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/MavenVersionScheme.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import org.apache.maven.api.di.Named; import org.apache.maven.api.di.Singleton; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenWorkspaceReader.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/MavenWorkspaceReader.java similarity index 95% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenWorkspaceReader.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/MavenWorkspaceReader.java index 47cdc17776a7..329951c0a3a3 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenWorkspaceReader.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/MavenWorkspaceReader.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import org.apache.maven.api.model.Model; import org.eclipse.aether.artifact.Artifact; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadata.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/PluginsMetadata.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadata.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/PluginsMetadata.java index a019d2639047..95596c2776f4 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadata.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/PluginsMetadata.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import java.io.File; import java.nio.file.Path; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadataGenerator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/PluginsMetadataGenerator.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadataGenerator.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/PluginsMetadataGenerator.java index c309ab694395..e25dff7caa7f 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadataGenerator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/PluginsMetadataGenerator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import java.io.InputStream; import java.nio.file.Files; @@ -34,7 +34,7 @@ import org.apache.maven.api.Constants; import org.apache.maven.api.MonotonicClock; import org.apache.maven.api.xml.XmlNode; -import org.apache.maven.internal.impl.resolver.PluginsMetadata.PluginInfo; +import org.apache.maven.impl.resolver.PluginsMetadata.PluginInfo; import org.apache.maven.internal.xml.XmlNodeStaxBuilder; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.artifact.Artifact; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadataGeneratorFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/PluginsMetadataGeneratorFactory.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadataGeneratorFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/PluginsMetadataGeneratorFactory.java index dcd0c9dac8ee..b8b8afe4f02a 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadataGeneratorFactory.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/PluginsMetadataGeneratorFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import org.apache.maven.api.di.Named; import org.apache.maven.api.di.Singleton; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RelocatedArtifact.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/RelocatedArtifact.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RelocatedArtifact.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/RelocatedArtifact.java index 25174a141f4f..6f0cb63ee919 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RelocatedArtifact.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/RelocatedArtifact.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import java.io.File; import java.nio.file.Path; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadata.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/RemoteSnapshotMetadata.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadata.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/RemoteSnapshotMetadata.java index 7eb841a06aea..07c1553b3008 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadata.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/RemoteSnapshotMetadata.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import java.io.File; import java.nio.file.Path; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadataGenerator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/RemoteSnapshotMetadataGenerator.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadataGenerator.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/RemoteSnapshotMetadataGenerator.java index 3caa15e1dd22..be1996f4aaea 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadataGenerator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/RemoteSnapshotMetadataGenerator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import java.time.Instant; import java.util.Collection; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RequestTraceHelper.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/RequestTraceHelper.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RequestTraceHelper.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/RequestTraceHelper.java index 25223a9c3a97..3ee54da7aa9f 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RequestTraceHelper.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/RequestTraceHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import java.util.stream.Collectors; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/SnapshotMetadataGeneratorFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/SnapshotMetadataGeneratorFactory.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/SnapshotMetadataGeneratorFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/SnapshotMetadataGeneratorFactory.java index 3ae1ad5f6aac..e004a54eb7e0 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/SnapshotMetadataGeneratorFactory.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/SnapshotMetadataGeneratorFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import org.apache.maven.api.di.Named; import org.apache.maven.api.di.Singleton; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadata.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/VersionsMetadata.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadata.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/VersionsMetadata.java index b55342dca6ba..e22d5fbf91ac 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadata.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/VersionsMetadata.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import java.io.File; import java.nio.file.Path; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGenerator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/VersionsMetadataGenerator.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGenerator.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/VersionsMetadataGenerator.java index 5f546ea29f05..a60554093222 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGenerator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/VersionsMetadataGenerator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import java.time.Instant; import java.util.Collection; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGeneratorFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/VersionsMetadataGeneratorFactory.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGeneratorFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/VersionsMetadataGeneratorFactory.java index 202f2c2e68aa..91e45a1ad350 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGeneratorFactory.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/VersionsMetadataGeneratorFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import org.apache.maven.api.di.Named; import org.apache.maven.api.di.Singleton; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/artifact/FatArtifactTraverser.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/artifact/FatArtifactTraverser.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/artifact/FatArtifactTraverser.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/artifact/FatArtifactTraverser.java index 8bee5cd31d27..587a61be77cf 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/artifact/FatArtifactTraverser.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/artifact/FatArtifactTraverser.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver.artifact; +package org.apache.maven.impl.resolver.artifact; import org.eclipse.aether.collection.DependencyCollectionContext; import org.eclipse.aether.collection.DependencyTraverser; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/artifact/MavenArtifactProperties.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/artifact/MavenArtifactProperties.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/artifact/MavenArtifactProperties.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/artifact/MavenArtifactProperties.java index c56124bede77..1ebfc84b8012 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/artifact/MavenArtifactProperties.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/artifact/MavenArtifactProperties.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver.artifact; +package org.apache.maven.impl.resolver.artifact; /** * The keys for Maven specific properties of artifacts. These properties "extend" (or supplement) the Resolver diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/package-info.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/package-info.java similarity index 78% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/package-info.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/package-info.java index 05e45e6a9b57..79148736b1ee 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/package-info.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/package-info.java @@ -3,4 +3,4 @@ * Maven Resolver extensions for utilizing the Maven POM and Maven * repository metadata. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/relocation/DistributionManagementArtifactRelocationSource.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/DistributionManagementArtifactRelocationSource.java similarity index 93% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/relocation/DistributionManagementArtifactRelocationSource.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/DistributionManagementArtifactRelocationSource.java index 41e89877dd44..2549b4f653eb 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/relocation/DistributionManagementArtifactRelocationSource.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/DistributionManagementArtifactRelocationSource.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver.relocation; +package org.apache.maven.impl.resolver.relocation; import org.apache.maven.api.di.Named; import org.apache.maven.api.di.Priority; @@ -24,8 +24,8 @@ import org.apache.maven.api.model.DistributionManagement; import org.apache.maven.api.model.Model; import org.apache.maven.api.model.Relocation; -import org.apache.maven.internal.impl.resolver.MavenArtifactRelocationSource; -import org.apache.maven.internal.impl.resolver.RelocatedArtifact; +import org.apache.maven.impl.resolver.MavenArtifactRelocationSource; +import org.apache.maven.impl.resolver.RelocatedArtifact; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.resolution.ArtifactDescriptorResult; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java similarity index 97% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java index c3cc34644599..966ceaa06fe5 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver.relocation; +package org.apache.maven.impl.resolver.relocation; import java.util.Arrays; import java.util.List; @@ -30,8 +30,8 @@ import org.apache.maven.api.di.Priority; import org.apache.maven.api.di.Singleton; import org.apache.maven.api.model.Model; -import org.apache.maven.internal.impl.resolver.MavenArtifactRelocationSource; -import org.apache.maven.internal.impl.resolver.RelocatedArtifact; +import org.apache.maven.impl.resolver.MavenArtifactRelocationSource; +import org.apache.maven.impl.resolver.RelocatedArtifact; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/scopes/Maven3ScopeManagerConfiguration.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/scopes/Maven3ScopeManagerConfiguration.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/scopes/Maven3ScopeManagerConfiguration.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/scopes/Maven3ScopeManagerConfiguration.java index 15bf43c22745..8b702bad0e4d 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/scopes/Maven3ScopeManagerConfiguration.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/scopes/Maven3ScopeManagerConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver.scopes; +package org.apache.maven.impl.resolver.scopes; import java.util.ArrayList; import java.util.Arrays; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/scopes/Maven4ScopeManagerConfiguration.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/scopes/Maven4ScopeManagerConfiguration.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/scopes/Maven4ScopeManagerConfiguration.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/scopes/Maven4ScopeManagerConfiguration.java index 73ecca93ea97..896b240053f6 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/scopes/Maven4ScopeManagerConfiguration.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/scopes/Maven4ScopeManagerConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver.scopes; +package org.apache.maven.impl.resolver.scopes; import java.util.ArrayList; import java.util.Arrays; @@ -25,7 +25,7 @@ import java.util.stream.Collectors; import org.apache.maven.api.DependencyScope; -import org.apache.maven.internal.impl.resolver.artifact.MavenArtifactProperties; +import org.apache.maven.impl.resolver.artifact.MavenArtifactProperties; import org.eclipse.aether.impl.scope.BuildScopeMatrixSource; import org.eclipse.aether.impl.scope.BuildScopeSource; import org.eclipse.aether.impl.scope.CommonBuilds; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/type/DefaultType.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/type/DefaultType.java similarity index 96% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/type/DefaultType.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/type/DefaultType.java index 000cb2a033b6..5922fea2257e 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/type/DefaultType.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/type/DefaultType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver.type; +package org.apache.maven.impl.resolver.type; import java.util.Arrays; import java.util.Collections; @@ -29,7 +29,7 @@ import org.apache.maven.api.Language; import org.apache.maven.api.PathType; import org.apache.maven.api.Type; -import org.apache.maven.internal.impl.resolver.artifact.MavenArtifactProperties; +import org.apache.maven.impl.resolver.artifact.MavenArtifactProperties; import org.eclipse.aether.artifact.ArtifactProperties; import org.eclipse.aether.artifact.ArtifactType; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/type/DefaultTypeProvider.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/type/DefaultTypeProvider.java similarity index 98% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/type/DefaultTypeProvider.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/type/DefaultTypeProvider.java index 8c8995974bb6..11c7a4ef8527 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/type/DefaultTypeProvider.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/type/DefaultTypeProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver.type; +package org.apache.maven.impl.resolver.type; import java.util.Arrays; import java.util.Collection; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/util/PhasingExecutor.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/util/PhasingExecutor.java similarity index 99% rename from impl/maven-impl/src/main/java/org/apache/maven/internal/impl/util/PhasingExecutor.java rename to impl/maven-impl/src/main/java/org/apache/maven/impl/util/PhasingExecutor.java index da7b9f7d6411..e92159ecbc22 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/util/PhasingExecutor.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/util/PhasingExecutor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.util; +package org.apache.maven.impl.util; import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; diff --git a/impl/maven-impl/src/main/resources/META-INF/services/org.apache.maven.api.services.model.RootDetector b/impl/maven-impl/src/main/resources/META-INF/services/org.apache.maven.api.services.model.RootDetector index 472ffe1612c9..04a576230b18 100644 --- a/impl/maven-impl/src/main/resources/META-INF/services/org.apache.maven.api.services.model.RootDetector +++ b/impl/maven-impl/src/main/resources/META-INF/services/org.apache.maven.api.services.model.RootDetector @@ -1,2 +1,2 @@ -org.apache.maven.internal.impl.model.rootlocator.DotMvnRootDetector -org.apache.maven.internal.impl.model.rootlocator.PomXmlRootDetector +org.apache.maven.impl.model.rootlocator.DotMvnRootDetector +org.apache.maven.impl.model.rootlocator.PomXmlRootDetector diff --git a/impl/maven-impl/src/main/resources/META-INF/services/org.apache.maven.api.services.model.RootLocator b/impl/maven-impl/src/main/resources/META-INF/services/org.apache.maven.api.services.model.RootLocator index db7fa8e7c725..1cd425bfdb42 100644 --- a/impl/maven-impl/src/main/resources/META-INF/services/org.apache.maven.api.services.model.RootLocator +++ b/impl/maven-impl/src/main/resources/META-INF/services/org.apache.maven.api.services.model.RootLocator @@ -1 +1 @@ -org.apache.maven.internal.impl.model.rootlocator.DefaultRootLocator +org.apache.maven.impl.model.rootlocator.DefaultRootLocator diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/DefaultModelVersionParserTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultModelVersionParserTest.java similarity index 96% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/DefaultModelVersionParserTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultModelVersionParserTest.java index 4c240b33a843..88813b53407c 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/DefaultModelVersionParserTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultModelVersionParserTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import org.apache.maven.api.Version; import org.eclipse.aether.util.version.GenericVersionScheme; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/DefaultProblemCollectorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultProblemCollectorTest.java similarity index 99% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/DefaultProblemCollectorTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultProblemCollectorTest.java index 2c5a7ac999b1..b6623e033772 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/DefaultProblemCollectorTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultProblemCollectorTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.stream.IntStream; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/DefaultSettingsBuilderFactoryTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSettingsBuilderFactoryTest.java similarity index 98% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/DefaultSettingsBuilderFactoryTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSettingsBuilderFactoryTest.java index db4ea2cc5519..db3d0c33e00e 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/DefaultSettingsBuilderFactoryTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSettingsBuilderFactoryTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/DefaultSettingsValidatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSettingsValidatorTest.java similarity index 99% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/DefaultSettingsValidatorTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSettingsValidatorTest.java index bb28c0bccfb2..8a5a5b2a6a66 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/DefaultSettingsValidatorTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSettingsValidatorTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl; +package org.apache.maven.impl; import java.util.List; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/ComplexActivationTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/ComplexActivationTest.java similarity index 96% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/ComplexActivationTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/model/ComplexActivationTest.java index e2bf87b89d72..8344a04f6d1a 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/ComplexActivationTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/ComplexActivationTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.nio.file.Path; import java.nio.file.Paths; @@ -28,7 +28,7 @@ import org.apache.maven.api.services.ModelBuilderRequest; import org.apache.maven.api.services.ModelBuilderResult; import org.apache.maven.api.services.ModelSource; -import org.apache.maven.internal.impl.standalone.ApiRunner; +import org.apache.maven.impl.standalone.ApiRunner; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementImporterTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultDependencyManagementImporterTest.java similarity index 99% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementImporterTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultDependencyManagementImporterTest.java index 39cbf65f1108..1d5463e26129 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementImporterTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultDependencyManagementImporterTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import org.apache.maven.api.model.Dependency; import org.apache.maven.api.model.DependencyManagement; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultInterpolatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultInterpolatorTest.java similarity index 99% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultInterpolatorTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultInterpolatorTest.java index bbdd861773fd..fd25e9ef83dc 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultInterpolatorTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultInterpolatorTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultModelBuilderTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelBuilderTest.java similarity index 95% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultModelBuilderTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelBuilderTest.java index cf06e09248b9..a085cde3af40 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultModelBuilderTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelBuilderTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.nio.file.Path; import java.nio.file.Paths; @@ -26,7 +26,7 @@ import org.apache.maven.api.services.ModelBuilderRequest; import org.apache.maven.api.services.ModelBuilderResult; import org.apache.maven.api.services.ModelSource; -import org.apache.maven.internal.impl.standalone.ApiRunner; +import org.apache.maven.impl.standalone.ApiRunner; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultModelInterpolatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelInterpolatorTest.java similarity index 99% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultModelInterpolatorTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelInterpolatorTest.java index 7d0e73985747..67ac644c7e18 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultModelInterpolatorTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelInterpolatorTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.nio.file.FileSystem; import java.nio.file.Path; @@ -50,8 +50,8 @@ import org.apache.maven.api.services.ModelBuilderRequest; import org.apache.maven.api.services.model.ModelInterpolator; import org.apache.maven.api.services.model.RootLocator; -import org.apache.maven.internal.impl.model.profile.SimpleProblemCollector; -import org.apache.maven.internal.impl.standalone.ApiRunner; +import org.apache.maven.impl.model.profile.SimpleProblemCollector; +import org.apache.maven.impl.standalone.ApiRunner; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultModelValidatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelValidatorTest.java similarity index 99% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultModelValidatorTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelValidatorTest.java index 7c990ca21c7a..34c0f1a2ff87 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultModelValidatorTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelValidatorTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.io.InputStream; import java.util.List; import org.apache.maven.api.model.Model; import org.apache.maven.api.services.model.ModelValidator; -import org.apache.maven.internal.impl.model.profile.SimpleProblemCollector; +import org.apache.maven.impl.model.profile.SimpleProblemCollector; import org.apache.maven.model.v4.MavenStaxReader; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/MavenBuildTimestampTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/MavenBuildTimestampTest.java similarity index 97% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/MavenBuildTimestampTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/model/MavenBuildTimestampTest.java index d08cac07ad86..ac3acae14a9a 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/MavenBuildTimestampTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/MavenBuildTimestampTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.util.HashMap; import java.util.Map; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/MavenModelMergerTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/MavenModelMergerTest.java similarity index 98% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/MavenModelMergerTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/model/MavenModelMergerTest.java index 868b1d78548a..77e85008573a 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/MavenModelMergerTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/MavenModelMergerTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model; +package org.apache.maven.impl.model; import java.util.Collections; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/AbstractProfileActivatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/AbstractProfileActivatorTest.java similarity index 89% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/AbstractProfileActivatorTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/AbstractProfileActivatorTest.java index a55022c183d1..0da81f20e146 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/AbstractProfileActivatorTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/AbstractProfileActivatorTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.profile; +package org.apache.maven.impl.model.profile; import java.nio.file.Path; import java.util.Map; @@ -25,10 +25,10 @@ import org.apache.maven.api.model.Profile; import org.apache.maven.api.services.model.ProfileActivationContext; import org.apache.maven.api.services.model.ProfileActivator; -import org.apache.maven.internal.impl.model.DefaultInterpolator; -import org.apache.maven.internal.impl.model.DefaultPathTranslator; -import org.apache.maven.internal.impl.model.DefaultProfileActivationContext; -import org.apache.maven.internal.impl.model.rootlocator.DefaultRootLocator; +import org.apache.maven.impl.model.DefaultInterpolator; +import org.apache.maven.impl.model.DefaultPathTranslator; +import org.apache.maven.impl.model.DefaultProfileActivationContext; +import org.apache.maven.impl.model.rootlocator.DefaultRootLocator; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/ConditionParserTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/ConditionParserTest.java similarity index 95% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/ConditionParserTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/ConditionParserTest.java index 1cd3bf12010c..0d9c2f9c559a 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/ConditionParserTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/ConditionParserTest.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.profile; +package org.apache.maven.impl.model.profile; import java.util.Map; import java.util.function.UnaryOperator; import org.apache.maven.api.model.Model; import org.apache.maven.api.services.model.ProfileActivationContext; -import org.apache.maven.internal.impl.DefaultModelVersionParser; -import org.apache.maven.internal.impl.DefaultVersionParser; -import org.apache.maven.internal.impl.model.DefaultInterpolator; -import org.apache.maven.internal.impl.model.DefaultPathTranslator; -import org.apache.maven.internal.impl.model.DefaultProfileActivationContext; -import org.apache.maven.internal.impl.model.profile.ConditionParser.ExpressionFunction; -import org.apache.maven.internal.impl.model.rootlocator.DefaultRootLocator; +import org.apache.maven.impl.DefaultModelVersionParser; +import org.apache.maven.impl.DefaultVersionParser; +import org.apache.maven.impl.model.DefaultInterpolator; +import org.apache.maven.impl.model.DefaultPathTranslator; +import org.apache.maven.impl.model.DefaultProfileActivationContext; +import org.apache.maven.impl.model.profile.ConditionParser.ExpressionFunction; +import org.apache.maven.impl.model.rootlocator.DefaultRootLocator; import org.eclipse.aether.util.version.GenericVersionScheme; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/ConditionProfileActivatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/ConditionProfileActivatorTest.java similarity index 98% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/ConditionProfileActivatorTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/ConditionProfileActivatorTest.java index 6dd31e293f3a..47ad359f6456 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/ConditionProfileActivatorTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/ConditionProfileActivatorTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.profile; +package org.apache.maven.impl.model.profile; import java.nio.file.Files; import java.nio.file.Path; @@ -28,11 +28,11 @@ import org.apache.maven.api.model.Profile; import org.apache.maven.api.services.model.ProfileActivationContext; import org.apache.maven.api.services.model.RootLocator; -import org.apache.maven.internal.impl.DefaultModelVersionParser; -import org.apache.maven.internal.impl.DefaultVersionParser; -import org.apache.maven.internal.impl.model.DefaultInterpolator; -import org.apache.maven.internal.impl.model.DefaultPathTranslator; -import org.apache.maven.internal.impl.model.DefaultProfileActivationContext; +import org.apache.maven.impl.DefaultModelVersionParser; +import org.apache.maven.impl.DefaultVersionParser; +import org.apache.maven.impl.model.DefaultInterpolator; +import org.apache.maven.impl.model.DefaultPathTranslator; +import org.apache.maven.impl.model.DefaultProfileActivationContext; import org.eclipse.aether.util.version.GenericVersionScheme; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/FileProfileActivatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/FileProfileActivatorTest.java similarity index 97% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/FileProfileActivatorTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/FileProfileActivatorTest.java index 955bb436f407..c7312beb66d2 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/FileProfileActivatorTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/FileProfileActivatorTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.profile; +package org.apache.maven.impl.model.profile; import java.io.File; import java.io.IOException; @@ -27,7 +27,7 @@ import org.apache.maven.api.model.Model; import org.apache.maven.api.model.Profile; import org.apache.maven.api.services.model.RootLocator; -import org.apache.maven.internal.impl.model.DefaultProfileActivationContext; +import org.apache.maven.impl.model.DefaultProfileActivationContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/JdkVersionProfileActivatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/JdkVersionProfileActivatorTest.java similarity index 99% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/JdkVersionProfileActivatorTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/JdkVersionProfileActivatorTest.java index 46e6f0db2172..9f72bee87af1 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/JdkVersionProfileActivatorTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/JdkVersionProfileActivatorTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.profile; +package org.apache.maven.impl.model.profile; import java.util.Map; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/OperatingSystemProfileActivatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/OperatingSystemProfileActivatorTest.java similarity index 99% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/OperatingSystemProfileActivatorTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/OperatingSystemProfileActivatorTest.java index cb717489b1f4..77d6e18818ec 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/OperatingSystemProfileActivatorTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/OperatingSystemProfileActivatorTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.profile; +package org.apache.maven.impl.model.profile; import java.util.Map; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/PropertyProfileActivatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/PropertyProfileActivatorTest.java similarity index 99% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/PropertyProfileActivatorTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/PropertyProfileActivatorTest.java index 6b044a82b7bb..af1b123c4655 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/PropertyProfileActivatorTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/PropertyProfileActivatorTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.profile; +package org.apache.maven.impl.model.profile; import java.util.Map; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/SimpleProblemCollector.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/SimpleProblemCollector.java similarity index 96% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/SimpleProblemCollector.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/SimpleProblemCollector.java index 5e92303a52e0..a2073e5dcc1b 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/profile/SimpleProblemCollector.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/profile/SimpleProblemCollector.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.profile; +package org.apache.maven.impl.model.profile; import java.util.List; @@ -27,7 +27,7 @@ import org.apache.maven.api.services.ModelProblem; import org.apache.maven.api.services.ModelProblemCollector; import org.apache.maven.api.services.ProblemCollector; -import org.apache.maven.internal.impl.model.DefaultModelProblem; +import org.apache.maven.impl.model.DefaultModelProblem; /** * A simple model problem collector for testing the model building components. diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/reflection/ReflectionValueExtractorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/reflection/ReflectionValueExtractorTest.java similarity index 99% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/reflection/ReflectionValueExtractorTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/model/reflection/ReflectionValueExtractorTest.java index 82003f2efcaa..a47d213e35e0 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/reflection/ReflectionValueExtractorTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/reflection/ReflectionValueExtractorTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.model.reflection; +package org.apache.maven.impl.model.reflection; /* * Copyright The Codehaus Foundation. diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/resolver/DefaultModelResolverTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/resolver/DefaultModelResolverTest.java similarity index 98% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/resolver/DefaultModelResolverTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/resolver/DefaultModelResolverTest.java index 42f3686382d9..dd776f5f1a0b 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/resolver/DefaultModelResolverTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/resolver/DefaultModelResolverTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.resolver; +package org.apache.maven.impl.resolver; import java.nio.file.Path; import java.nio.file.Paths; @@ -30,7 +30,7 @@ import org.apache.maven.api.model.Parent; import org.apache.maven.api.services.model.ModelResolver; import org.apache.maven.api.services.model.ModelResolverException; -import org.apache.maven.internal.impl.standalone.ApiRunner; +import org.apache.maven.impl.standalone.ApiRunner; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/secdispatcher/SecDispatcherProvider.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/secdispatcher/SecDispatcherProvider.java similarity index 98% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/secdispatcher/SecDispatcherProvider.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/secdispatcher/SecDispatcherProvider.java index 509d08da14cf..21bfb386ce15 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/secdispatcher/SecDispatcherProvider.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/secdispatcher/SecDispatcherProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.secdispatcher; +package org.apache.maven.impl.secdispatcher; import java.util.Map; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/standalone/ApiRunner.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/standalone/ApiRunner.java similarity index 97% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/standalone/ApiRunner.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/standalone/ApiRunner.java index ecf5d5fb18ab..840edd87f01b 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/standalone/ApiRunner.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/standalone/ApiRunner.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.standalone; +package org.apache.maven.impl.standalone; import java.nio.file.Path; import java.nio.file.Paths; @@ -59,10 +59,10 @@ import org.apache.maven.di.Injector; import org.apache.maven.di.Key; import org.apache.maven.di.impl.DIException; -import org.apache.maven.internal.impl.AbstractSession; -import org.apache.maven.internal.impl.InternalSession; -import org.apache.maven.internal.impl.di.SessionScope; -import org.apache.maven.internal.impl.resolver.scopes.Maven4ScopeManagerConfiguration; +import org.apache.maven.impl.AbstractSession; +import org.apache.maven.impl.InternalSession; +import org.apache.maven.impl.di.SessionScope; +import org.apache.maven.impl.resolver.scopes.Maven4ScopeManagerConfiguration; import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/standalone/DiTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/standalone/DiTest.java similarity index 91% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/standalone/DiTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/standalone/DiTest.java index 2167b5976df1..872644f85c49 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/standalone/DiTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/standalone/DiTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.standalone; +package org.apache.maven.impl.standalone; import java.lang.reflect.Type; import java.util.Set; import org.apache.maven.di.Injector; import org.apache.maven.di.impl.Types; -import org.apache.maven.internal.impl.ExtensibleEnumRegistries; +import org.apache.maven.impl.ExtensibleEnumRegistries; import org.junit.jupiter.api.Test; class DiTest { diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/standalone/RepositorySystemSupplier.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/standalone/RepositorySystemSupplier.java similarity index 99% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/standalone/RepositorySystemSupplier.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/standalone/RepositorySystemSupplier.java index a341c4a2efef..606c7078aabb 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/standalone/RepositorySystemSupplier.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/standalone/RepositorySystemSupplier.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.standalone; +package org.apache.maven.impl.standalone; import java.util.Map; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/standalone/TestApiStandalone.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/standalone/TestApiStandalone.java similarity index 98% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/standalone/TestApiStandalone.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/standalone/TestApiStandalone.java index 646ee273e00c..60130a654f51 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/standalone/TestApiStandalone.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/standalone/TestApiStandalone.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.standalone; +package org.apache.maven.impl.standalone; import java.nio.file.Files; import java.nio.file.Paths; diff --git a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/util/PhasingExecutorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/util/PhasingExecutorTest.java similarity index 97% rename from impl/maven-impl/src/test/java/org/apache/maven/internal/impl/util/PhasingExecutorTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/impl/util/PhasingExecutorTest.java index 623c24a3f45e..8d234d28a087 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/util/PhasingExecutorTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/util/PhasingExecutorTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.internal.impl.util; +package org.apache.maven.impl.util; import java.util.concurrent.Executor; import java.util.concurrent.Executors; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java index 6d946fc7ff78..9ab69e116400 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java @@ -67,7 +67,7 @@ public void testit() throws Exception { assertTrue( lines.contains( matchesVersionRange("[4.0.0-beta-5,)") - ? "event: org.apache.maven.internal.impl.DefaultSettingsBuilder$DefaultSettingsBuilderResult" + ? "event: org.apache.maven.impl.DefaultSettingsBuilder$DefaultSettingsBuilderResult" : "event: org.apache.maven.settings.building.DefaultSettingsBuildingResult"), lines.toString()); assertTrue(lines.contains("event: org.apache.maven.execution.DefaultMavenExecutionRequest"), lines.toString()); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java index 3070162a02c7..8e7bd2168102 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java @@ -65,7 +65,7 @@ public void testit() throws Exception { assertTrue( lines.contains( matchesVersionRange("[4.0.0-beta-5,)") - ? "event: org.apache.maven.internal.impl.DefaultToolchainsBuilder$DefaultToolchainsBuilderResult" + ? "event: org.apache.maven.impl.DefaultToolchainsBuilder$DefaultToolchainsBuilderResult" : "event: org.apache.maven.toolchain.building.DefaultToolchainsBuildingResult"), lines.toString()); }