diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index e79a32481a..6044041189 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -21,12 +21,7 @@ package org.apache.maven; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; -import org.apache.maven.execution.DefaultMavenExecutionResult; -import org.apache.maven.execution.MavenExecutionRequest; -import org.apache.maven.execution.MavenExecutionResult; -import org.apache.maven.execution.MavenSession; -import org.apache.maven.execution.ReactorManager; -import org.apache.maven.execution.RuntimeInformation; +import org.apache.maven.execution.*; import org.apache.maven.extension.BuildExtensionScanner; import org.apache.maven.extension.ExtensionScanningException; import org.apache.maven.lifecycle.LifecycleExecutionException; @@ -35,7 +30,7 @@ import org.apache.maven.lifecycle.TaskValidationResult; import org.apache.maven.monitor.event.DeprecationEventDispatcher; import org.apache.maven.monitor.event.EventDispatcher; import org.apache.maven.monitor.event.MavenEvents; -import org.apache.maven.project.DuplicateProjectException; +import org.apache.maven.execution.DuplicateProjectException; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.project.ProjectBuildingException; diff --git a/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java b/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java index 6a03c602b9..46701d1bbc 100644 --- a/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java +++ b/maven-core/src/main/java/org/apache/maven/errors/CoreErrorReporter.java @@ -38,7 +38,7 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuildingException; import org.apache.maven.project.artifact.InvalidDependencyVersionException; import org.apache.maven.errors.ProjectErrorReporter; -import org.apache.maven.project.path.PathTranslator; +import org.apache.maven.path.PathTranslator; import org.apache.maven.reactor.MavenExecutionException; import org.apache.maven.reactor.MissingModuleException; import org.apache.maven.realm.RealmManagementException; diff --git a/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java b/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java index 547749aa5c..dd7407dbbc 100644 --- a/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java +++ b/maven-core/src/main/java/org/apache/maven/errors/DefaultCoreErrorReporter.java @@ -2,6 +2,7 @@ package org.apache.maven.errors; import org.apache.maven.NoGoalsSpecifiedException; import org.apache.maven.ProjectCycleException; +import org.apache.maven.path.PathTranslator; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.ArtifactUtils; import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException; @@ -45,7 +46,6 @@ import org.apache.maven.errors.DefaultProjectErrorReporter; import org.apache.maven.errors.ProjectErrorReporter; import org.apache.maven.errors.ProjectReporterManager; import org.apache.maven.extension.ModelInterpolationException; -import org.apache.maven.project.path.PathTranslator; import org.apache.maven.reactor.MavenExecutionException; import org.apache.maven.reactor.MissingModuleException; import org.apache.maven.realm.RealmManagementException; diff --git a/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java b/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java index aff5602b82..f0e7b4f24d 100644 --- a/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java +++ b/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java @@ -14,7 +14,7 @@ import org.apache.maven.model.Repository; import org.apache.maven.profiles.activation.ProfileActivationContext; import org.apache.maven.profiles.activation.ProfileActivationException; import org.apache.maven.profiles.activation.ProfileActivator; -import org.apache.maven.project.DuplicateProjectException; +import org.apache.maven.execution.DuplicateProjectException; import org.apache.maven.project.InvalidProjectModelException; import org.apache.maven.project.InvalidProjectVersionException; import org.apache.maven.project.MavenProject; diff --git a/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java b/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java index e3e3d04148..8bfd6a32cc 100644 --- a/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java +++ b/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java @@ -11,7 +11,7 @@ import org.apache.maven.model.Repository; import org.apache.maven.profiles.activation.ProfileActivationContext; import org.apache.maven.profiles.activation.ProfileActivationException; import org.apache.maven.profiles.activation.ProfileActivator; -import org.apache.maven.project.DuplicateProjectException; +import org.apache.maven.execution.DuplicateProjectException; import org.apache.maven.project.InvalidProjectModelException; import org.apache.maven.project.InvalidProjectVersionException; import org.apache.maven.project.MavenProject; diff --git a/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java b/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java index b76b772c7a..212d35aec7 100644 --- a/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java +++ b/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java @@ -8,7 +8,7 @@ import org.apache.maven.model.RepositoryBase; import org.apache.maven.profiles.activation.ProfileActivationContext; import org.apache.maven.profiles.activation.ProfileActivationException; import org.apache.maven.profiles.activation.ProfileActivator; -import org.apache.maven.project.DuplicateProjectException; +import org.apache.maven.execution.DuplicateProjectException; import org.apache.maven.project.InvalidProjectVersionException; import org.apache.maven.project.MavenProject; import org.apache.maven.extension.ModelInterpolationException; diff --git a/maven-project/src/main/java/org/apache/maven/project/DuplicateProjectException.java b/maven-core/src/main/java/org/apache/maven/execution/DuplicateProjectException.java similarity index 98% rename from maven-project/src/main/java/org/apache/maven/project/DuplicateProjectException.java rename to maven-core/src/main/java/org/apache/maven/execution/DuplicateProjectException.java index 42f66c3575..94e10e1d15 100644 --- a/maven-project/src/main/java/org/apache/maven/project/DuplicateProjectException.java +++ b/maven-core/src/main/java/org/apache/maven/execution/DuplicateProjectException.java @@ -1,4 +1,4 @@ -package org.apache.maven.project; +package org.apache.maven.execution; import java.io.File; diff --git a/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java b/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java index fb8b13a367..9f16f2e1e6 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java +++ b/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java @@ -22,7 +22,7 @@ package org.apache.maven.execution; import org.apache.maven.artifact.ArtifactUtils; import org.apache.maven.plugin.descriptor.PluginDescriptor; -import org.apache.maven.project.DuplicateProjectException; +import org.apache.maven.execution.DuplicateProjectException; import org.apache.maven.project.MavenProject; import org.apache.maven.model.Dependency; import org.apache.maven.model.Plugin; diff --git a/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java b/maven-core/src/main/java/org/apache/maven/path/DefaultPathTranslator.java similarity index 99% rename from maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java rename to maven-core/src/main/java/org/apache/maven/path/DefaultPathTranslator.java index 370e38e055..966179f0c6 100644 --- a/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java +++ b/maven-core/src/main/java/org/apache/maven/path/DefaultPathTranslator.java @@ -1,4 +1,4 @@ -package org.apache.maven.project.path; +package org.apache.maven.path; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java b/maven-core/src/main/java/org/apache/maven/path/PathTranslator.java similarity index 97% rename from maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java rename to maven-core/src/main/java/org/apache/maven/path/PathTranslator.java index 99a289639e..af16e3e6dc 100644 --- a/maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java +++ b/maven-core/src/main/java/org/apache/maven/path/PathTranslator.java @@ -1,4 +1,4 @@ -package org.apache.maven.project.path; +package org.apache.maven.path; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java index 8186d1aff5..5ae0fd25bc 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java @@ -20,6 +20,7 @@ package org.apache.maven.plugin; */ import org.apache.maven.ArtifactFilterManager; +import org.apache.maven.path.PathTranslator; import org.apache.maven.shared.model.InterpolatorProperty; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; @@ -62,7 +63,6 @@ import org.apache.maven.project.ModelUtils; import org.apache.maven.project.builder.PomClassicTransformer; import org.apache.maven.project.artifact.InvalidDependencyVersionException; import org.apache.maven.project.artifact.MavenMetadataSource; -import org.apache.maven.project.path.PathTranslator; import org.apache.maven.realm.MavenRealmManager; import org.apache.maven.realm.RealmManagementException; import org.apache.maven.reporting.MavenReport; @@ -91,7 +91,6 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import java.io.IOException; import java.io.StringReader; -import java.io.File; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java index f8fbe821b0..f8bd77f076 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java @@ -23,7 +23,7 @@ import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.project.MavenProject; -import org.apache.maven.project.path.PathTranslator; +import org.apache.maven.path.PathTranslator; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; import org.codehaus.plexus.logging.Logger; diff --git a/maven-core/src/main/resources/META-INF/plexus/components.xml b/maven-core/src/main/resources/META-INF/plexus/components.xml index 55d28ee71e..e2ec35cd6f 100644 --- a/maven-core/src/main/resources/META-INF/plexus/components.xml +++ b/maven-core/src/main/resources/META-INF/plexus/components.xml @@ -225,6 +225,11 @@ under the License. + + org.apache.maven.path.PathTranslator + org.apache.maven.path.DefaultPathTranslator + + org.apache.maven.ArtifactFilterManager org.apache.maven.DefaultArtifactFilterManager @@ -240,7 +245,7 @@ under the License. org.apache.maven.ArtifactFilterManager - org.apache.maven.project.path.PathTranslator + org.apache.maven.path.PathTranslator org.apache.maven.plugin.MavenPluginCollector diff --git a/maven-core/src/test/java/org/apache/maven/execution/ProjectSorterTest.java b/maven-core/src/test/java/org/apache/maven/execution/ProjectSorterTest.java index 3095fcae48..af50f9dcef 100644 --- a/maven-core/src/test/java/org/apache/maven/execution/ProjectSorterTest.java +++ b/maven-core/src/test/java/org/apache/maven/execution/ProjectSorterTest.java @@ -24,7 +24,7 @@ import org.apache.maven.model.Build; import org.apache.maven.model.Dependency; import org.apache.maven.model.Extension; import org.apache.maven.model.Model; -import org.apache.maven.project.DuplicateProjectException; +import org.apache.maven.execution.DuplicateProjectException; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.dag.CycleDetectedException; diff --git a/maven-project/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java b/maven-core/src/test/java/org/apache/maven/path/DefaultPathTranslatorTest.java similarity index 97% rename from maven-project/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java rename to maven-core/src/test/java/org/apache/maven/path/DefaultPathTranslatorTest.java index bfa38dbb43..ccc32bff8b 100644 --- a/maven-project/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java +++ b/maven-core/src/test/java/org/apache/maven/path/DefaultPathTranslatorTest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.maven.project.path; +package org.apache.maven.path; import java.io.File; diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java index c00bd7aed0..ba03da1f18 100644 --- a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java +++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java @@ -27,18 +27,15 @@ import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.DefaultArtifactRepository; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; import org.apache.maven.artifact.versioning.VersionRange; -import org.apache.maven.execution.DefaultMavenExecutionRequest; -import org.apache.maven.execution.MavenExecutionRequest; -import org.apache.maven.execution.MavenSession; -import org.apache.maven.execution.ReactorManager; +import org.apache.maven.execution.*; import org.apache.maven.model.Build; import org.apache.maven.model.Model; import org.apache.maven.monitor.event.DefaultEventDispatcher; import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptor; -import org.apache.maven.project.DuplicateProjectException; +import org.apache.maven.execution.DuplicateProjectException; import org.apache.maven.project.MavenProject; -import org.apache.maven.project.path.PathTranslator; +import org.apache.maven.path.PathTranslator; import org.apache.maven.settings.Settings; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.PlexusTestCase; diff --git a/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml b/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml index 7a62eae882..0471408509 100644 --- a/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml +++ b/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml @@ -33,7 +33,7 @@ under the License. org.apache.maven.project.validation.ModelValidator - org.apache.maven.project.path.PathTranslator + org.apache.maven.path.PathTranslator org.apache.maven.artifact.factory.ArtifactFactory diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java index d28acc7de7..af10624967 100644 --- a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java +++ b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java @@ -33,12 +33,7 @@ import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.embedder.execution.MavenExecutionRequestPopulator; import org.apache.maven.errors.CoreErrorReporter; import org.apache.maven.errors.CoreReporterManager; -import org.apache.maven.execution.DefaultMavenExecutionRequest; -import org.apache.maven.execution.DefaultMavenExecutionResult; -import org.apache.maven.execution.MavenExecutionRequest; -import org.apache.maven.execution.MavenExecutionResult; -import org.apache.maven.execution.MavenSession; -import org.apache.maven.execution.ReactorManager; +import org.apache.maven.execution.*; import org.apache.maven.extension.BuildExtensionScanner; import org.apache.maven.extension.ExtensionScanningException; import org.apache.maven.lifecycle.LifecycleException; @@ -60,7 +55,7 @@ import org.apache.maven.plugin.PluginNotFoundException; import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder; import org.apache.maven.plugin.version.PluginVersionNotFoundException; import org.apache.maven.plugin.version.PluginVersionResolutionException; -import org.apache.maven.project.DuplicateProjectException; +import org.apache.maven.execution.DuplicateProjectException; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.project.MavenProjectBuildingResult; diff --git a/maven-embedder/src/test/projects/complex-project/maven-core/src/main/resources/META-INF/plexus/components.xml b/maven-embedder/src/test/projects/complex-project/maven-core/src/main/resources/META-INF/plexus/components.xml index 8995e90122..274a1bfb82 100644 --- a/maven-embedder/src/test/projects/complex-project/maven-core/src/main/resources/META-INF/plexus/components.xml +++ b/maven-embedder/src/test/projects/complex-project/maven-core/src/main/resources/META-INF/plexus/components.xml @@ -80,7 +80,7 @@ under the License. org.apache.maven.ArtifactFilterManager - org.apache.maven.project.path.PathTranslator + org.apache.maven.path.PathTranslator org.apache.maven.plugin.MavenPluginCollector diff --git a/maven-embedder/src/test/projects/complex-project/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml b/maven-embedder/src/test/projects/complex-project/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml index d586b34ebe..e131991c5f 100644 --- a/maven-embedder/src/test/projects/complex-project/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml +++ b/maven-embedder/src/test/projects/complex-project/maven-core/src/test/resources/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.xml @@ -27,7 +27,7 @@ under the License. org.apache.maven.project.validation.ModelValidator - org.apache.maven.project.path.PathTranslator + org.apache.maven.path.PathTranslator org.apache.maven.artifact.factory.ArtifactFactory diff --git a/maven-embedder/src/test/projects/complex-project/maven-project/src/main/resources/META-INF/plexus/components.xml b/maven-embedder/src/test/projects/complex-project/maven-project/src/main/resources/META-INF/plexus/components.xml index 6a1d26d6b2..dbf956afaa 100644 --- a/maven-embedder/src/test/projects/complex-project/maven-project/src/main/resources/META-INF/plexus/components.xml +++ b/maven-embedder/src/test/projects/complex-project/maven-project/src/main/resources/META-INF/plexus/components.xml @@ -165,7 +165,7 @@ under the License. org.apache.maven.project.validation.ModelValidator - org.apache.maven.project.path.PathTranslator + org.apache.maven.path.PathTranslator org.apache.maven.artifact.factory.ArtifactFactory @@ -288,8 +288,8 @@ under the License. | I realize this is duplicated but allows the project builder to work by itself --> - org.apache.maven.project.path.PathTranslator - org.apache.maven.project.path.DefaultPathTranslator + org.apache.maven.path.PathTranslator + org.apache.maven.path.DefaultPathTranslator diff --git a/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml b/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml index eddb8bc940..31c49d38ed 100644 --- a/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml +++ b/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml @@ -98,7 +98,7 @@ under the License. org.apache.maven.project.validation.ModelValidator - org.apache.maven.project.path.PathTranslator + org.apache.maven.path.PathTranslator org.apache.maven.artifact.factory.ArtifactFactory diff --git a/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml b/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml index c50f4f9b7a..cb6a6a23c5 100644 --- a/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml +++ b/maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml @@ -89,7 +89,7 @@ under the License. org.apache.maven.project.validation.ModelValidator - org.apache.maven.project.path.PathTranslator + org.apache.maven.path.PathTranslator org.apache.maven.artifact.factory.ArtifactFactory diff --git a/maven-project/src/main/resources/META-INF/plexus/components.xml b/maven-project/src/main/resources/META-INF/plexus/components.xml index 0f2dc31349..57ec63e0e8 100644 --- a/maven-project/src/main/resources/META-INF/plexus/components.xml +++ b/maven-project/src/main/resources/META-INF/plexus/components.xml @@ -223,11 +223,7 @@ under the License. - - org.apache.maven.project.path.PathTranslator - org.apache.maven.project.path.DefaultPathTranslator - - + org.apache.maven.artifact.metadata.ArtifactMetadataSource maven