[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/b65d6d34 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b65d6d34 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b65d6d34 Branch: refs/heads/MNG-6169 Commit: b65d6d34b82d57fe7bb69a49caa8850b803c0ef3 Parents: 04d540c Author: Christian Schulte <schu...@apache.org> Authored: Tue Mar 21 04:06:02 2017 +0100 Committer: Michael Osipov <micha...@apache.org> Committed: Sun Apr 2 00:21:12 2017 +0200 ---------------------------------------------------------------------- .../internal/DefaultArtifactDescriptorReader.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/b65d6d34/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 )
