Optional dependencies are no longer included

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

Author: laeubi

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

@@ -127,7 +127,7 @@ private static <T> boolean isOriginalArtifact(ExpectedUnit expectedUnit, T unit,
 			return false;
 		}
 		URI location = getLocation.apply(unit);
-		String expectedPathSuffix = "/" + String.join("/", ".m2", "repository", key.groupId().replace('.', '/'),
+		String expectedPathSuffix = "/" + String.join("/", "repository", key.groupId().replace('.', '/'),
 				key.artifactId(), key.version(), key.artifactId() + "-" + key.version() + ".jar");
 		return location.toASCIIString().endsWith(expectedPathSuffix);
 	}

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

@@ -22,6 +22,9 @@
 import org.junit.runners.Parameterized.Parameter;
 import org.junit.runners.Parameterized.Parameters;
 
+/**
+ * Test that the generated features contain the expected content
+ */
 @RunWith(Parameterized.class)
 public class MavenFeatureTest extends AbstractMavenTargetTest {
 	@Parameter(0)
@@ -109,22 +112,17 @@ public void testPomArtifactFeatureGeneration() throws Exception {
 				originalOSGiBundle("com.sun.xml.bind.jaxb-impl", "4.0.2", "com.sun.xml.bind:jaxb-impl"),
 				originalOSGiBundle("com.sun.xml.bind.jaxb-jxc", "4.0.2", "com.sun.xml.bind:jaxb-jxc"),
 				originalOSGiBundle("com.sun.xml.bind.jaxb-xjc", "4.0.2", "com.sun.xml.bind:jaxb-xjc"),
-				originalOSGiBundle("com.sun.xml.fastinfoset.FastInfoset", "2.1.0",
-						"com.sun.xml.fastinfoset:FastInfoset"),
-				originalOSGiBundle("jakarta.activation-api", "2.1.1", "jakarta.activation:jakarta.activation-api"),
-				originalOSGiBundle("jakarta.xml.bind-api", "4.0.0", "jakarta.xml.bind:jakarta.xml.bind-api"),
-				originalOSGiBundle("org.jvnet.staxex.stax-ex", "2.1.0", "org.jvnet.staxex:stax-ex"));
+				originalOSGiBundle("jakarta.activation-api", "2.1.0", "jakarta.activation:jakarta.activation-api"),
+				originalOSGiBundle("jakarta.xml.bind-api", "4.0.0", "jakarta.xml.bind:jakarta.xml.bind-api"));
 		assertTargetBundles(target, includeSource ? withSourceBundles(expectedBundles) : expectedBundles);
 		List<ExpectedFeature> expectedFeature = List.of(generatedFeature("com.sun.xml.bind.jaxb-ri.pom", "0.0.1",
 				List.of(//
 						featurePlugin("com.sun.xml.bind.jaxb-core", "4.0.2"),
 						featurePlugin("com.sun.xml.bind.jaxb-impl", "4.0.2"),
 						featurePlugin("com.sun.xml.bind.jaxb-jxc", "4.0.2"),
 						featurePlugin("com.sun.xml.bind.jaxb-xjc", "4.0.2"),
-						featurePlugin("com.sun.xml.fastinfoset.FastInfoset", "2.1.0"),
-						featurePlugin("jakarta.activation-api", "2.1.1"),
-						featurePlugin("jakarta.xml.bind-api", "4.0.0"),
-						featurePlugin("org.jvnet.staxex.stax-ex", "2.1.0"))));
+						featurePlugin("jakarta.activation-api", "2.1.0"),
+						featurePlugin("jakarta.xml.bind-api", "4.0.0"))));
 		assertTargetFeatures(target, includeSource ? withSourceFeatures(expectedFeature) : expectedFeature);
 
 	}

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

@@ -82,7 +82,6 @@ public void testMultipleArtifactsWithWrappingAndExclusion() throws Exception {
 				originalOSGiBundle("com.google.guava", "30.1.0.jre", "com.google.guava:guava", "30.1-jre"),
 				originalOSGiBundle("com.google.guava", "30.1.1.jre", "com.google.guava:guava", "30.1.1-jre"),
 				originalOSGiBundle("com.google.guava.failureaccess", "1.0.1", "com.google.guava:failureaccess"),
-				originalOSGiBundle("org.objectweb.asm", "9.2.0", "org.ow2.asm:asm", "9.2"),
 				originalOSGiBundle("checker-qual", "3.8.0", "org.checkerframework:checker-qual"),
 				generatedBundle("m2e.wrapped.com.google.errorprone.error_prone_annotations", "2.3.4",
 						"com.google.errorprone:error_prone_annotations"),