You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2016/06/17 20:34:52 UTC
svn commit: r1748892 - in /maven/plugins/trunk/maven-assembly-plugin/src:
main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java
test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java
Author: rfscholte
Date: Fri Jun 17 20:34:52 2016
New Revision: 1748892
URL: http://svn.apache.org/viewvc?rev=1748892&view=rev
Log:
With little adjustment to test no need to have 2 contructors
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java?rev=1748892&r1=1748891&r2=1748892&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java Fri Jun 17 20:34:52 2016
@@ -19,6 +19,15 @@ package org.apache.maven.plugins.assembl
* under the License.
*/
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -44,18 +53,8 @@ import org.apache.maven.shared.artifact.
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.StringUtils;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
/**
* @author jdcasey
* @version $Id$
@@ -65,28 +64,12 @@ public class DefaultDependencyResolver
extends AbstractLogEnabled
implements DependencyResolver
{
-
@Requirement
private RepositorySystem resolver;
-
@Requirement
private ArtifactFactory factory;
- @SuppressWarnings( "UnusedDeclaration" )
- public DefaultDependencyResolver()
- {
- // for plexus init
- }
-
- protected DefaultDependencyResolver( final RepositorySystem resolver, final ArtifactFactory factory,
- final Logger logger )
- {
- this.resolver = resolver;
- this.factory = factory;
- enableLogging( logger );
- }
-
@Override
public Map<DependencySet, Set<Artifact>> resolveDependencySets( final Assembly assembly, ModuleSet moduleSet,
final AssemblerConfigurationSource configSource,
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java?rev=1748892&r1=1748891&r2=1748892&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java Fri Jun 17 20:34:52 2016
@@ -41,7 +41,6 @@ import org.apache.maven.plugins.assembly
import org.apache.maven.plugins.assembly.model.Repository;
import org.apache.maven.plugins.assembly.resolved.AssemblyId;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
@@ -57,9 +56,7 @@ public class DefaultDependencyResolverTe
private ArtifactRepositoryLayout layout;
- private RepositorySystem resolver;
-
- private ConsoleLogger logger;
+ private DefaultDependencyResolver resolver;
@Override
public void setUp()
@@ -67,11 +64,11 @@ public class DefaultDependencyResolverTe
{
super.setUp();
- resolver = lookup( RepositorySystem.class );
+ resolver = (DefaultDependencyResolver) lookup( DependencyResolver.class );
+
factory = lookup( ArtifactFactory.class );
repoFactory = lookup( ArtifactRepositoryFactory.class );
layout = lookup( ArtifactRepositoryLayout.class, "default" );
- logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
}
public void test_getDependencySetResolutionRequirements()
@@ -90,7 +87,7 @@ public class DefaultDependencyResolverTe
final ResolutionManagementInfo info = new ResolutionManagementInfo( project );
final Assembly assembly = new Assembly();
- new DefaultDependencyResolver( resolver, factory, logger ).updateDependencySetResolutionRequirements( ds1, info,
+ resolver.updateDependencySetResolutionRequirements( ds1, info,
AssemblyId.createAssemblyId(
assembly ),
project );
@@ -185,7 +182,6 @@ public class DefaultDependencyResolverTe
mm.replayAll();
- final DefaultDependencyResolver resolver = new DefaultDependencyResolver( this.resolver, factory, logger );
resolver.enableLogging( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
final Assembly assembly = new Assembly();
@@ -241,7 +237,7 @@ public class DefaultDependencyResolverTe
assembly.setRepositories( repositories );
final ResolutionManagementInfo info = new ResolutionManagementInfo( project );
- new DefaultDependencyResolver( resolver, factory, logger ).updateRepositoryResolutionRequirements( assembly,
+ resolver.updateRepositoryResolutionRequirements( assembly,
info );
assertTrue( info.isResolutionRequired() );
@@ -281,8 +277,7 @@ public class DefaultDependencyResolverTe
project.setRemoteArtifactRepositories( projectRepos );
final List<ArtifactRepository> aggregated =
- new DefaultDependencyResolver( resolver, factory, logger ).aggregateRemoteArtifactRepositories(
- externalRepos, Collections.singleton( project ) );
+ resolver.aggregateRemoteArtifactRepositories( externalRepos, Collections.singleton( project ) );
assertRepositoryWithId( er1.getId(), aggregated, true );
assertRepositoryWithId( er2.getId(), aggregated, true );