diff --git a/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java b/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java index 6148ca59ef..5b46573d81 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java +++ b/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java @@ -19,9 +19,9 @@ package org.apache.maven.project.validation; * under the License. */ -import org.apache.maven.model.DefaultModelBuildingRequest; import org.apache.maven.model.Model; -import org.apache.maven.model.ModelBuildingRequest; +import org.apache.maven.model.building.DefaultModelBuildingRequest; +import org.apache.maven.model.building.ModelBuildingRequest; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; diff --git a/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java b/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java index 8e180d96ec..064a4b29f2 100644 --- a/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java +++ b/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java @@ -1,7 +1,7 @@ package org.apache.maven.listeners; import org.apache.maven.execution.MavenSession; -import org.apache.maven.model.ModelEventListener; +import org.apache.maven.model.building.ModelEventListener; public interface MavenModelEventListener diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java index c81e8e54bb..96ee5430b9 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java @@ -29,8 +29,8 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.model.Dependency; import org.apache.maven.model.Exclusion; -import org.apache.maven.model.ModelUtils; import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelUtils; import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.codehaus.plexus.classworlds.realm.ClassRealm; import org.codehaus.plexus.component.annotations.Component; diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java index a234bb11b3..5cd6f3704e 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java @@ -23,8 +23,8 @@ import java.util.List; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.InvalidRepositoryException; import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.model.ModelBuildingRequest; import org.apache.maven.model.Repository; +import org.apache.maven.model.building.ModelBuildingRequest; import org.apache.maven.profiles.ProfileManager; import org.apache.maven.repository.RepositorySystem; import org.codehaus.plexus.component.annotations.Component; diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java index 36e5299175..158333dc8a 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java @@ -29,16 +29,16 @@ import org.apache.maven.artifact.resolver.ResolutionErrorHandler; import org.apache.maven.lifecycle.LifecycleExecutionException; import org.apache.maven.lifecycle.LifecycleExecutor; import org.apache.maven.model.Build; -import org.apache.maven.model.DefaultModelBuildingRequest; -import org.apache.maven.model.FileModelSource; import org.apache.maven.model.Model; -import org.apache.maven.model.ModelBuilder; -import org.apache.maven.model.ModelBuildingException; -import org.apache.maven.model.ModelBuildingRequest; -import org.apache.maven.model.ModelBuildingResult; -import org.apache.maven.model.ModelProblem; import org.apache.maven.model.Profile; -import org.apache.maven.model.UrlModelSource; +import org.apache.maven.model.building.DefaultModelBuildingRequest; +import org.apache.maven.model.building.FileModelSource; +import org.apache.maven.model.building.ModelBuilder; +import org.apache.maven.model.building.ModelBuildingException; +import org.apache.maven.model.building.ModelBuildingRequest; +import org.apache.maven.model.building.ModelBuildingResult; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.model.building.UrlModelSource; import org.apache.maven.model.resolution.ModelResolver; import org.apache.maven.project.artifact.ProjectArtifact; import org.apache.maven.repository.RepositorySystem; diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java index 3d145fd2aa..ac4210e75f 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java @@ -23,8 +23,8 @@ import java.util.List; import java.util.Properties; import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.model.ModelBuildingRequest; -import org.apache.maven.model.ModelEventListener; +import org.apache.maven.model.building.ModelBuildingRequest; +import org.apache.maven.model.building.ModelEventListener; @Deprecated public class DefaultProjectBuilderConfiguration diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java index 41dd23614b..12d9688b6e 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java @@ -25,9 +25,9 @@ import java.util.List; import java.util.Properties; import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.model.ModelBuildingRequest; -import org.apache.maven.model.ModelEventListener; import org.apache.maven.model.Profile; +import org.apache.maven.model.building.ModelBuildingRequest; +import org.apache.maven.model.building.ModelEventListener; public class DefaultProjectBuildingRequest implements ProjectBuildingRequest diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java index c13374f8a9..fd86254ea7 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Properties; import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.model.ModelBuildingRequest; import org.apache.maven.model.Profile; +import org.apache.maven.model.building.ModelBuildingRequest; public interface ProjectBuildingRequest { diff --git a/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java b/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java index 4c44389e6a..898b79edf6 100644 --- a/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java +++ b/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java @@ -29,9 +29,9 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionException; import org.apache.maven.artifact.resolver.ArtifactResolutionRequest; import org.apache.maven.artifact.resolver.ArtifactResolutionResult; import org.apache.maven.artifact.resolver.ResolutionErrorHandler; -import org.apache.maven.model.FileModelSource; -import org.apache.maven.model.ModelSource; import org.apache.maven.model.Repository; +import org.apache.maven.model.building.FileModelSource; +import org.apache.maven.model.building.ModelSource; import org.apache.maven.model.resolution.InvalidRepositoryException; import org.apache.maven.model.resolution.ModelResolver; import org.apache.maven.model.resolution.UnresolvableModelException; diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java index 724e7f2d93..0ab9f4df8a 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java @@ -43,7 +43,7 @@ import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.model.Dependency; import org.apache.maven.model.Exclusion; -import org.apache.maven.model.ModelBuildingRequest; +import org.apache.maven.model.building.ModelBuildingRequest; import org.apache.maven.project.DefaultProjectBuildingRequest; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuilder; diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java index 773257b238..1a9b177caf 100644 --- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java @@ -26,8 +26,8 @@ import java.util.Map; import java.util.Properties; import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; -import org.apache.maven.model.ModelBuildingRequest; import org.apache.maven.model.PluginExecution; +import org.apache.maven.model.building.ModelBuildingRequest; import org.apache.maven.project.harness.PomTestWrapper; import org.apache.maven.repository.RepositorySystem; import org.codehaus.plexus.PlexusTestCase; diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java b/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java deleted file mode 100644 index 565fd31795..0000000000 --- a/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.apache.maven.model; - - -public interface ModelEventListener { - - void fire(Model model); - -} - diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java similarity index 99% rename from maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java rename to maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java index bc83f69b52..e63bb86579 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java @@ -1,4 +1,4 @@ -package org.apache.maven.model; +package org.apache.maven.model.building; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,6 +26,10 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import org.apache.maven.model.Model; +import org.apache.maven.model.Parent; +import org.apache.maven.model.Profile; +import org.apache.maven.model.Repository; import org.apache.maven.model.inheritance.InheritanceAssembler; import org.apache.maven.model.interpolation.ModelInterpolationException; import org.apache.maven.model.interpolation.ModelInterpolator; diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java similarity index 98% rename from maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingRequest.java rename to maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java index 3615840357..dbbbc4023d 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingRequest.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java @@ -1,4 +1,4 @@ -package org.apache.maven.model; +package org.apache.maven.model.building; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,6 +24,7 @@ import java.util.Date; import java.util.List; import java.util.Properties; +import org.apache.maven.model.Profile; import org.apache.maven.model.resolution.ModelResolver; /** diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingResult.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java similarity index 97% rename from maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingResult.java rename to maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java index 28d55b9682..8a137b0611 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingResult.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java @@ -1,4 +1,4 @@ -package org.apache.maven.model; +package org.apache.maven.model.building; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,6 +25,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.maven.model.Model; +import org.apache.maven.model.Profile; + /** * Collects the output of the model builder. * diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/FileModelSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java similarity index 97% rename from maven-model-builder/src/main/java/org/apache/maven/model/FileModelSource.java rename to maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java index f128315bb2..ba879f4382 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/FileModelSource.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java @@ -1,4 +1,4 @@ -package org.apache.maven.model; +package org.apache.maven.model.building; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java similarity index 98% rename from maven-model-builder/src/main/java/org/apache/maven/model/ModelBuilder.java rename to maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java index ef6bc2328a..f769b532c1 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuilder.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java @@ -1,4 +1,4 @@ -package org.apache.maven.model; +package org.apache.maven.model.building; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingException.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java similarity index 98% rename from maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingException.java rename to maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java index 05b4d9a089..e5c50bde3f 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingException.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java @@ -1,4 +1,4 @@ -package org.apache.maven.model; +package org.apache.maven.model.building; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java similarity index 98% rename from maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingRequest.java rename to maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java index 6efd053dc5..a227a29a29 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingRequest.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java @@ -1,4 +1,4 @@ -package org.apache.maven.model; +package org.apache.maven.model.building; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,6 +23,7 @@ import java.util.Date; import java.util.List; import java.util.Properties; +import org.apache.maven.model.Profile; import org.apache.maven.model.resolution.ModelResolver; /** diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingResult.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java similarity index 97% rename from maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingResult.java rename to maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java index 67c42fbf7c..9663425a0a 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingResult.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java @@ -1,4 +1,4 @@ -package org.apache.maven.model; +package org.apache.maven.model.building; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,6 +21,9 @@ package org.apache.maven.model; import java.util.List; +import org.apache.maven.model.Model; +import org.apache.maven.model.Profile; + /** * Collects the output of the model builder. * diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/ModelData.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java similarity index 97% rename from maven-model-builder/src/main/java/org/apache/maven/model/ModelData.java rename to maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java index 07c314b82c..01b2eb5dc4 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/ModelData.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java @@ -1,4 +1,4 @@ -package org.apache.maven.model; +package org.apache.maven.model.building; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,6 +21,9 @@ package org.apache.maven.model; import java.util.List; +import org.apache.maven.model.Model; +import org.apache.maven.model.Profile; + /** * Holds a model along with some auxiliary information. This internal utility class assists the model builder during POM * processing by providing a means to transport information that cannot be (easily) extracted from the model itself. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelEventListener.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelEventListener.java new file mode 100644 index 0000000000..361fd4c037 --- /dev/null +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelEventListener.java @@ -0,0 +1,11 @@ +package org.apache.maven.model.building; + +import org.apache.maven.model.Model; + + +public interface ModelEventListener { + + void fire(Model model); + +} + diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/ModelProblem.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java similarity index 99% rename from maven-model-builder/src/main/java/org/apache/maven/model/ModelProblem.java rename to maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java index f12a330f2a..a64adb0c15 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/ModelProblem.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java @@ -1,4 +1,4 @@ -package org.apache.maven.model; +package org.apache.maven.model.building; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/ModelSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java similarity index 97% rename from maven-model-builder/src/main/java/org/apache/maven/model/ModelSource.java rename to maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java index 6b3a99d874..5246d790bc 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/ModelSource.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java @@ -1,4 +1,4 @@ -package org.apache.maven.model; +package org.apache.maven.model.building; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/ModelUtils.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelUtils.java similarity index 99% rename from maven-model-builder/src/main/java/org/apache/maven/model/ModelUtils.java rename to maven-model-builder/src/main/java/org/apache/maven/model/building/ModelUtils.java index 528da145f7..a789a87663 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/ModelUtils.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelUtils.java @@ -1,4 +1,4 @@ -package org.apache.maven.model; +package org.apache.maven.model.building; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/UrlModelSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java similarity index 97% rename from maven-model-builder/src/main/java/org/apache/maven/model/UrlModelSource.java rename to maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java index 84482701a7..053254bea6 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/UrlModelSource.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java @@ -1,4 +1,4 @@ -package org.apache.maven.model; +package org.apache.maven.model.building; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java index 26ecbda5db..524c7d2cdc 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java @@ -27,11 +27,11 @@ import java.util.List; import java.util.Map; import org.apache.maven.model.Model; -import org.apache.maven.model.ModelBuildingRequest; import org.apache.maven.model.Plugin; import org.apache.maven.model.PluginContainer; import org.apache.maven.model.ReportPlugin; import org.apache.maven.model.Reporting; +import org.apache.maven.model.building.ModelBuildingRequest; import org.apache.maven.model.merge.MavenModelMerger; import org.codehaus.plexus.component.annotations.Component; diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java index 4885e88248..6693d569f0 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java @@ -20,7 +20,7 @@ package org.apache.maven.model.inheritance; */ import org.apache.maven.model.Model; -import org.apache.maven.model.ModelBuildingRequest; +import org.apache.maven.model.building.ModelBuildingRequest; /** * Handles inheritance of model values. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java index 3b7d240f25..437fbd55ae 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java @@ -20,7 +20,7 @@ package org.apache.maven.model.interpolation; */ import org.apache.maven.model.Model; -import org.apache.maven.model.ModelBuildingRequest; +import org.apache.maven.model.building.ModelBuildingRequest; import org.apache.maven.model.path.PathTranslator; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.interpolation.AbstractValueSource; diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java index 04732c59a1..ded543fecc 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java @@ -20,7 +20,7 @@ package org.apache.maven.model.interpolation; */ import org.apache.maven.model.Model; -import org.apache.maven.model.ModelBuildingRequest; +import org.apache.maven.model.building.ModelBuildingRequest; import java.io.File; diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java index 10904f921c..e68e18b2cf 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java @@ -20,7 +20,7 @@ package org.apache.maven.model.interpolation; */ import org.apache.maven.model.Model; -import org.apache.maven.model.ModelBuildingRequest; +import org.apache.maven.model.building.ModelBuildingRequest; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.interpolation.InterpolationPostProcessor; import org.codehaus.plexus.interpolation.Interpolator; diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultManagementInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultManagementInjector.java index 3cffe4ea03..88c076e0ae 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultManagementInjector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultManagementInjector.java @@ -32,11 +32,11 @@ import org.apache.maven.model.Dependency; import org.apache.maven.model.DependencyManagement; import org.apache.maven.model.Exclusion; import org.apache.maven.model.Model; -import org.apache.maven.model.ModelBuildingRequest; import org.apache.maven.model.Plugin; import org.apache.maven.model.PluginContainer; import org.apache.maven.model.PluginExecution; import org.apache.maven.model.PluginManagement; +import org.apache.maven.model.building.ModelBuildingRequest; import org.apache.maven.model.merge.MavenModelMerger; import org.codehaus.plexus.component.annotations.Component; diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/ManagementInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/management/ManagementInjector.java index b663145492..a627c95729 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/management/ManagementInjector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/management/ManagementInjector.java @@ -20,7 +20,7 @@ package org.apache.maven.model.management; */ import org.apache.maven.model.Model; -import org.apache.maven.model.ModelBuildingRequest; +import org.apache.maven.model.building.ModelBuildingRequest; /** * Handles injection of plugin/dependency management into the model. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java index 769d596c8f..73f4544037 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java @@ -28,8 +28,8 @@ import java.util.Map; import org.apache.maven.model.Build; import org.apache.maven.model.Dependency; import org.apache.maven.model.Model; -import org.apache.maven.model.ModelBuildingRequest; import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelBuildingRequest; import org.apache.maven.model.merge.MavenModelMerger; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.util.StringUtils; diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java index c061c84645..7a8894d998 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java @@ -20,7 +20,7 @@ package org.apache.maven.model.normalization; */ import org.apache.maven.model.Model; -import org.apache.maven.model.ModelBuildingRequest; +import org.apache.maven.model.building.ModelBuildingRequest; /** * Handles normalization of a model. In this context, normalization is the process of producing a canonical diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java index 3aa35ea958..7701e3b333 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java @@ -25,9 +25,9 @@ import java.util.List; import org.apache.maven.model.Build; import org.apache.maven.model.Model; -import org.apache.maven.model.ModelBuildingRequest; import org.apache.maven.model.Reporting; import org.apache.maven.model.Resource; +import org.apache.maven.model.building.ModelBuildingRequest; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java index e63c329040..1ba2509169 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java @@ -22,7 +22,7 @@ package org.apache.maven.model.path; import java.io.File; import org.apache.maven.model.Model; -import org.apache.maven.model.ModelBuildingRequest; +import org.apache.maven.model.building.ModelBuildingRequest; /** * Resolves relative paths of a model against a specific base directory. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java index 5805fc68fd..c99d91e7f3 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java @@ -21,12 +21,12 @@ package org.apache.maven.model.plugin; import org.apache.maven.model.Build; import org.apache.maven.model.Model; -import org.apache.maven.model.ModelBuildingRequest; import org.apache.maven.model.Plugin; import org.apache.maven.model.PluginExecution; import org.apache.maven.model.ReportPlugin; import org.apache.maven.model.ReportSet; import org.apache.maven.model.Reporting; +import org.apache.maven.model.building.ModelBuildingRequest; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.util.xml.Xpp3Dom; diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java index 98d66848f0..b8bba03958 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java @@ -20,7 +20,7 @@ package org.apache.maven.model.plugin; */ import org.apache.maven.model.Model; -import org.apache.maven.model.ModelBuildingRequest; +import org.apache.maven.model.building.ModelBuildingRequest; /** * Handles expansion of general plugin configuration into individual executions and report sets. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java index d696c4bd74..1e6bebad69 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java @@ -30,12 +30,12 @@ import org.apache.maven.model.Build; import org.apache.maven.model.BuildBase; import org.apache.maven.model.Model; import org.apache.maven.model.ModelBase; -import org.apache.maven.model.ModelBuildingRequest; import org.apache.maven.model.Plugin; import org.apache.maven.model.PluginContainer; import org.apache.maven.model.Profile; import org.apache.maven.model.ReportPlugin; import org.apache.maven.model.Reporting; +import org.apache.maven.model.building.ModelBuildingRequest; import org.apache.maven.model.merge.MavenModelMerger; import org.codehaus.plexus.component.annotations.Component; diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java index b76846d698..19f37097f8 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java @@ -20,8 +20,8 @@ package org.apache.maven.model.profile; */ import org.apache.maven.model.Model; -import org.apache.maven.model.ModelBuildingRequest; import org.apache.maven.model.Profile; +import org.apache.maven.model.building.ModelBuildingRequest; /** * Handles profile injection into the model. diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java b/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java index cce54632d8..6488d993bc 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java @@ -19,9 +19,9 @@ package org.apache.maven.model.resolution; * under the License. */ -import org.apache.maven.model.ModelBuilder; -import org.apache.maven.model.ModelSource; import org.apache.maven.model.Repository; +import org.apache.maven.model.building.ModelBuilder; +import org.apache.maven.model.building.ModelSource; /** * Resolves a POM from its coordinates. During the build process, the {@link ModelBuilder} will add any relevant diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java index 0296d57db1..c4cf6d2ced 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java @@ -28,7 +28,6 @@ import org.apache.maven.model.Build; import org.apache.maven.model.Dependency; import org.apache.maven.model.DependencyManagement; import org.apache.maven.model.Model; -import org.apache.maven.model.ModelBuildingRequest; import org.apache.maven.model.Parent; import org.apache.maven.model.Plugin; import org.apache.maven.model.Profile; @@ -36,6 +35,7 @@ import org.apache.maven.model.ReportPlugin; import org.apache.maven.model.Reporting; import org.apache.maven.model.Repository; import org.apache.maven.model.Resource; +import org.apache.maven.model.building.ModelBuildingRequest; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.util.StringUtils; diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java index 206c761b3f..d6087eb39d 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java @@ -20,7 +20,7 @@ package org.apache.maven.model.validation; */ import org.apache.maven.model.Model; -import org.apache.maven.model.ModelBuildingRequest; +import org.apache.maven.model.building.ModelBuildingRequest; /** * Checks the model for missing or invalid values. diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java index 738e7fb3a1..9f4f208fef 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java @@ -22,9 +22,9 @@ package org.apache.maven.model.validation; import java.io.InputStream; import java.util.List; -import org.apache.maven.model.DefaultModelBuildingRequest; import org.apache.maven.model.Model; -import org.apache.maven.model.ModelBuildingRequest; +import org.apache.maven.model.building.DefaultModelBuildingRequest; +import org.apache.maven.model.building.ModelBuildingRequest; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.codehaus.plexus.PlexusTestCase;