This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch REMOVE_DEPRECATED in repository https://gitbox.apache.org/repos/asf/maven.git
commit 0fbc3e216f332d5eeb71f309b6f11b9cca779be9 Author: Karl Heinz Marbaise <[email protected]> AuthorDate: Tue Dec 10 18:52:47 2019 +0100 Replace ModelSource with Source cause ModelSource was deprecated. --- .../maven/project/DefaultMavenProjectBuilder.java | 17 ++++++----- .../maven/project/DefaultProjectBuilder.java | 33 +++++++++++----------- .../org/apache/maven/project/ProjectBuilder.java | 8 +++--- .../apache/maven/project/ProjectModelResolver.java | 24 ++++++++-------- .../apache/maven/project/ProjectBuilderTest.java | 26 ++++++++--------- .../maven/model/building/DefaultModelBuilder.java | 26 ++++++++--------- .../building/DefaultModelBuildingRequest.java | 17 +++++------ .../model/building/FilterModelBuildingRequest.java | 15 +++++----- .../maven/model/building/ModelBuildingRequest.java | 19 +++++++------ .../org/apache/maven/model/building/ModelData.java | 13 +++++---- .../apache/maven/model/building/ModelSource2.java | 4 ++- .../maven/model/resolution/ModelResolver.java | 8 +++--- .../repository/internal/DefaultModelResolver.java | 24 ++++++++-------- .../building/DefaultSettingsBuildingRequest.java | 14 +++++---- .../settings/building/SettingsBuildingRequest.java | 10 ++++--- 15 files changed, 132 insertions(+), 126 deletions(-) diff --git a/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java index 7bc5a5c..a2aab42 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java +++ b/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java @@ -19,24 +19,17 @@ package org.apache.maven.project; * under the License. */ -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Properties; - import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.InvalidRepositoryException; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import org.apache.maven.artifact.resolver.ArtifactResolutionException; +import org.apache.maven.building.UrlSource; import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenSession; import org.apache.maven.model.Repository; import org.apache.maven.model.building.ModelBuildingException; import org.apache.maven.model.building.ModelBuildingRequest; -import org.apache.maven.model.building.ModelSource; -import org.apache.maven.model.building.UrlModelSource; import org.apache.maven.plugin.LegacySupport; import org.apache.maven.profiles.ProfileManager; import org.apache.maven.properties.internal.EnvironmentUtils; @@ -45,6 +38,12 @@ import org.apache.maven.wagon.events.TransferListener; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Properties; + /** */ @Component( role = MavenProjectBuilder.class ) @@ -269,7 +268,7 @@ public class DefaultMavenProjectBuilder request.setProcessPlugins( false ); request.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL ); - ModelSource modelSource = new UrlModelSource( getClass().getResource( "standalone.xml" ) ); + UrlSource modelSource = new UrlSource( getClass().getResource( "standalone.xml" ) ); MavenProject project = projectBuilder.build( modelSource, request ).getProject(); project.setExecutionRoot( true ); 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 7e18f1e..2787a21 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 @@ -19,20 +19,6 @@ package org.apache.maven.project; * under the License. */ -import java.io.File; -import java.io.IOException; -import java.util.AbstractMap; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.apache.maven.RepositoryUtils; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.InvalidArtifactRTException; @@ -40,6 +26,7 @@ import org.apache.maven.artifact.InvalidRepositoryException; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.LegacyLocalRepositoryManager; import org.apache.maven.bridge.MavenRepositorySystem; +import org.apache.maven.building.Source; import org.apache.maven.model.Build; import org.apache.maven.model.Dependency; import org.apache.maven.model.DependencyManagement; @@ -76,6 +63,20 @@ import org.eclipse.aether.repository.WorkspaceRepository; import org.eclipse.aether.resolution.ArtifactRequest; import org.eclipse.aether.resolution.ArtifactResult; +import java.io.File; +import java.io.IOException; +import java.util.AbstractMap; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * DefaultProjectBuilder */ @@ -131,14 +132,14 @@ public class DefaultProjectBuilder } @Override - public ProjectBuildingResult build( ModelSource modelSource, ProjectBuildingRequest request ) + public ProjectBuildingResult build(Source modelSource, ProjectBuildingRequest request ) throws ProjectBuildingException { return build( null, modelSource, new InternalConfig( request, null, useGlobalModelCache() ? getModelCache() : null ) ); } - private ProjectBuildingResult build( File pomFile, ModelSource modelSource, InternalConfig config ) + private ProjectBuildingResult build( File pomFile, Source modelSource, InternalConfig config ) throws ProjectBuildingException { ClassLoader oldContextClassLoader = Thread.currentThread().getContextClassLoader(); diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java index 4ac8397..fdc3202 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java @@ -19,12 +19,12 @@ package org.apache.maven.project; * under the License. */ +import org.apache.maven.artifact.Artifact; +import org.apache.maven.building.Source; + import java.io.File; import java.util.List; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.model.building.ModelSource; - /** * Builds in-memory descriptions of projects. */ @@ -77,7 +77,7 @@ public interface ProjectBuilder * * @see org.apache.maven.model.building.ModelSource2 */ - ProjectBuildingResult build( ModelSource modelSource, ProjectBuildingRequest request ) + ProjectBuildingResult build(Source modelSource, ProjectBuildingRequest request ) throws ProjectBuildingException; /** diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java index 24b36dd..a2be5a1 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java @@ -19,19 +19,11 @@ package org.apache.maven.project; * under the License. */ -import java.io.File; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - +import org.apache.maven.building.Source; import org.apache.maven.model.Dependency; import org.apache.maven.model.Parent; 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; @@ -49,6 +41,14 @@ import org.eclipse.aether.resolution.VersionRangeRequest; import org.eclipse.aether.resolution.VersionRangeResolutionException; import org.eclipse.aether.resolution.VersionRangeResult; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + /** * A model resolver to assist building of projects. This resolver gives priority to those repositories that have been @@ -171,7 +171,7 @@ public class ProjectModelResolver return new ProjectModelResolver( this ); } - public ModelSource resolveModel( String groupId, String artifactId, String version ) + public Source resolveModel(String groupId, String artifactId, String version ) throws UnresolvableModelException { File pomFile = null; @@ -203,7 +203,7 @@ public class ProjectModelResolver } @Override - public ModelSource resolveModel( final Parent parent ) + public Source resolveModel(final Parent parent ) throws UnresolvableModelException { try @@ -250,7 +250,7 @@ public class ProjectModelResolver } @Override - public ModelSource resolveModel( final Dependency dependency ) + public Source resolveModel(final Dependency dependency ) throws UnresolvableModelException { try diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java index 4833b00..83dc508 100644 --- a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java @@ -19,27 +19,23 @@ package org.apache.maven.project; * under the License. */ -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.hasKey; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; - -import java.io.File; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Properties; - +import com.google.common.io.Files; import org.apache.maven.AbstractCoreMavenComponentTestCase; import org.apache.maven.artifact.InvalidArtifactRTException; +import org.apache.maven.building.Source; import org.apache.maven.execution.MavenSession; import org.apache.maven.model.building.FileModelSource; import org.apache.maven.model.building.ModelBuildingRequest; -import org.apache.maven.model.building.ModelSource; import org.apache.maven.shared.utils.io.FileUtils; -import com.google.common.io.Files; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Properties; + +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.assertThat; public class ProjectBuilderTest extends AbstractCoreMavenComponentTestCase @@ -74,7 +70,7 @@ public class ProjectBuilderTest MavenSession mavenSession = createMavenSession( pomFile ); ProjectBuildingRequest configuration = new DefaultProjectBuildingRequest(); configuration.setRepositorySession( mavenSession.getRepositorySession() ); - ModelSource modelSource = new FileModelSource( pomFile ); + Source modelSource = new FileModelSource( pomFile ); ProjectBuildingResult result = lookup( org.apache.maven.project.ProjectBuilder.class ).build( modelSource, configuration ); diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java index f981944..1910c4d 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java @@ -23,6 +23,7 @@ package org.apache.maven.model.building; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; import org.apache.maven.artifact.versioning.VersionRange; +import org.apache.maven.building.Source; import org.apache.maven.model.Activation; import org.apache.maven.model.Build; import org.apache.maven.model.Dependency; @@ -63,6 +64,9 @@ import org.codehaus.plexus.interpolation.MapBasedValueSource; import org.codehaus.plexus.interpolation.StringSearchInterpolator; import org.eclipse.sisu.Nullable; +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -75,10 +79,6 @@ import java.util.Map; import java.util.Objects; import java.util.Properties; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; - import static org.apache.maven.model.building.Result.error; import static org.apache.maven.model.building.Result.newResult; @@ -518,7 +518,7 @@ public class DefaultModelBuilder } } - private Model readModel( ModelSource modelSource, File pomFile, ModelBuildingRequest request, + private Model readModel( Source modelSource, File pomFile, ModelBuildingRequest request, DefaultModelProblemCollector problems ) throws ModelBuildingException { @@ -821,8 +821,8 @@ public class DefaultModelBuilder return interpolatedModel; } - private ModelData readParent( Model childModel, ModelSource childSource, ModelBuildingRequest request, - DefaultModelProblemCollector problems ) + private ModelData readParent(Model childModel, Source childSource, ModelBuildingRequest request, + DefaultModelProblemCollector problems ) throws ModelBuildingException { ModelData parentData; @@ -861,7 +861,7 @@ public class DefaultModelBuilder if ( pomFile != null ) { FileModelSource pomSource = new FileModelSource( pomFile ); - ModelSource expectedParentSource = getParentPomFile( childModel, childSource ); + Source expectedParentSource = getParentPomFile( childModel, childSource ); if ( expectedParentSource == null || ( expectedParentSource instanceof ModelSource2 && !pomSource.equals( expectedParentSource ) ) ) @@ -889,12 +889,12 @@ public class DefaultModelBuilder return parentData; } - private ModelData readParentLocally( Model childModel, ModelSource childSource, ModelBuildingRequest request, + private ModelData readParentLocally( Model childModel, Source childSource, ModelBuildingRequest request, DefaultModelProblemCollector problems ) throws ModelBuildingException { final Parent parent = childModel.getParent(); - final ModelSource candidateSource; + final Source candidateSource; final Model candidateModel; final WorkspaceModelResolver resolver = request.getWorkspaceModelResolver(); if ( resolver == null ) @@ -1029,7 +1029,7 @@ public class DefaultModelBuilder return parentData; } - private ModelSource getParentPomFile( Model childModel, ModelSource source ) + private Source getParentPomFile( Model childModel, Source source ) { if ( !( source instanceof ModelSource2 ) ) { @@ -1064,7 +1064,7 @@ public class DefaultModelBuilder ModelProblemUtils.toId( groupId, artifactId, version ), ModelProblemUtils.toSourceHint( childModel ) ) ); - ModelSource modelSource; + Source modelSource; try { modelSource = modelResolver.resolveModel( parent ); @@ -1259,7 +1259,7 @@ public class DefaultModelBuilder // no workspace resolver or workspace resolver returned null (i.e. model not in workspace) if ( importModel == null ) { - final ModelSource importSource; + final Source importSource; try { importSource = modelResolver.resolveModel( groupId, artifactId, version ); diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java index 84a68f7..0b19de3 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java @@ -19,17 +19,18 @@ package org.apache.maven.model.building; * under the License. */ +import org.apache.maven.building.Source; +import org.apache.maven.model.Model; +import org.apache.maven.model.Profile; +import org.apache.maven.model.resolution.ModelResolver; +import org.apache.maven.model.resolution.WorkspaceModelResolver; + import java.io.File; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Properties; -import org.apache.maven.model.Model; -import org.apache.maven.model.Profile; -import org.apache.maven.model.resolution.ModelResolver; -import org.apache.maven.model.resolution.WorkspaceModelResolver; - /** * Collects settings that control building of effective models. * @@ -43,7 +44,7 @@ public class DefaultModelBuildingRequest private File pomFile; - private ModelSource modelSource; + private Source modelSource; private int validationLevel = VALIDATION_LEVEL_STRICT; @@ -118,7 +119,7 @@ public class DefaultModelBuildingRequest } @Override - public synchronized ModelSource getModelSource() + public synchronized Source getModelSource() { if ( modelSource == null && pomFile != null ) { @@ -128,7 +129,7 @@ public class DefaultModelBuildingRequest } @Override - public DefaultModelBuildingRequest setModelSource( ModelSource modelSource ) + public DefaultModelBuildingRequest setModelSource( Source modelSource ) { this.modelSource = modelSource; diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java index a51126f..fc826d2 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java @@ -19,16 +19,17 @@ package org.apache.maven.model.building; * under the License. */ -import java.io.File; -import java.util.Date; -import java.util.List; -import java.util.Properties; - +import org.apache.maven.building.Source; import org.apache.maven.model.Model; import org.apache.maven.model.Profile; import org.apache.maven.model.resolution.ModelResolver; import org.apache.maven.model.resolution.WorkspaceModelResolver; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Properties; + /** * A model building request that delegates all methods invocations to another request, meant for easy transformations by * subclassing. @@ -61,13 +62,13 @@ class FilterModelBuildingRequest } @Override - public ModelSource getModelSource() + public Source getModelSource() { return request.getModelSource(); } @Override - public FilterModelBuildingRequest setModelSource( ModelSource modelSource ) + public FilterModelBuildingRequest setModelSource( Source modelSource ) { request.setModelSource( modelSource ); diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java index dce0c32..41c5355 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java @@ -19,16 +19,17 @@ package org.apache.maven.model.building; * under the License. */ -import java.io.File; -import java.util.Date; -import java.util.List; -import java.util.Properties; - +import org.apache.maven.building.Source; import org.apache.maven.model.Model; import org.apache.maven.model.Profile; import org.apache.maven.model.resolution.ModelResolver; import org.apache.maven.model.resolution.WorkspaceModelResolver; +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Properties; + /** * Collects settings that control the building of effective models. * @@ -83,16 +84,16 @@ public interface ModelBuildingRequest * * @return The source of the POM or {@code null} if not set. */ - ModelSource getModelSource(); + Source getModelSource(); /** - * Sets the source of the POM to process. Eventually, either {@link #setModelSource(ModelSource)} or + * Sets the source of the POM to process. Eventually, either {@link #setModelSource(Source)} or * {@link #setPomFile(File)} must be set. * * @param modelSource The source of the POM to process, may be {@code null}. * @return This request, never {@code null}. */ - ModelBuildingRequest setModelSource( ModelSource modelSource ); + ModelBuildingRequest setModelSource( Source modelSource ); /** * Gets the POM file of the project to build. @@ -106,7 +107,7 @@ public interface ModelBuildingRequest * Sets the POM file of the project to build. Note that providing the path to a POM file via this method will make * the model builder operate in project mode. This mode is meant for effective models that are employed during the * build process of a local project. Hence the effective model will support the notion of a project directory. To - * build the model for a POM from the repository, use {@link #setModelSource(ModelSource)} in combination with a + * build the model for a POM from the repository, use {@link #setModelSource(Source)} in combination with a * {@link FileModelSource} instead. * * @param pomFile The POM file of the project to build the effective model for, may be {@code null} to build the diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java index 1f39ad4..2526822 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java @@ -19,11 +19,12 @@ package org.apache.maven.model.building; * under the License. */ -import java.util.List; - +import org.apache.maven.building.Source; import org.apache.maven.model.Model; import org.apache.maven.model.Profile; +import java.util.List; + /** * 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. @@ -32,7 +33,7 @@ import org.apache.maven.model.Profile; */ class ModelData { - private final ModelSource source; + private final Source source; private Model model; @@ -51,7 +52,7 @@ class ModelData * * @param model The model to wrap, may be {@code null}. */ - ModelData( ModelSource source, Model model ) + ModelData( Source source, Model model ) { this.source = source; this.model = model; @@ -65,7 +66,7 @@ class ModelData * @param artifactId The effective artifact identifier of the model, may be {@code null}. * @param version The effective version of the model, may be {@code null}. */ - ModelData( ModelSource source, Model model, String groupId, String artifactId, String version ) + ModelData( Source source, Model model, String groupId, String artifactId, String version ) { this.source = source; this.model = model; @@ -74,7 +75,7 @@ class ModelData setVersion( version ); } - public ModelSource getSource() + public Source getSource() { return source; } diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource2.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource2.java index 3e123d0..7b95a6f 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource2.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource2.java @@ -19,6 +19,8 @@ package org.apache.maven.model.building; * under the License. */ +import org.apache.maven.building.Source; + import java.net.URI; /** @@ -32,7 +34,7 @@ import java.net.URI; * that the connection to the backing store remains active until request's {@link ModelCache} is discarded or flushed. */ public interface ModelSource2 - extends ModelSource + extends Source { /** * Returns model source identified by a path relative to this model source POM. Implementation <strong>MUST</strong> 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 146d453..01aee4d 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,10 +19,10 @@ package org.apache.maven.model.resolution; * under the License. */ +import org.apache.maven.building.Source; import org.apache.maven.model.Dependency; import org.apache.maven.model.Parent; import org.apache.maven.model.Repository; -import org.apache.maven.model.building.ModelSource; /** * Resolves a POM from its coordinates. During the build process, the @@ -43,7 +43,7 @@ public interface ModelResolver * @return The source of the requested POM, never {@code null}. * @throws UnresolvableModelException If the POM could not be resolved from any configured repository. */ - ModelSource resolveModel( String groupId, String artifactId, String version ) + Source resolveModel(String groupId, String artifactId, String version ) throws UnresolvableModelException; /** @@ -64,7 +64,7 @@ public interface ModelResolver * * @see Parent#clone() */ - ModelSource resolveModel( Parent parent ) + Source resolveModel( Parent parent ) throws UnresolvableModelException; /** @@ -85,7 +85,7 @@ public interface ModelResolver * * @see Dependency#clone() */ - ModelSource resolveModel( Dependency dependency ) + Source resolveModel( Dependency dependency ) throws UnresolvableModelException; /** diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java index 338f4ff..9120be3 100644 --- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java +++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java @@ -19,19 +19,11 @@ package org.apache.maven.repository.internal; * under the License. */ -import java.io.File; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - +import org.apache.maven.building.Source; import org.apache.maven.model.Dependency; import org.apache.maven.model.Parent; 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; @@ -49,6 +41,14 @@ import org.eclipse.aether.resolution.VersionRangeRequest; import org.eclipse.aether.resolution.VersionRangeResolutionException; import org.eclipse.aether.resolution.VersionRangeResult; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + /** * A model resolver to assist building of dependency POMs. This resolver gives priority to those repositories that have * been initially specified and repositories discovered in dependency POMs are recessively merged into the search chain. @@ -160,7 +160,7 @@ class DefaultModelResolver } @Override - public ModelSource resolveModel( String groupId, String artifactId, String version ) + public Source resolveModel(String groupId, String artifactId, String version ) throws UnresolvableModelException { Artifact pomArtifact = new DefaultArtifact( groupId, artifactId, "", "pom", version ); @@ -182,7 +182,7 @@ class DefaultModelResolver } @Override - public ModelSource resolveModel( final Parent parent ) + public Source resolveModel(final Parent parent ) throws UnresolvableModelException { try @@ -230,7 +230,7 @@ class DefaultModelResolver } @Override - public ModelSource resolveModel( final Dependency dependency ) + public Source resolveModel(final Dependency dependency ) throws UnresolvableModelException { try diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java index 4bb691b..8890d91 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java @@ -19,6 +19,8 @@ package org.apache.maven.settings.building; * under the License. */ +import org.apache.maven.building.Source; + import java.io.File; import java.util.Properties; @@ -35,9 +37,9 @@ public class DefaultSettingsBuildingRequest private File userSettingsFile; - private SettingsSource globalSettingsSource; + private Source globalSettingsSource; - private SettingsSource userSettingsSource; + private Source userSettingsSource; private Properties systemProperties; @@ -58,13 +60,13 @@ public class DefaultSettingsBuildingRequest } @Override - public SettingsSource getGlobalSettingsSource() + public Source getGlobalSettingsSource() { return globalSettingsSource; } @Override - public DefaultSettingsBuildingRequest setGlobalSettingsSource( SettingsSource globalSettingsSource ) + public DefaultSettingsBuildingRequest setGlobalSettingsSource( Source globalSettingsSource ) { this.globalSettingsSource = globalSettingsSource; @@ -86,13 +88,13 @@ public class DefaultSettingsBuildingRequest } @Override - public SettingsSource getUserSettingsSource() + public Source getUserSettingsSource() { return userSettingsSource; } @Override - public DefaultSettingsBuildingRequest setUserSettingsSource( SettingsSource userSettingsSource ) + public DefaultSettingsBuildingRequest setUserSettingsSource( Source userSettingsSource ) { this.userSettingsSource = userSettingsSource; diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingRequest.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingRequest.java index 92d87d8..a018cfe 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingRequest.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingRequest.java @@ -19,6 +19,8 @@ package org.apache.maven.settings.building; * under the License. */ +import org.apache.maven.building.Source; + import java.io.File; import java.util.Properties; @@ -51,7 +53,7 @@ public interface SettingsBuildingRequest * * @return The global settings source or {@code null} if none. */ - SettingsSource getGlobalSettingsSource(); + Source getGlobalSettingsSource(); /** * Sets the global settings source. If both user settings and a global settings are given, the user settings take @@ -60,7 +62,7 @@ public interface SettingsBuildingRequest * @param globalSettingsSource The global settings source, may be {@code null} to disable global settings. * @return This request, never {@code null}. */ - SettingsBuildingRequest setGlobalSettingsSource( SettingsSource globalSettingsSource ); + SettingsBuildingRequest setGlobalSettingsSource( Source globalSettingsSource ); /** * Gets the user settings file. @@ -83,7 +85,7 @@ public interface SettingsBuildingRequest * * @return The user settings source or {@code null} if none. */ - SettingsSource getUserSettingsSource(); + Source getUserSettingsSource(); /** * Sets the user settings source. If both user settings and a global settings are given, the user settings take @@ -92,7 +94,7 @@ public interface SettingsBuildingRequest * @param userSettingsSource The user settings source, may be {@code null} to disable user settings. * @return This request, never {@code null}. */ - SettingsBuildingRequest setUserSettingsSource( SettingsSource userSettingsSource ); + SettingsBuildingRequest setUserSettingsSource( Source userSettingsSource ); /** * Gets the system properties to use for interpolation. The system properties are collected from the runtime
