You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/03/13 01:17:41 UTC
svn commit: r1081021 [2/3] - in
/maven/plugins/trunk/maven-dependency-plugin/src:
main/java/org/apache/maven/plugin/dependency/
main/java/org/apache/maven/plugin/dependency/fromConfiguration/
main/java/org/apache/maven/plugin/dependency/resolvers/ main...
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/ArtifactsResolver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/ArtifactsResolver.java?rev=1081021&r1=1081020&r2=1081021&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/ArtifactsResolver.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/ArtifactsResolver.java Sun Mar 13 00:17:39 2011
@@ -21,6 +21,7 @@ package org.apache.maven.plugin.dependen
import java.util.Set;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
@@ -30,6 +31,6 @@ import org.apache.maven.plugin.logging.L
*/
public interface ArtifactsResolver
{
- Set resolve( Set artifacts, Log log )
+ Set<Artifact> resolve( Set<Artifact> artifacts, Log log )
throws MojoExecutionException;
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java?rev=1081021&r1=1081020&r2=1081021&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java Sun Mar 13 00:17:39 2011
@@ -20,7 +20,6 @@ package org.apache.maven.plugin.dependen
*/
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -62,15 +61,13 @@ public class DefaultArtifactsResolver
* @see org.apache.mojo.dependency.utils.resolvers.ArtifactsResolver#resolve(java.util.Set,
* org.apache.maven.plugin.logging.Log)
*/
- public Set resolve( Set artifacts, Log log )
+ public Set<Artifact> resolve( Set<Artifact> artifacts, Log log )
throws MojoExecutionException
{
- Set resolvedArtifacts = new HashSet();
- Iterator iter = artifacts.iterator();
- while ( iter.hasNext() )
+ Set<Artifact> resolvedArtifacts = new HashSet<Artifact>();
+ for ( Artifact artifact : artifacts )
{
- Artifact artifact = (Artifact) iter.next();
try
{
resolver.resolve( artifact, remoteRepositories, local );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/translators/ArtifactTranslator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/translators/ArtifactTranslator.java?rev=1081021&r1=1081020&r2=1081021&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/translators/ArtifactTranslator.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/translators/ArtifactTranslator.java Sun Mar 13 00:17:39 2011
@@ -21,6 +21,7 @@ package org.apache.maven.plugin.dependen
import java.util.Set;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.logging.Log;
/**
@@ -29,5 +30,5 @@ import org.apache.maven.plugin.logging.L
*/
public interface ArtifactTranslator
{
- Set translate( Set artifacts, Log log );
+ Set<Artifact> translate( Set<Artifact> artifacts, Log log );
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/translators/ClassifierTypeTranslator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/translators/ClassifierTypeTranslator.java?rev=1081021&r1=1081020&r2=1081021&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/translators/ClassifierTypeTranslator.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/translators/ClassifierTypeTranslator.java Sun Mar 13 00:17:39 2011
@@ -20,7 +20,6 @@ package org.apache.maven.plugin.dependen
*/
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
@@ -55,16 +54,14 @@ public class ClassifierTypeTranslator
* @see org.apache.mojo.dependency.utils.translators.ArtifactTranslator#translate(java.util.Set,
* org.apache.maven.plugin.logging.Log)
*/
- public Set translate( Set artifacts, Log log )
+ public Set<Artifact> translate( Set<Artifact> artifacts, Log log )
{
- Set results = artifacts;
+ Set<Artifact> results = artifacts;
log.debug( "Translating Artifacts using Classifier: " + this.classifier + " and Type: " + this.type );
- results = new HashSet();
- for ( Iterator i = artifacts.iterator(); i.hasNext(); )
+ results = new HashSet<Artifact>();
+ for ( Artifact artifact : artifacts )
{
- Artifact artifact = (Artifact) i.next();
-
// this translator must pass both type and classifier here so we
// will use the
// base artifact value if null comes in
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestAnalyzeDepMgt.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestAnalyzeDepMgt.java?rev=1081021&r1=1081020&r2=1081021&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestAnalyzeDepMgt.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestAnalyzeDepMgt.java Sun Mar 13 00:17:39 2011
@@ -62,8 +62,8 @@ public class TestAnalyzeDepMgt
stubFactory = new DependencyArtifactStubFactory( new File( "" ), false );
- Set allArtifacts = stubFactory.getMixedArtifacts();
- Set directArtifacts = stubFactory.getClassifiedArtifacts();
+ Set<Artifact> allArtifacts = stubFactory.getMixedArtifacts();
+ Set<Artifact> directArtifacts = stubFactory.getClassifiedArtifacts();
exclusionArtifact = stubFactory.getReleaseArtifact();
@@ -80,7 +80,7 @@ public class TestAnalyzeDepMgt
exclusion.setVersion( "3.0" );
exclusion.addExclusion( ex );
- ArrayList list = new ArrayList();
+ List<Dependency> list = new ArrayList<Dependency>();
list.add( exclusion );
depMgt = new DependencyManagement();
@@ -151,9 +151,9 @@ public class TestAnalyzeDepMgt
assertEquals( 0, mojo.addExclusions( null ).size() );
- ArrayList list = new ArrayList();
+ List<Exclusion> list = new ArrayList<Exclusion>();
list.add( ex );
- Map map = mojo.addExclusions( list );
+ Map<String, Exclusion> map = mojo.addExclusions( list );
assertEquals( 1,map.size() );
assertTrue( map.containsKey( mojo.getExclusionKey( ex ) ) );
@@ -162,13 +162,13 @@ public class TestAnalyzeDepMgt
public void testGetExclusionErrors()
{
- ArrayList list = new ArrayList();
+ List<Exclusion> list = new ArrayList<Exclusion>();
list.add( ex );
// already tested this method so I can trust it.
- Map map = mojo.addExclusions( list );
+ Map<String, Exclusion> map = mojo.addExclusions( list );
- List l = mojo.getExclusionErrors( map, mojo.getProject().getArtifacts() );
+ List<Artifact> l = mojo.getExclusionErrors( map, mojo.getProject().getArtifacts() );
assertEquals( 1, l.size() );
@@ -178,11 +178,11 @@ public class TestAnalyzeDepMgt
public void testGetMismatch()
throws IOException
{
- Map depMgtMap = new HashMap();
+ Map<String, Dependency> depMgtMap = new HashMap<String, Dependency>();
depMgtMap.put( exclusion.getManagementKey(), exclusion );
- Map results = mojo.getMismatch( depMgtMap, mojo.getProject().getArtifacts() );
+ Map<Artifact, Dependency> results = mojo.getMismatch( depMgtMap, mojo.getProject().getArtifacts() );
assertEquals( 1, results.size() );
// the release artifact is used to create the exclusion
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestBuildClasspathMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestBuildClasspathMojo.java?rev=1081021&r1=1081020&r2=1081021&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestBuildClasspathMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestBuildClasspathMojo.java Sun Mar 13 00:17:39 2011
@@ -55,8 +55,8 @@ public class TestBuildClasspathMojo
MavenProject project = mojo.getProject();
// mojo.silent = true;
- Set artifacts = this.stubFactory.getScopedArtifacts();
- Set directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
+ Set<Artifact> artifacts = this.stubFactory.getScopedArtifacts();
+ Set<Artifact> directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
artifacts.addAll( directArtifacts );
project.setArtifacts( artifacts );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java?rev=1081021&r1=1081020&r2=1081021&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java Sun Mar 13 00:17:39 2011
@@ -57,8 +57,8 @@ public class TestCopyDependenciesMojo
assertNotNull( mojo.getProject() );
MavenProject project = mojo.getProject();
- Set artifacts = this.stubFactory.getScopedArtifacts();
- Set directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
+ Set<Artifact> artifacts = this.stubFactory.getScopedArtifacts();
+ Set<Artifact> directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
artifacts.addAll( directArtifacts );
project.setArtifacts( artifacts );
@@ -103,10 +103,10 @@ public class TestCopyDependenciesMojo
throws Exception
{
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
assertTrue( file.exists() );
@@ -122,10 +122,10 @@ public class TestCopyDependenciesMojo
mojo.stripVersion = true;
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, true );
File file = new File( mojo.outputDirectory, fileName );
assertTrue( file.exists() );
@@ -137,11 +137,11 @@ public class TestCopyDependenciesMojo
{
mojo.excludeTransitive = true;
mojo.execute();
- Iterator iter = mojo.project.getDependencyArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getDependencyArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
assertTrue( file.exists() );
@@ -152,14 +152,14 @@ public class TestCopyDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getTypedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.excludeTypes = "jar";
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
assertEquals( artifact.getType().equalsIgnoreCase( "jar" ), !file.exists() );
@@ -170,7 +170,7 @@ public class TestCopyDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getTypedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.includeTypes = "jar";
mojo.excludeTypes = "jar";
@@ -178,10 +178,10 @@ public class TestCopyDependenciesMojo
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
assertFalse( file.exists() );
@@ -193,7 +193,7 @@ public class TestCopyDependenciesMojo
iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
assertEquals( artifact.getType().equalsIgnoreCase( "jar" ), file.exists() );
@@ -205,14 +205,14 @@ public class TestCopyDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getArtifactArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.excludeArtifactIds = "one";
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
assertEquals( artifact.getArtifactId().equals( "one" ), !file.exists() );
@@ -223,7 +223,7 @@ public class TestCopyDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getArtifactArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.includeArtifactIds = "one";
mojo.excludeArtifactIds = "one";
@@ -231,10 +231,10 @@ public class TestCopyDependenciesMojo
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
assertFalse( file.exists() );
@@ -246,7 +246,7 @@ public class TestCopyDependenciesMojo
iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
assertEquals( artifact.getArtifactId().equals( "one" ), file.exists() );
@@ -257,17 +257,17 @@ public class TestCopyDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getGroupIdArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.includeGroupIds = "one";
mojo.excludeGroupIds = "one";
//shouldn't get anything
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
assertFalse( file.exists() );
@@ -279,7 +279,7 @@ public class TestCopyDependenciesMojo
iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
assertEquals( artifact.getGroupId().equals( "one" ), file.exists() );
@@ -291,14 +291,14 @@ public class TestCopyDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getGroupIdArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.excludeGroupIds = "one";
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
@@ -309,14 +309,14 @@ public class TestCopyDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getGroupIdArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.excludeGroupIds = "one,two";
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
@@ -328,14 +328,14 @@ public class TestCopyDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getClassifiedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.excludeClassifiers = "one";
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
assertEquals( artifact.getClassifier().equals( "one" ), !file.exists() );
@@ -346,7 +346,7 @@ public class TestCopyDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getClassifiedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.includeClassifiers = "one";
mojo.excludeClassifiers = "one";
@@ -354,10 +354,10 @@ public class TestCopyDependenciesMojo
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
assertFalse( file.exists() );
@@ -366,10 +366,10 @@ public class TestCopyDependenciesMojo
mojo.excludeClassifiers = "";
mojo.execute();
- iter = mojo.project.getArtifacts().iterator();
+ iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
assertEquals( artifact.getClassifier().equals( "one" ), file.exists() );
@@ -381,14 +381,14 @@ public class TestCopyDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getTypedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.useSubDirectoryPerType = true;
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File folder = DependencyUtil.getFormattedOutputDirectory( false, true, false, false, false, mojo.outputDirectory,
artifact );
@@ -428,10 +428,10 @@ public class TestCopyDependenciesMojo
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String useClassifier = artifact.getClassifier();
String useType = artifact.getType();
@@ -504,7 +504,7 @@ public class TestCopyDependenciesMojo
throws MojoExecutionException, InterruptedException, IOException
{
- Set artifacts = new HashSet();
+ Set<Artifact> artifacts = new HashSet<Artifact>();
Artifact release = stubFactory.getReleaseArtifact();
release.getFile().setLastModified( System.currentTimeMillis() - 2000 );
@@ -535,7 +535,7 @@ public class TestCopyDependenciesMojo
throws MojoExecutionException, InterruptedException, IOException
{
- Set artifacts = new HashSet();
+ Set<Artifact> artifacts = new HashSet<Artifact>();
Artifact release = stubFactory.getReleaseArtifact();
release.getFile().setLastModified( System.currentTimeMillis() - 2000 );
@@ -569,7 +569,7 @@ public class TestCopyDependenciesMojo
throws MojoExecutionException, InterruptedException, IOException
{
- Set artifacts = new HashSet();
+ Set<Artifact> artifacts = new HashSet<Artifact>();
Artifact snap = stubFactory.getSnapshotArtifact();
snap.getFile().setLastModified( System.currentTimeMillis() - 2000 );
@@ -602,7 +602,7 @@ public class TestCopyDependenciesMojo
throws MojoExecutionException, InterruptedException, IOException
{
- Set artifacts = new HashSet();
+ Set<Artifact> artifacts = new HashSet<Artifact>();
Artifact snap = stubFactory.getSnapshotArtifact();
snap.getFile().setLastModified( System.currentTimeMillis() - 2000 );
@@ -644,16 +644,16 @@ public class TestCopyDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getScopedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.excludeScope = "provided";
// mojo.silent = false;
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
assertEquals( artifact.getScope().equals( "provided" ), !file.exists() );
@@ -667,16 +667,16 @@ public class TestCopyDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getScopedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.excludeScope = "system";
// mojo.silent = false;
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
assertEquals( artifact.getScope().equals( "system" ), !file.exists() );
@@ -690,15 +690,15 @@ public class TestCopyDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getScopedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.excludeScope = "compile";
mojo.execute();
ScopeArtifactFilter saf = new ScopeArtifactFilter( mojo.excludeScope );
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
@@ -710,7 +710,7 @@ public class TestCopyDependenciesMojo
throws IOException
{
mojo.project.setArtifacts( stubFactory.getScopedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.excludeScope = "test";
try
@@ -729,15 +729,15 @@ public class TestCopyDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getScopedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.excludeScope = "runtime";
mojo.execute();
ScopeArtifactFilter saf = new ScopeArtifactFilter( mojo.excludeScope );
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
@@ -752,15 +752,15 @@ public class TestCopyDependenciesMojo
mojo.setResolver( new StubArtifactResolver( stubFactory, false, false ) );
mojo.setLocal( new StubArtifactRepository( this.testDir.getAbsolutePath() ) );
- Set set = new HashSet();
+ Set<Artifact> set = new HashSet<Artifact>();
set.add( stubFactory.createArtifact( "org.apache.maven", "maven-artifact", "2.0.7", Artifact.SCOPE_COMPILE ) );
mojo.project.setArtifacts( set );
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName.substring( 0, fileName.length() - 4 ) + ".pom" );
assertTrue( file.exists() );
@@ -773,10 +773,10 @@ public class TestCopyDependenciesMojo
mojo.prependGroupId = true;
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false, true );
File file = new File( mojo.outputDirectory, fileName );
assertTrue( file.exists() );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo2.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo2.java?rev=1081021&r1=1081020&r2=1081021&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo2.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo2.java Sun Mar 13 00:17:39 2011
@@ -61,8 +61,8 @@ public class TestCopyDependenciesMojo2
assertNotNull( mojo.getProject() );
MavenProject project = mojo.getProject();
- Set artifacts = this.stubFactory.getScopedArtifacts();
- Set directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
+ Set<Artifact> artifacts = this.stubFactory.getScopedArtifacts();
+ Set<Artifact> directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
artifacts.addAll( directArtifacts );
project.setArtifacts( artifacts );
@@ -89,15 +89,15 @@ public class TestCopyDependenciesMojo2
throws Exception
{
mojo.project.setArtifacts( stubFactory.getScopedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.includeScope = "compile";
mojo.execute();
ScopeArtifactFilter saf = new ScopeArtifactFilter( mojo.includeScope );
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
@@ -109,16 +109,16 @@ public class TestCopyDependenciesMojo2
throws Exception
{
mojo.project.setArtifacts( stubFactory.getScopedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.includeScope = "test";
mojo.execute();
ScopeArtifactFilter saf = new ScopeArtifactFilter( mojo.includeScope );
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
@@ -130,15 +130,15 @@ public class TestCopyDependenciesMojo2
throws Exception
{
mojo.project.setArtifacts( stubFactory.getScopedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.includeScope = "runtime";
mojo.execute();
ScopeArtifactFilter saf = new ScopeArtifactFilter( mojo.includeScope );
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
@@ -150,14 +150,14 @@ public class TestCopyDependenciesMojo2
throws Exception
{
mojo.project.setArtifacts( stubFactory.getScopedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.includeScope = "provided";
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
assertEquals( Artifact.SCOPE_PROVIDED.equals( artifact.getScope() ), file.exists() );
@@ -168,15 +168,15 @@ public class TestCopyDependenciesMojo2
throws Exception
{
mojo.project.setArtifacts( stubFactory.getScopedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.includeScope = "system";
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File file = new File( mojo.outputDirectory, fileName );
@@ -190,10 +190,10 @@ public class TestCopyDependenciesMojo2
mojo.useSubDirectoryPerArtifact = true;
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File folder = DependencyUtil.getFormattedOutputDirectory( false, false, true, false, false, mojo.outputDirectory,
artifact );
@@ -206,15 +206,15 @@ public class TestCopyDependenciesMojo2
throws Exception
{
mojo.project.setArtifacts( stubFactory.getTypedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.useSubDirectoryPerArtifact = true;
mojo.useSubDirectoryPerType = true;
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File folder = DependencyUtil.getFormattedOutputDirectory( false, true, true, false, false, mojo.outputDirectory,
artifact );
@@ -227,15 +227,15 @@ public class TestCopyDependenciesMojo2
throws Exception
{
mojo.project.setArtifacts( stubFactory.getTypedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.useSubDirectoryPerArtifact = true;
mojo.useSubDirectoryPerScope = true;
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, false );
File folder = DependencyUtil.getFormattedOutputDirectory( true, false, true, false, false, mojo.outputDirectory,
artifact );
@@ -258,8 +258,8 @@ public class TestCopyDependenciesMojo2
"jar",
null);
- mojo.project.getArtifacts().add(expandedSnapshot);
- mojo.project.getDependencyArtifacts().add(expandedSnapshot);
+ mojo.project.getArtifacts().add( expandedSnapshot );
+ mojo.project.getDependencyArtifacts().add( expandedSnapshot );
Artifact pomExpandedSnapshot = createExpandedVersionArtifact( baseVersion,
groupId,
@@ -267,8 +267,8 @@ public class TestCopyDependenciesMojo2
"compile",
"pom",
null);
- mojo.project.getArtifacts().add(pomExpandedSnapshot);
- mojo.project.getDependencyArtifacts().add(pomExpandedSnapshot);
+ mojo.project.getArtifacts().add( pomExpandedSnapshot );
+ mojo.project.getDependencyArtifacts().add( pomExpandedSnapshot );
mojo.useRepositoryLayout = true;
mojo.execute();
@@ -280,10 +280,10 @@ public class TestCopyDependenciesMojo2
new DefaultRepositoryLayout(),
false );
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertArtifactExists( artifact, targetRepository );
if ( ! artifact.getBaseVersion().equals( artifact.getVersion() ) )
@@ -342,10 +342,10 @@ public class TestCopyDependenciesMojo2
mojo.stripVersion = true;
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, true );
File folder = DependencyUtil.getFormattedOutputDirectory( false, false, true, false, true, mojo.outputDirectory,
artifact );
@@ -358,16 +358,16 @@ public class TestCopyDependenciesMojo2
throws Exception
{
mojo.project.setArtifacts( stubFactory.getTypedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.useSubDirectoryPerArtifact = true;
mojo.useSubDirectoryPerType = true;
mojo.stripVersion = true;
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String fileName = DependencyUtil.getFormattedFileName( artifact, true );
File folder = DependencyUtil.getFormattedOutputDirectory( false, true, true, false, true, mojo.outputDirectory,
artifact );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestIncludeExcludeUnpackDependenciesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestIncludeExcludeUnpackDependenciesMojo.java?rev=1081021&r1=1081020&r2=1081021&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestIncludeExcludeUnpackDependenciesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestIncludeExcludeUnpackDependenciesMojo.java Sun Mar 13 00:17:39 2011
@@ -22,6 +22,7 @@ package org.apache.maven.plugin.dependen
import java.io.File;
import java.util.Set;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
public class TestIncludeExcludeUnpackDependenciesMojo
@@ -57,8 +58,8 @@ public class TestIncludeExcludeUnpackDep
assertNotNull( mojo.getProject() );
MavenProject project = mojo.getProject();
- Set artifacts = this.stubFactory.getScopedArtifacts();
- Set directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
+ Set<Artifact> artifacts = this.stubFactory.getScopedArtifacts();
+ Set<Artifact> directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
artifacts.addAll( directArtifacts );
project.setArtifacts( artifacts );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestIncludeExcludeUnpackMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestIncludeExcludeUnpackMojo.java?rev=1081021&r1=1081020&r2=1081021&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestIncludeExcludeUnpackMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestIncludeExcludeUnpackMojo.java Sun Mar 13 00:17:39 2011
@@ -22,7 +22,7 @@ package org.apache.maven.plugin.dependen
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
+import java.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
@@ -63,7 +63,7 @@ public class TestIncludeExcludeUnpackMoj
stubFactory.setSrcFile( new File( getBasedir() + File.separatorChar + PACKED_FILE_PATH ) );
Artifact artifact = stubFactory.createArtifact( "test", "test", "1.0", Artifact.SCOPE_COMPILE, "jar", null );
ArtifactItem item = stubFactory.getArtifactItem( artifact );
- ArrayList list = new ArrayList( 1 );
+ List<ArtifactItem> list = new ArrayList<ArtifactItem>( 1 );
list.add( item );
assertNotNull( mojo );
assertNotNull( mojo.getProject() );
@@ -83,12 +83,11 @@ public class TestIncludeExcludeUnpackMoj
System.gc();
}
- public void assertMarkerFiles( Collection items, boolean exist )
+ public void assertMarkerFiles( Collection<ArtifactItem> items, boolean exist )
{
- Iterator iter = items.iterator();
- while ( iter.hasNext() )
+ for ( ArtifactItem item : items )
{
- assertMarkerFile( exist, (ArtifactItem) iter.next() );
+ assertMarkerFile( exist, item );
}
}
@@ -105,7 +104,7 @@ public class TestIncludeExcludeUnpackMoj
}
}
- private void assertUnpacked(boolean unpacked, String fileName)
+ private void assertUnpacked( boolean unpacked, String fileName )
{
File destFile = new File( mojo.getOutputDirectory().getAbsolutePath() , fileName );
assertEquals(unpacked, destFile.exists());
@@ -217,7 +216,7 @@ public class TestIncludeExcludeUnpackMoj
Artifact artifact = stubFactory.createArtifact( "test", "test", "1.0", Artifact.SCOPE_COMPILE, "jar", null );
ArtifactItem item = stubFactory.getArtifactItem( artifact );
item.setIncludes( "**/*" );
- ArrayList list = new ArrayList( 1 );
+ List<ArtifactItem> list = new ArrayList<ArtifactItem>( 1 );
list.add( item );
mojo.setArtifactItems( list );
mojo.setIncludes( "**/test2" + UNPACKED_FILE_SUFFIX );
@@ -234,7 +233,7 @@ public class TestIncludeExcludeUnpackMoj
Artifact artifact = stubFactory.createArtifact( "test", "test", "1.0", Artifact.SCOPE_COMPILE, "jar", null );
ArtifactItem item = stubFactory.getArtifactItem( artifact );
item.setExcludes( "**/*" );
- ArrayList list = new ArrayList( 1 );
+ List<ArtifactItem> list = new ArrayList<ArtifactItem>( 1 );
list.add( item );
mojo.setArtifactItems( list );
mojo.setExcludes( "**/test2" + UNPACKED_FILE_SUFFIX );
@@ -248,7 +247,7 @@ public class TestIncludeExcludeUnpackMoj
public void testIncludeArtifactItemMultipleMarker()
throws Exception
{
- ArrayList list = new ArrayList();
+ List<ArtifactItem> list = new ArrayList<ArtifactItem>();
Artifact artifact = stubFactory.createArtifact( "test", "test", "1.0", Artifact.SCOPE_COMPILE, "jar", null );
ArtifactItem item = stubFactory.getArtifactItem( artifact );
item.setOverWrite( "false" );
@@ -270,7 +269,7 @@ public class TestIncludeExcludeUnpackMoj
public void testIncludeArtifactItemMultipleExecutions()
throws Exception
{
- ArrayList list = new ArrayList();
+ List<ArtifactItem> list = new ArrayList<ArtifactItem>();
Artifact artifact = stubFactory.createArtifact( "test", "test", "1.0", Artifact.SCOPE_COMPILE, "jar", null );
ArtifactItem item = stubFactory.getArtifactItem( artifact );
item.setOverWrite( "false" );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestPropertiesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestPropertiesMojo.java?rev=1081021&r1=1081020&r2=1081021&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestPropertiesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestPropertiesMojo.java Sun Mar 13 00:17:39 2011
@@ -20,7 +20,6 @@ package org.apache.maven.plugin.dependen
*/
import java.io.File;
-import java.util.Iterator;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
@@ -51,8 +50,8 @@ public class TestPropertiesMojo
assertNotNull( mojo.getProject() );
MavenProject project = mojo.getProject();
- Set artifacts = this.stubFactory.getScopedArtifacts();
- Set directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
+ Set<Artifact> artifacts = this.stubFactory.getScopedArtifacts();
+ Set<Artifact> directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
artifacts.addAll( directArtifacts );
project.setArtifacts( artifacts );
@@ -61,10 +60,8 @@ public class TestPropertiesMojo
// this.assertNull( project.getProperties().getProperty( "org.apacha ) )
mojo.execute();
- for ( Iterator i = artifacts.iterator(); i.hasNext(); )
+ for ( Artifact artifact : artifacts )
{
-
- Artifact artifact = (Artifact) i.next();
File artifactFile = artifact.getFile();
assertNotNull( artifact.getDependencyConflictId() );
assertTrue( artifactFile.isFile() );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestResolveMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestResolveMojo.java?rev=1081021&r1=1081020&r2=1081021&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestResolveMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestResolveMojo.java Sun Mar 13 00:17:39 2011
@@ -22,6 +22,7 @@ package org.apache.maven.plugin.dependen
import java.io.File;
import java.util.Set;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.dependency.resolvers.ResolveDependenciesMojo;
import org.apache.maven.plugin.dependency.utils.DependencyStatusSets;
import org.apache.maven.plugin.testing.SilentLog;
@@ -54,8 +55,8 @@ public class TestResolveMojo
MavenProject project = mojo.getProject();
mojo.silent = true;
- Set artifacts = this.stubFactory.getScopedArtifacts();
- Set directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
+ Set<Artifact> artifacts = this.stubFactory.getScopedArtifacts();
+ Set<Artifact> directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
artifacts.addAll( directArtifacts );
project.setArtifacts( artifacts );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestTreeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestTreeMojo.java?rev=1081021&r1=1081020&r2=1081021&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestTreeMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestTreeMojo.java Sun Mar 13 00:17:39 2011
@@ -25,7 +25,6 @@ import java.io.FileReader;
import java.util.Set;
import java.util.List;
import java.util.ArrayList;
-import java.util.Iterator;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
@@ -73,8 +72,8 @@ public class TestTreeMojo
MavenProject project = mojo.getProject();
project.setArtifact( this.stubFactory.createArtifact( "testGroupId", "project", "1.0" ) );
- Set artifacts = this.stubFactory.getScopedArtifacts();
- Set directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
+ Set<Artifact> artifacts = this.stubFactory.getScopedArtifacts();
+ Set<Artifact> directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
artifacts.addAll( directArtifacts );
project.setArtifacts( artifacts );
@@ -97,7 +96,7 @@ public class TestTreeMojo
public void testTreeDotSerializing()
throws Exception
{
- List contents = runTreeMojo( "tree1.dot", "dot" );
+ List<String> contents = runTreeMojo( "tree1.dot", "dot" );
assertTrue( findString( contents, "digraph \"testGroupId:project:jar:1.0:compile\" {" ) );
assertTrue( findString( contents,
"\"testGroupId:project:jar:1.0:compile\" -> \"testGroupId:snapshot:jar:2.0-SNAPSHOT:compile\"" ) );
@@ -113,7 +112,7 @@ public class TestTreeMojo
public void testTreeGraphMLSerializing()
throws Exception
{
- List contents = runTreeMojo( "tree1.graphml", "graphml" );
+ List<String> contents = runTreeMojo( "tree1.graphml", "graphml" );
assertTrue( findString( contents, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" ) );
assertTrue( findString( contents, "<y:NodeLabel>testGroupId:project:jar:1.0:compile</y:NodeLabel>" ) );
@@ -131,7 +130,7 @@ public class TestTreeMojo
public void testTreeTGFSerializing()
throws Exception
{
- List contents = runTreeMojo( "tree1.tgf", "tgf" );
+ List<String> contents = runTreeMojo( "tree1.tgf", "tgf" );
assertTrue( findString( contents, "testGroupId:project:jar:1.0:compile" ) );
assertTrue( findString( contents, "testGroupId:snapshot:jar:2.0-SNAPSHOT:compile" ) );
assertTrue( findString( contents, "testGroupId:release:jar:1.0:compile" ) );
@@ -143,7 +142,7 @@ public class TestTreeMojo
* @param format
* @return list of strings in the output file
*/
- private List runTreeMojo( String outputFile, String format )
+ private List<String> runTreeMojo( String outputFile, String format )
throws Exception
{
File testPom = new File( getBasedir(), "target/test-classes/unit/tree-test/plugin-config.xml" );
@@ -158,8 +157,8 @@ public class TestTreeMojo
MavenProject project = mojo.getProject();
project.setArtifact( this.stubFactory.createArtifact( "testGroupId", "project", "1.0" ) );
- Set artifacts = this.stubFactory.getScopedArtifacts();
- Set directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
+ Set<Artifact> artifacts = this.stubFactory.getScopedArtifacts();
+ Set<Artifact> directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
artifacts.addAll( directArtifacts );
project.setArtifacts( artifacts );
@@ -168,7 +167,7 @@ public class TestTreeMojo
mojo.execute();
BufferedReader fp1 = new BufferedReader( new FileReader( outputFileName ) );
- List contents = new ArrayList();
+ List<String> contents = new ArrayList<String>();
String line = null;
while ( ( line = fp1.readLine() ) != null )
@@ -185,11 +184,10 @@ public class TestTreeMojo
* @param contents
* @param str
*/
- private boolean findString( List contents, String str )
+ private boolean findString( List<String> contents, String str )
{
- for ( Iterator it = contents.iterator(); it.hasNext(); )
+ for ( String line : contents )
{
- String line = (String) it.next();
if ( line.indexOf( str ) != -1 )
{
// if match then return here
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestUnpackDependenciesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestUnpackDependenciesMojo.java?rev=1081021&r1=1081020&r2=1081021&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestUnpackDependenciesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestUnpackDependenciesMojo.java Sun Mar 13 00:17:39 2011
@@ -68,8 +68,8 @@ public class TestUnpackDependenciesMojo
assertNotNull( mojo.getProject() );
MavenProject project = mojo.getProject();
- Set artifacts = this.stubFactory.getScopedArtifacts();
- Set directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
+ Set<Artifact> artifacts = this.stubFactory.getScopedArtifacts();
+ Set<Artifact> directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
artifacts.addAll( directArtifacts );
project.setArtifacts( artifacts );
@@ -122,10 +122,10 @@ public class TestUnpackDependenciesMojo
throws Exception
{
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( artifact );
}
}
@@ -135,10 +135,10 @@ public class TestUnpackDependenciesMojo
{
mojo.excludeTransitive = true;
mojo.execute();
- Iterator iter = mojo.project.getDependencyArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getDependencyArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( artifact );
}
}
@@ -147,14 +147,14 @@ public class TestUnpackDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getTypedArchiveArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.excludeTypes = "jar";
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( !artifact.getType().equalsIgnoreCase( "jar" ), artifact );
}
@@ -164,16 +164,16 @@ public class TestUnpackDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getScopedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.excludeScope = "provided";
// mojo.silent = false;
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( !artifact.getScope().equals( "provided" ), artifact );
}
@@ -183,16 +183,16 @@ public class TestUnpackDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getScopedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.excludeScope = "system";
// mojo.silent = false;
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( !artifact.getScope().equals( "system" ), artifact );
}
@@ -202,15 +202,15 @@ public class TestUnpackDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getScopedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.excludeScope = "compile";
mojo.execute();
ScopeArtifactFilter saf = new ScopeArtifactFilter( mojo.excludeScope );
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( !saf.include( artifact ), artifact );
}
}
@@ -219,7 +219,7 @@ public class TestUnpackDependenciesMojo
throws IOException
{
mojo.project.setArtifacts( stubFactory.getScopedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.excludeScope = "test";
try
@@ -238,15 +238,15 @@ public class TestUnpackDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getScopedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.excludeScope = "runtime";
mojo.execute();
ScopeArtifactFilter saf = new ScopeArtifactFilter( mojo.excludeScope );
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( !saf.include( artifact ), artifact );
}
}
@@ -255,7 +255,7 @@ public class TestUnpackDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getTypedArchiveArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.includeTypes = "jar";
mojo.excludeTypes = "jar";
@@ -263,10 +263,10 @@ public class TestUnpackDependenciesMojo
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( false, artifact );
}
@@ -277,7 +277,7 @@ public class TestUnpackDependenciesMojo
iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( artifact.getType().equalsIgnoreCase( "jar" ), artifact );
}
@@ -287,14 +287,14 @@ public class TestUnpackDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getTypedArchiveArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.useSubDirectoryPerType = true;
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( artifact );
}
}
@@ -305,10 +305,10 @@ public class TestUnpackDependenciesMojo
mojo.useSubDirectoryPerArtifact = true;
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( artifact );
}
}
@@ -317,15 +317,15 @@ public class TestUnpackDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getTypedArchiveArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.useSubDirectoryPerArtifact = true;
mojo.useSubDirectoryPerType = true;
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( artifact );
}
}
@@ -337,10 +337,10 @@ public class TestUnpackDependenciesMojo
mojo.stripVersion = true;
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( artifact );
}
}
@@ -349,16 +349,16 @@ public class TestUnpackDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getTypedArchiveArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.useSubDirectoryPerArtifact = true;
mojo.useSubDirectoryPerType = true;
mojo.stripVersion = true;
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( artifact );
}
}
@@ -367,15 +367,15 @@ public class TestUnpackDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getScopedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.includeScope = "compile";
mojo.execute();
ScopeArtifactFilter saf = new ScopeArtifactFilter( mojo.includeScope );
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( saf.include( artifact ), artifact );
}
}
@@ -384,16 +384,16 @@ public class TestUnpackDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getScopedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.includeScope = "test";
mojo.execute();
ScopeArtifactFilter saf = new ScopeArtifactFilter( mojo.includeScope );
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( saf.include( artifact ), artifact );
}
}
@@ -402,15 +402,15 @@ public class TestUnpackDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getScopedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.includeScope = "runtime";
mojo.execute();
ScopeArtifactFilter saf = new ScopeArtifactFilter( mojo.includeScope );
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( saf.include( artifact ), artifact );
}
}
@@ -419,14 +419,14 @@ public class TestUnpackDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getScopedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.includeScope = "provided";
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( Artifact.SCOPE_PROVIDED.equals( artifact.getScope() ), artifact );
}
}
@@ -435,15 +435,15 @@ public class TestUnpackDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getScopedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.includeScope = "system";
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ), artifact );
}
}
@@ -452,17 +452,17 @@ public class TestUnpackDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getArtifactArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.includeArtifactIds = "one";
mojo.excludeArtifactIds = "one";
//shouldn't get anything
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( false, artifact );
}
mojo.excludeArtifactIds ="";
@@ -471,7 +471,7 @@ public class TestUnpackDependenciesMojo
iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( artifact.getArtifactId().equals( "one" ), artifact );
}
@@ -481,17 +481,17 @@ public class TestUnpackDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getArtifactArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.excludeArtifactIds = "one";
mojo.execute();
// test - get all direct dependencies and verify that they exist if they
// do not have a classifier of "one"
// then delete the file and at the end, verify the folder is empty.
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( !artifact.getArtifactId().equals( "one" ), artifact );
}
}
@@ -500,14 +500,14 @@ public class TestUnpackDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getGroupIdArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.excludeGroupIds = "one";
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
assertUnpacked( !artifact.getGroupId().equals( "one" ), artifact );
}
}
@@ -516,17 +516,17 @@ public class TestUnpackDependenciesMojo
throws Exception
{
mojo.project.setArtifacts( stubFactory.getGroupIdArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.project.setDependencyArtifacts( new HashSet<Artifact>() );
mojo.includeGroupIds = "one";
mojo.excludeGroupIds = "one";
//shouldn't get anything
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
// Testing with artifact id because group id is not in filename
assertUnpacked( false, artifact );
}
@@ -537,7 +537,7 @@ public class TestUnpackDependenciesMojo
iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
// Testing with artifact id because group id is not in filename
assertUnpacked( artifact.getGroupId().equals( "one" ), artifact );
}
@@ -573,10 +573,10 @@ public class TestUnpackDependenciesMojo
mojo.execute();
- Iterator iter = mojo.project.getArtifacts().iterator();
+ Iterator<Artifact> iter = mojo.project.getArtifacts().iterator();
while ( iter.hasNext() )
{
- Artifact artifact = (Artifact) iter.next();
+ Artifact artifact = iter.next();
String useClassifier = artifact.getClassifier();
String useType = artifact.getType();
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestUnpackDependenciesMojo2.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestUnpackDependenciesMojo2.java?rev=1081021&r1=1081020&r2=1081021&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestUnpackDependenciesMojo2.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestUnpackDependenciesMojo2.java Sun Mar 13 00:17:39 2011
@@ -61,8 +61,8 @@ public class TestUnpackDependenciesMojo2
assertNotNull( mojo.getProject() );
MavenProject project = mojo.getProject();
- Set artifacts = this.stubFactory.getScopedArtifacts();
- Set directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
+ Set<Artifact> artifacts = this.stubFactory.getScopedArtifacts();
+ Set<Artifact> directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
artifacts.addAll( directArtifacts );
project.setArtifacts( artifacts );
@@ -93,7 +93,7 @@ public class TestUnpackDependenciesMojo2
throws MojoExecutionException, InterruptedException, IOException
{
- Set artifacts = new HashSet();
+ Set<Artifact> artifacts = new HashSet<Artifact>();
Artifact release = stubFactory.getReleaseArtifact();
release.getFile().setLastModified( System.currentTimeMillis() - 2000 );
@@ -113,7 +113,7 @@ public class TestUnpackDependenciesMojo2
throws MojoExecutionException, InterruptedException, IOException
{
- Set artifacts = new HashSet();
+ Set<Artifact> artifacts = new HashSet<Artifact>();
Artifact release = stubFactory.getReleaseArtifact();
release.getFile().setLastModified( System.currentTimeMillis() - 2000 );
@@ -134,7 +134,7 @@ public class TestUnpackDependenciesMojo2
throws MojoExecutionException, InterruptedException, IOException
{
- Set artifacts = new HashSet();
+ Set<Artifact> artifacts = new HashSet<Artifact>();
Artifact snap = stubFactory.getSnapshotArtifact();
snap.getFile().setLastModified( System.currentTimeMillis() - 2000 );
@@ -156,7 +156,7 @@ public class TestUnpackDependenciesMojo2
throws MojoExecutionException, InterruptedException, IOException
{
- Set artifacts = new HashSet();
+ Set<Artifact> artifacts = new HashSet<Artifact>();
Artifact snap = stubFactory.getSnapshotArtifact();
snap.getFile().setLastModified( System.currentTimeMillis() - 2000 );
@@ -179,7 +179,7 @@ public class TestUnpackDependenciesMojo2
throws MojoExecutionException, InterruptedException, IOException
{
- Set artifacts = new HashSet();
+ Set<Artifact> artifacts = new HashSet<Artifact>();
Artifact snap = stubFactory.getSnapshotArtifact();
snap.getFile().setLastModified( System.currentTimeMillis() - 2000 );