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 2015/08/08 14:36:04 UTC
svn commit: r1694794 - in /maven/plugins/trunk/maven-dependency-plugin/src:
main/java/org/apache/maven/plugins/dependency/
main/java/org/apache/maven/plugins/dependency/fromDependencies/
main/java/org/apache/maven/plugins/dependency/utils/translators/ ...
Author: rfscholte
Date: Sat Aug 8 12:36:03 2015
New Revision: 1694794
URL: http://svn.apache.org/r1694794
Log:
Remove ArtifactFactory, all now resolved by using ArtifactCoordinate
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ArtifactTranslator.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ClassifierTypeTranslator.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java?rev=1694794&r1=1694793&r2=1694794&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java Sat Aug 8 12:36:03 2015
@@ -25,7 +25,6 @@ import java.lang.reflect.Field;
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -52,12 +51,6 @@ public abstract class AbstractDependency
extends AbstractMojo
{
/**
- * Used to look up Artifacts in the remote repository.
- */
- @Component
- private ArtifactFactory factory;
-
- /**
* To look up Archiver/UnArchiver implementations
*/
@Component
@@ -293,22 +286,6 @@ public abstract class AbstractDependency
}
/**
- * @return Returns the factory.
- */
- public ArtifactFactory getFactory()
- {
- return this.factory;
- }
-
- /**
- * @param factory The factory to set.
- */
- public void setFactory( ArtifactFactory factory )
- {
- this.factory = factory;
- }
-
- /**
* @return Returns the project.
*/
public MavenProject getProject()
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java?rev=1694794&r1=1694793&r2=1694794&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java Sat Aug 8 12:36:03 2015
@@ -21,6 +21,7 @@ package org.apache.maven.plugins.depende
import java.io.File;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
@@ -38,6 +39,7 @@ import org.apache.maven.project.MavenPro
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.shared.artifact.ArtifactCoordinate;
import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException;
import org.apache.maven.shared.artifact.filter.collection.ArtifactIdFilter;
import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
@@ -398,9 +400,8 @@ public abstract class AbstractDependency
if ( StringUtils.isNotEmpty( classifier ) )
{
ArtifactTranslator translator =
- new ClassifierTypeTranslator( this.classifier, this.type, this.getFactory(), repositoryManager,
- session.getProjectBuildingRequest() );
- artifacts = translator.translate( artifacts, getLog() );
+ new ClassifierTypeTranslator( this.classifier, this.type );
+ Collection<ArtifactCoordinate> coordinates = translator.translate( artifacts, getLog() );
status = filterMarkedDependencies( artifacts );
@@ -408,7 +409,7 @@ public abstract class AbstractDependency
artifacts = status.getResolvedDependencies();
// resolve the rest of the artifacts
- resolvedArtifacts = resolve( artifacts, stopOnFailure );
+ resolvedArtifacts = resolve( new HashSet<ArtifactCoordinate>( coordinates ), stopOnFailure );
// calculate the artifacts not resolved.
unResolvedArtifacts.addAll( artifacts );
@@ -456,28 +457,28 @@ public abstract class AbstractDependency
}
- protected Set<Artifact> resolve( Set<Artifact> artifacts, boolean stopOnFailure )
+ protected Set<Artifact> resolve( Set<ArtifactCoordinate> coordinates, boolean stopOnFailure )
throws MojoExecutionException
{
ProjectBuildingRequest buildingRequest =
new DefaultProjectBuildingRequest( session.getProjectBuildingRequest() );
Set<Artifact> resolvedArtifacts = new HashSet<Artifact>();
- for ( Artifact artifact : artifacts )
+ for ( ArtifactCoordinate coordinate : coordinates )
{
try
{
- artifact = artifactResolver.resolveArtifact( buildingRequest, artifact ).getArtifact();
+ Artifact artifact = artifactResolver.resolveArtifact( buildingRequest, coordinate ).getArtifact();
resolvedArtifacts.add( artifact );
}
catch ( ArtifactResolverException ex )
{
// an error occurred during resolution, log it an continue
- getLog().debug( "error resolving: " + artifact.getId() );
+ getLog().debug( "error resolving: " + coordinate );
getLog().debug( ex );
if ( stopOnFailure )
{
- throw new MojoExecutionException( "error resolving: " + artifact.getId(), ex );
+ throw new MojoExecutionException( "error resolving: " + coordinate, ex );
}
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ArtifactTranslator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ArtifactTranslator.java?rev=1694794&r1=1694793&r2=1694794&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ArtifactTranslator.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ArtifactTranslator.java Sat Aug 8 12:36:03 2015
@@ -23,6 +23,7 @@ import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.shared.artifact.ArtifactCoordinate;
/**
* @author <a href="mailto:brianf@apache.org">Brian Fox</a>
@@ -30,5 +31,5 @@ import org.apache.maven.plugin.logging.L
*/
public interface ArtifactTranslator
{
- Set<Artifact> translate( Set<Artifact> artifacts, Log log );
+ Set<ArtifactCoordinate> translate( Set<Artifact> artifacts, Log log );
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ClassifierTypeTranslator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ClassifierTypeTranslator.java?rev=1694794&r1=1694793&r2=1694794&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ClassifierTypeTranslator.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ClassifierTypeTranslator.java Sat Aug 8 12:36:03 2015
@@ -19,15 +19,13 @@ package org.apache.maven.plugins.depende
* under the License.
*/
-import java.io.File;
import java.util.HashSet;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.repository.RepositoryManager;
+import org.apache.maven.shared.artifact.ArtifactCoordinate;
+import org.apache.maven.shared.artifact.DefaultArtifactCoordinate;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -42,27 +40,15 @@ public class ClassifierTypeTranslator
private String type;
- private ArtifactFactory factory;
-
- private RepositoryManager repositoryManager;
-
- ProjectBuildingRequest buildingRequest;
-
/**
*
* @param theClassifier
* @param theType
- * @param theFactory
- * @param theRepository required when using system scoped artifacts
*/
- public ClassifierTypeTranslator( String theClassifier, String theType, ArtifactFactory theFactory,
- RepositoryManager theRepository, ProjectBuildingRequest buildingRequest )
+ public ClassifierTypeTranslator( String theClassifier , String theType )
{
this.classifier = theClassifier;
this.type = theType;
- this.factory = theFactory;
- this.repositoryManager = theRepository;
- this.buildingRequest = buildingRequest;
}
/*
@@ -72,12 +58,12 @@ public class ClassifierTypeTranslator
* org.apache.maven.plugin.logging.Log)
*/
@Override
- public Set<Artifact> translate( Set<Artifact> artifacts, Log log )
+ public Set<ArtifactCoordinate> translate( Set<Artifact> artifacts, Log log )
{
- Set<Artifact> results;
+ Set<ArtifactCoordinate> results;
log.debug( "Translating Artifacts using Classifier: " + this.classifier + " and Type: " + this.type );
- results = new HashSet<Artifact>();
+ results = new HashSet<ArtifactCoordinate>();
for ( Artifact artifact : artifacts )
{
// this translator must pass both type and classifier here so we
@@ -103,23 +89,30 @@ public class ClassifierTypeTranslator
useClassifier = artifact.getClassifier();
}
- // Create a new artifact
- Artifact newArtifact = factory.createArtifactWithClassifier( artifact.getGroupId(), artifact
- .getArtifactId(), artifact.getVersion(), useType, useClassifier );
-
- // note the new artifacts will always have the scope set to null. We
- // should
- // reset it here so that it will pass other filters if needed
- newArtifact.setScope( artifact.getScope() );
+ DefaultArtifactCoordinate coordinate = new DefaultArtifactCoordinate();
+ coordinate.setGroupId( artifact.getGroupId() );
+ coordinate.setArtifactId( artifact.getArtifactId() );
+ coordinate.setVersion( artifact.getVersion() );
+ coordinate.setClassifier( useClassifier );
+ coordinate.setType( useType );
- if ( Artifact.SCOPE_SYSTEM.equals( newArtifact.getScope() ) )
- {
- File baseDir = repositoryManager.getLocalRepositoryBasedir( buildingRequest );
- String path = repositoryManager.getPathForLocalArtifact( buildingRequest, newArtifact );
- newArtifact.setFile( new File( baseDir, path ) );
- }
+// // Create a new artifact
+// Artifact newArtifact = factory.createArtifactWithClassifier( artifact.getGroupId(), artifact
+// .getArtifactId(), artifact.getVersion(), useType, useClassifier );
+//
+// // note the new artifacts will always have the scope set to null. We
+// // should
+// // reset it here so that it will pass other filters if needed
+// newArtifact.setScope( artifact.getScope() );
+//
+// if ( Artifact.SCOPE_SYSTEM.equals( newArtifact.getScope() ) )
+// {
+// File baseDir = repositoryManager.getLocalRepositoryBasedir( buildingRequest );
+// String path = repositoryManager.getPathForLocalArtifact( buildingRequest, newArtifact );
+// newArtifact.setFile( new File( baseDir, path ) );
+// }
- results.add( newArtifact );
+ results.add( coordinate );
}
return results;
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java?rev=1694794&r1=1694793&r2=1694794&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java Sat Aug 8 12:36:03 2015
@@ -31,7 +31,6 @@ import org.apache.maven.execution.MavenS
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
-import org.apache.maven.plugins.dependency.testUtils.DependencyTestUtils;
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
import org.apache.maven.project.MavenProject;
import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
@@ -61,7 +60,6 @@ public class TestCopyMojo
assertNotNull( mojo.getProject() );
// MavenProject project = mojo.getProject();
// init classifier things
- mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
MavenSession session = newMavenSession( mojo.getProject() );
setVariableValueToObject( mojo, "session", session );
@@ -542,9 +540,6 @@ public class TestCopyMojo
list.add( item );
mojo.setArtifactItems( list );
- // init classifier things
- mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
-
try
{
mojo.execute();
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java?rev=1694794&r1=1694793&r2=1694794&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java Sat Aug 8 12:36:03 2015
@@ -25,17 +25,11 @@ import java.util.Collection;
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.LegacyLocalRepositoryManager;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
-import org.apache.maven.plugins.dependency.testUtils.DependencyTestUtils;
import org.apache.maven.plugins.dependency.utils.markers.UnpackFileMarkerHandler;
-import org.apache.maven.plugin.testing.ArtifactStubFactory;
-import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
-import org.sonatype.aether.RepositorySystem;
import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
import org.sonatype.aether.util.DefaultRepositorySystemSession;
@@ -77,7 +71,6 @@ public class TestIncludeExcludeUnpackMoj
mojo.setArchiverManager( (ArchiverManager) lookup( ArchiverManager.ROLE ) );
- mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
mojo.setMarkersDirectory( new File( this.testDir, "markers" ) );
mojo.setArtifactItems( list );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java?rev=1694794&r1=1694793&r2=1694794&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java Sat Aug 8 12:36:03 2015
@@ -34,7 +34,6 @@ import org.apache.maven.model.Dependency
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
-import org.apache.maven.plugins.dependency.testUtils.DependencyTestUtils;
import org.apache.maven.plugins.dependency.utils.markers.UnpackFileMarkerHandler;
import org.apache.maven.project.MavenProject;
import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
@@ -73,7 +72,6 @@ public class TestUnpackMojo
stubFactory.setSrcFile( new File( getBasedir() + File.separatorChar
+ "target/test-classes/unit/unpack-dependencies-test/test.txt" ) );
- mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
mojo.setUseJvmChmod( true );
MavenSession session = newMavenSession( mojo.getProject() );
@@ -385,9 +383,6 @@ public class TestUnpackMojo
list.add( item );
mojo.setArtifactItems( list );
- // init classifier things
- mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
-
try
{
mojo.execute();
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java?rev=1694794&r1=1694793&r2=1694794&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java Sat Aug 8 12:36:03 2015
@@ -30,7 +30,6 @@ import org.apache.maven.execution.MavenS
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
-import org.apache.maven.plugins.dependency.testUtils.DependencyTestUtils;
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
import org.apache.maven.plugins.dependency.utils.markers.DefaultFileMarkerHandler;
import org.apache.maven.project.MavenProject;
@@ -452,9 +451,6 @@ public class TestCopyDependenciesMojo
}
- // init classifier things
- mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
-
mojo.execute();
Set<Artifact> artifacts = mojo.getProject().getArtifacts();
@@ -503,9 +499,6 @@ public class TestCopyDependenciesMojo
mojo.classifier = "jdk";
mojo.type = "java-sources";
- // init classifier things
- mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
-
try
{
mojo.execute();
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java?rev=1694794&r1=1694793&r2=1694794&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java Sat Aug 8 12:36:03 2015
@@ -26,6 +26,7 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
@@ -290,6 +291,8 @@ public class TestCopyDependenciesMojo2
mojo.useRepositoryLayout = true;
mojo.execute();
+ ArtifactFactory artifactFactory = lookup( ArtifactFactory.class );
+
File outputDirectory = mojo.outputDirectory;
ArtifactRepository targetRepository = new MavenArtifactRepository(
"local",
@@ -306,9 +309,9 @@ public class TestCopyDependenciesMojo2
if ( ! artifact.getBaseVersion().equals( artifact.getVersion() ) )
{
Artifact baseArtifact =
- mojo.getFactory().createArtifact( artifact.getGroupId(), artifact.getArtifactId(),
- artifact.getBaseVersion(), artifact.getScope(),
- artifact.getType() );
+ artifactFactory.createArtifact( artifact.getGroupId(), artifact.getArtifactId(),
+ artifact.getBaseVersion(), artifact.getScope(),
+ artifact.getType() );
assertArtifactExists( baseArtifact, targetRepository );
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java?rev=1694794&r1=1694793&r2=1694794&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java Sat Aug 8 12:36:03 2015
@@ -519,7 +519,6 @@ public class TestUnpackDependenciesMojo
{
mojo.classifier = testClassifier;
mojo.type = testType;
- mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
for (Artifact artifact : mojo.getProject().getArtifacts())
{
@@ -566,8 +565,6 @@ public class TestUnpackDependenciesMojo
{
mojo.classifier = "jdk";
mojo.type = "java-sources";
- // init classifier things
- mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
try
{
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java?rev=1694794&r1=1694793&r2=1694794&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java Sat Aug 8 12:36:03 2015
@@ -31,13 +31,14 @@ import org.apache.maven.artifact.handler
import org.apache.maven.artifact.handler.manager.DefaultArtifactHandlerManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
-import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugin.testing.SilentLog;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
+import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
+import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.shared.artifact.ArtifactCoordinate;
import org.apache.maven.shared.artifact.repository.RepositoryManager;
import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
import org.sonatype.aether.util.DefaultRepositorySystemSession;
@@ -102,19 +103,19 @@ public class TestClassifierTypeTranslato
{
String type = "zip";
- ArtifactTranslator at = new ClassifierTypeTranslator( classifier, type, artifactFactory, repoManager, buildingRequest );
- Set<Artifact> results = at.translate( artifacts, log );
+ ArtifactTranslator at = new ClassifierTypeTranslator( classifier, type );
+ Set<ArtifactCoordinate> results = at.translate( artifacts, log );
for ( Artifact artifact : artifacts )
{
- Iterator<Artifact> resultIter = results.iterator();
+ Iterator<ArtifactCoordinate> resultIter = results.iterator();
boolean found = false;
while (resultIter.hasNext())
{
- Artifact translatedArtifact = resultIter.next();
+ ArtifactCoordinate translatedArtifact = resultIter.next();
if (artifact.getArtifactId().equals(translatedArtifact.getArtifactId())
&& artifact.getGroupId().equals(translatedArtifact.getGroupId())
- && artifact.getScope().equals(translatedArtifact.getScope()))
+ /*&& artifact.getScope().equals(translatedArtifact.getScope())*/)
{
// classifier is null, should be the same as the artifact
assertEquals( artifact.getClassifier(), translatedArtifact.getClassifier() );
@@ -142,19 +143,19 @@ public class TestClassifierTypeTranslato
{
String classifier = "jdk5";
- ArtifactTranslator at = new ClassifierTypeTranslator( classifier, type, artifactFactory, repoManager, buildingRequest );
- Set<Artifact> results = at.translate( artifacts, log );
+ ArtifactTranslator at = new ClassifierTypeTranslator( classifier, type );
+ Set<ArtifactCoordinate> results = at.translate( artifacts, log );
for ( Artifact artifact : artifacts )
{
- Iterator<Artifact> resultIter = results.iterator();
+ Iterator<ArtifactCoordinate> resultIter = results.iterator();
boolean found = false;
while ( !found && resultIter.hasNext() )
{
- Artifact translatedArtifact = resultIter.next();
+ ArtifactCoordinate translatedArtifact = resultIter.next();
if ( artifact.getArtifactId() == translatedArtifact.getArtifactId()
&& artifact.getGroupId() == translatedArtifact.getGroupId()
- && artifact.getScope() == translatedArtifact.getScope() )
+ /*&& artifact.getScope() == translatedArtifact.getScope()*/ )
{
// classifier is null, should be the same as the artifact
assertEquals( classifier, translatedArtifact.getClassifier() );
@@ -172,19 +173,19 @@ public class TestClassifierTypeTranslato
{
String classifier = "jdk14";
String type = "sources";
- ArtifactTranslator at = new ClassifierTypeTranslator( classifier, type, artifactFactory, repoManager, buildingRequest );
- Set<Artifact> results = at.translate( artifacts, log );
+ ArtifactTranslator at = new ClassifierTypeTranslator( classifier, type );
+ Set<ArtifactCoordinate> results = at.translate( artifacts, log );
for ( Artifact artifact : artifacts )
{
- Iterator<Artifact> resultIter = results.iterator();
+ Iterator<ArtifactCoordinate> resultIter = results.iterator();
boolean found = false;
while ( !found && resultIter.hasNext() )
{
- Artifact translatedArtifact = resultIter.next();
+ ArtifactCoordinate translatedArtifact = resultIter.next();
if ( artifact.getArtifactId() == translatedArtifact.getArtifactId()
&& artifact.getGroupId() == translatedArtifact.getGroupId()
- && artifact.getScope() == translatedArtifact.getScope() )
+ /*&& artifact.getScope() == translatedArtifact.getScope()*/ )
{
assertEquals( translatedArtifact.getClassifier(), classifier );
assertEquals( translatedArtifact.getType(), type );
@@ -201,7 +202,7 @@ public class TestClassifierTypeTranslato
{
String classifier = "class";
String type = "type";
- ClassifierTypeTranslator at = new ClassifierTypeTranslator( classifier, type, artifactFactory, repoManager, buildingRequest );
+ ClassifierTypeTranslator at = new ClassifierTypeTranslator( classifier, type );
assertEquals( classifier, at.getClassifier() );
assertEquals( type, at.getType() );