Use BuildDependencyCollector

Author: laeubi

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/BuildDependencyCollector.java

@@ -39,18 +39,25 @@ private BuildDependencyCollector(Collection<BundleDescription> roots) {
 	 * {@code roots}, including {@code roots} themselves.
 	 */
 	public static Collection<BundleDescription> collectBuildRelevantDependencies(Collection<BundleDescription> roots) {
+		return collectBuildRelevantDependencies(roots, true);
+	}
+
+	static Collection<BundleDescription> collectBuildRelevantDependencies(Collection<BundleDescription> roots,
+			boolean includeFragmentsHost) {
 		BuildDependencyCollector collector = new BuildDependencyCollector(roots);
-		collector.collect();
+		collector.collect(includeFragmentsHost);
 		return collector.fDependencies;
 	}
 
-	private void collect() {
+	private void collect(boolean includeFragmentsHost) {
 		while (!fQueue.isEmpty()) {
 			BundleDescription bundleDescription = fQueue.remove();
 
 			collectRequiredBundles(bundleDescription);
 			collectImportedPackages(bundleDescription);
-			collectFragmentHost(bundleDescription);
+			if (includeFragmentsHost) {
+				collectFragmentHost(bundleDescription);
+			}
 		}
 	}
 

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/DependencyManager.java

@@ -36,11 +36,7 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 import org.osgi.framework.Version;
-import org.osgi.framework.namespace.BundleNamespace;
-import org.osgi.framework.namespace.ExecutionEnvironmentNamespace;
 import org.osgi.framework.namespace.HostNamespace;
-import org.osgi.framework.namespace.PackageNamespace;
-import org.osgi.framework.wiring.BundleCapability;
 import org.osgi.framework.wiring.BundleRequirement;
 import org.osgi.framework.wiring.BundleRevision;
 import org.osgi.framework.wiring.BundleWire;
@@ -84,12 +80,7 @@ public enum Options {
 		 * that define an {@link ICoreConstants#PLATFORM_FILTER} in their
 		 * manifest.
 		 */
-		INCLUDE_EXTENSIBLE_FRAGMENTS,
-		/**
-		 * Option that can be set to exclude generic capabilities on which the
-		 * bundle depends.
-		 */
-		EXCLUDE_REQUIRED_CAPABILITY;
+		INCLUDE_EXTENSIBLE_FRAGMENTS;
 	}
 
 	/**
@@ -186,7 +177,6 @@ public static Set<BundleDescription> findRequirementsClosure(Collection<BundleDe
 			Options... options) {
 
 		Set<Options> optionSet = Set.of(options);
-		boolean excludeGenericRequiredCapability = optionSet.contains(Options.EXCLUDE_REQUIRED_CAPABILITY);
 		boolean includeOptional = optionSet.contains(Options.INCLUDE_OPTIONAL_DEPENDENCIES);
 		boolean includeAllFragments = optionSet.contains(Options.INCLUDE_ALL_FRAGMENTS);
 		boolean includeNonTestFragments = optionSet.contains(Options.INCLUDE_NON_TEST_FRAGMENTS);
@@ -252,19 +242,7 @@ public static Set<BundleDescription> findRequirementsClosure(Collection<BundleDe
 					// not included into the closure.
 					continue;
 				}
-				BundleCapability capability = wire.getCapability();
-				if (excludeGenericRequiredCapability) {
-					String namespace = capability.getNamespace();
-					if (!BundleNamespace.BUNDLE_NAMESPACE.equals(namespace)
-							&& !PackageNamespace.PACKAGE_NAMESPACE.equals(namespace)
-							&& !HostNamespace.HOST_NAMESPACE.equals(namespace)
-							&& !ExecutionEnvironmentNamespace.EXECUTION_ENVIRONMENT_NAMESPACE.equals(namespace)) {
-						// If it is not one of the framework namespaces it is a
-						// generic one see https://docs.osgi.org/specification/osgi.core/8.0.0/framework.namespaces.html
-						continue;
-					}
-				}
-				BundleRevision provider = capability.getRevision();
+				BundleRevision provider = wire.getCapability().getRevision();
 				// Use revision of required capability to support the case if
 				// fragments contribute new packages to their host's API.
 				if (provider instanceof BundleDescription requiredBundle && (includeOptional || !isOptional(wire.getRequirement()))) {

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/RequiredPluginsClasspathContainer.java

@@ -14,7 +14,6 @@
  *******************************************************************************/
 package org.eclipse.pde.internal.core;
 
-import static org.eclipse.pde.internal.core.DependencyManager.Options.EXCLUDE_REQUIRED_CAPABILITY;
 import static org.eclipse.pde.internal.core.DependencyManager.Options.INCLUDE_OPTIONAL_DEPENDENCIES;
 
 import java.io.File;
@@ -684,8 +683,7 @@ private void addImplicitDependencies(BundleDescription desc, Set<BundleDescripti
 	 */
 	private void addTransitiveDependenciesWithForbiddenAccess(Set<BundleDescription> added,
 			List<IClasspathEntry> entries) throws CoreException {
-		Set<BundleDescription> closure = DependencyManager.findRequirementsClosure(added,
-				INCLUDE_OPTIONAL_DEPENDENCIES, EXCLUDE_REQUIRED_CAPABILITY);
+		Collection<BundleDescription> closure = BuildDependencyCollector.collectBuildRelevantDependencies(added);
 		String systemBundleBSN = TargetPlatformHelper.getPDEState().getSystemBundle();
 		Iterator<BundleDescription> transitiveDeps = closure.stream()
 				.filter(desc -> !desc.getSymbolicName().equals(systemBundleBSN))