Do not follow generic requirements when computing the classpath

OSGi uses a generic Provide-Capability/Require-Capability model that
allows to declare requirements beyond the classic Import-Package and
Require-Bunlde. A common example is a bundle that provides a DS
component and needs an extender to actually construct the component and
inject the services. Another is a logging API that needs a provider.

These are especially needed because in such scenario a provider/consumer
do not know each other and should not depend directly (only loosely
coupled). Currently such providers are still pulled in even though they
are not contribute to the compilation classpath as they are completely
invisible at runtime - there is a wiring but no classloader access
granted.

This now adds a new option to the DependencyManager to exclude generic
requirements from the computation of the dependency closure and the
RequiredPluginsClasspathContainer is using that option to avoid follow
such generic wiring contracts.

Author: laeubi

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

@@ -36,7 +36,11 @@
 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;
@@ -80,7 +84,12 @@ public enum Options {
 		 * that define an {@link ICoreConstants#PLATFORM_FILTER} in their
 		 * manifest.
 		 */
-		INCLUDE_EXTENSIBLE_FRAGMENTS;
+		INCLUDE_EXTENSIBLE_FRAGMENTS,
+		/**
+		 * Option that can be set to exclude generic capabilities on which the
+		 * bundle depends.
+		 */
+		EXCLUDE_REQUIRED_CAPABILITY;
 	}
 
 	/**
@@ -177,6 +186,7 @@ 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);
@@ -242,7 +252,19 @@ public static Set<BundleDescription> findRequirementsClosure(Collection<BundleDe
 					// not included into the closure.
 					continue;
 				}
-				BundleRevision provider = wire.getCapability().getRevision();
+				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();
 				// 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,6 +14,7 @@
  *******************************************************************************/
 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,7 +685,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);
+				INCLUDE_OPTIONAL_DEPENDENCIES, EXCLUDE_REQUIRED_CAPABILITY);
 		String systemBundleBSN = TargetPlatformHelper.getPDEState().getSystemBundle();
 		Iterator<BundleDescription> transitiveDeps = closure.stream()
 				.filter(desc -> !desc.getSymbolicName().equals(systemBundleBSN))