Index: pom.xml
===================================================================
--- pom.xml (revision 682435)
+++ pom.xml (working copy)
@@ -28,7 +28,7 @@
maven-eclipse-plugin
maven-plugin
Maven Eclipse Plugin
- 2.5.1
+ 2.5.1-SNAPSHOT
2.0.1
Index: src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
===================================================================
--- src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (revision 682435)
+++ src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (working copy)
@@ -79,6 +79,7 @@
* @version $Id$
* @goal eclipse
* @execute phase="generate-resources"
+ * @requiresDependencyResolution test
*/
public class EclipsePlugin
extends AbstractIdeSupportMojo
Index: src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
===================================================================
--- src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java (revision 682435)
+++ src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java (working copy)
@@ -32,7 +32,6 @@
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import java.util.TreeSet;
import java.util.jar.Attributes;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
@@ -50,17 +49,13 @@
import org.apache.maven.artifact.resolver.DebugResolutionListener;
import org.apache.maven.artifact.resolver.ResolutionNode;
import org.apache.maven.artifact.resolver.WarningResolutionListener;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
-import org.apache.maven.model.Exclusion;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.eclipse.Constants;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
@@ -715,68 +710,7 @@
private Set getProjectArtifacts()
throws MojoExecutionException
{
- // keep it sorted, this should avoid random classpath order in tests
- Set artifacts = new TreeSet();
-
- for ( Iterator dependencies = getProject().getDependencies().iterator(); dependencies.hasNext(); )
- {
- Dependency dependency = (Dependency) dependencies.next();
-
- String groupId = dependency.getGroupId();
- String artifactId = dependency.getArtifactId();
- VersionRange versionRange;
- try
- {
- versionRange = VersionRange.createFromVersionSpec( dependency.getVersion() );
- }
- catch ( InvalidVersionSpecificationException e )
- {
- throw new MojoExecutionException(
- Messages.getString(
- "unabletoparseversion", new Object[] { //$NON-NLS-1$
- dependency.getArtifactId(),
- dependency.getVersion(),
- dependency.getManagementKey(), e.getMessage() } ),
- e );
- }
-
- String type = dependency.getType();
- if ( type == null )
- {
- type = Constants.PROJECT_PACKAGING_JAR;
- }
- String classifier = dependency.getClassifier();
- boolean optional = dependency.isOptional();
- String scope = dependency.getScope();
- if ( scope == null )
- {
- scope = Artifact.SCOPE_COMPILE;
- }
-
- Artifact art =
- getArtifactFactory().createDependencyArtifact( groupId, artifactId, versionRange, type, classifier,
- scope, optional );
-
- if ( scope.equalsIgnoreCase( Artifact.SCOPE_SYSTEM ) )
- {
- art.setFile( new File( dependency.getSystemPath() ) );
- }
-
- List exclusions = new ArrayList();
- for ( Iterator j = dependency.getExclusions().iterator(); j.hasNext(); )
- {
- Exclusion e = (Exclusion) j.next();
- exclusions.add( e.getGroupId() + ":" + e.getArtifactId() ); //$NON-NLS-1$
- }
-
- ArtifactFilter newFilter = new ExcludesArtifactFilter( exclusions );
-
- art.setDependencyFilter( newFilter );
-
- artifacts.add( art );
- }
-
- return artifacts;
+ return getProject().getDependencyArtifacts();
}
/**