[MNG-6190] maven-resolver-provider's DefaultArtifactDescriptorReader has mismatched constructor and initService methods
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/27ab7503 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/27ab7503 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/27ab7503 Branch: refs/heads/MNG-6069 Commit: 27ab7503a7196a40b5ed1007181c82cdcf11e03c Parents: 13adc1b Author: Christian Schulte <schu...@apache.org> Authored: Tue Mar 21 04:06:02 2017 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Tue Mar 21 19:16:44 2017 +0100 ---------------------------------------------------------------------- .../internal/DefaultArtifactDescriptorReader.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/27ab7503/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java ---------------------------------------------------------------------- diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java index 1df1c12..82e1284 100644 --- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java +++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java @@ -111,8 +111,9 @@ public class DefaultArtifactDescriptorReader @Inject DefaultArtifactDescriptorReader( RemoteRepositoryManager remoteRepositoryManager, VersionResolver versionResolver, - ArtifactResolver artifactResolver, ModelBuilder modelBuilder, - RepositoryEventDispatcher repositoryEventDispatcher, LoggerFactory loggerFactory ) + VersionRangeResolver versionRangeResolver, ArtifactResolver artifactResolver, + ModelBuilder modelBuilder, RepositoryEventDispatcher repositoryEventDispatcher, + LoggerFactory loggerFactory ) { setRemoteRepositoryManager( remoteRepositoryManager ); setVersionResolver( versionResolver ); @@ -124,17 +125,17 @@ public class DefaultArtifactDescriptorReader public void initService( ServiceLocator locator ) { - setLoggerFactory( locator.getService( LoggerFactory.class ) ); setRemoteRepositoryManager( locator.getService( RemoteRepositoryManager.class ) ); setVersionResolver( locator.getService( VersionResolver.class ) ); setVersionRangeResolver( locator.getService( VersionRangeResolver.class ) ); setArtifactResolver( locator.getService( ArtifactResolver.class ) ); - setRepositoryEventDispatcher( locator.getService( RepositoryEventDispatcher.class ) ); modelBuilder = locator.getService( ModelBuilder.class ); if ( modelBuilder == null ) { setModelBuilder( new DefaultModelBuilderFactory().newInstance() ); } + setRepositoryEventDispatcher( locator.getService( RepositoryEventDispatcher.class ) ); + setLoggerFactory( locator.getService( LoggerFactory.class ) ); } public DefaultArtifactDescriptorReader setLoggerFactory( LoggerFactory loggerFactory )