Do not collect dependencies for classified artifacts

Signed-off-by: Christoph Läubrich <[email protected]>

Author: laeubi

org.eclipse.m2e.pde.target.tests/src/org/eclipse/m2e/pde/target/tests/OSGiMetadataGenerationTest.java

@@ -91,7 +91,6 @@ public void testWithClassifierFailsToCollect() throws Exception {
 			ITargetLocation target = resolveMavenTarget(targetXML.replace("%depth%", deepth));
 			assertStatusOk(getTargetStatus(target));
 			TargetBundle[] bundles = target.getBundles();
-			// TODO check bundle and possible transtive dependencies!
 			for (TargetBundle targetBundle : bundles) {
 				URI location = targetBundle.getBundleInfo().getLocation();
 				assertTrue(

org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetLocation.java

@@ -241,6 +241,13 @@ private Artifact resolveDependency(MavenTargetDependency root, IMaven maven, Lis
 		}
 		if (artifact != null) {
 			DependencyDepth depth = dependencyDepth;
+			if (isClassified(artifact)) {
+				// a classified artifact can not have any dependencies and will actually include
+				// the ones from the main artifact.
+				// if the user really wants this it is possible to include the pom typed
+				// artifact or the main artifact in the list
+				depth = DependencyDepth.NONE;
+			}
 			if (isPomType(artifact) && depth == DependencyDepth.NONE) {
 				// fetching only the pom but no dependencies does not makes much sense...
 				depth = DependencyDepth.DIRECT;
@@ -273,6 +280,11 @@ private Artifact resolveDependency(MavenTargetDependency root, IMaven maven, Lis
 		return artifact;
 	}
 
+	private boolean isClassified(Artifact artifact) {
+		String classifier = artifact.getClassifier();
+		return classifier != null && !classifier.isEmpty();
+	}
+
 	private boolean isPomType(Artifact artifact) {
 		return POM_PACKAGE_TYPE.equals(artifact.getExtension());
 	}