Replace BuildDependencyCollector by DependencyManager

This reduces logically duplicated code.

Author: HannesWell

apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiBaseline.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2024 IBM Corporation and others.
+ * Copyright (c) 2007, 2026 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -72,7 +72,7 @@
 import org.eclipse.pde.api.tools.internal.provisional.model.IApiComponent;
 import org.eclipse.pde.api.tools.internal.provisional.model.IApiElement;
 import org.eclipse.pde.api.tools.internal.util.Util;
-import org.eclipse.pde.internal.core.BuildDependencyCollector;
+import org.eclipse.pde.internal.core.ClasspathComputer;
 import org.eclipse.pde.internal.core.TargetPlatformHelper;
 import org.osgi.framework.Constants;
 import org.osgi.framework.Version;
@@ -876,7 +876,7 @@ public IApiComponent[] getPrerequisiteComponents(IApiComponent[] components) thr
 				bundles.add(bundleComponent.getBundleDescription());
 			}
 		}
-		Collection<BundleDescription> dependencies = BuildDependencyCollector.collectBuildRelevantDependencies(bundles);
+		Collection<BundleDescription> dependencies = ClasspathComputer.collectBuildRelevantDependencies(bundles);
 		return dependencies.stream().map(bundle -> {
 			String id = bundle.getSymbolicName();
 			Version version = bundle.getVersion();

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2022 IBM Corporation and others.
+ * Copyright (c) 2005, 2026 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -15,13 +15,15 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -52,6 +54,9 @@
 import org.eclipse.pde.internal.core.project.PDEProject;
 import org.eclipse.pde.internal.core.util.CoreUtility;
 import org.eclipse.team.core.RepositoryProvider;
+import org.osgi.framework.namespace.BundleNamespace;
+import org.osgi.framework.namespace.HostNamespace;
+import org.osgi.framework.namespace.PackageNamespace;
 
 public class ClasspathComputer {
 
@@ -161,6 +166,21 @@ private static void addSourceAndLibraries(Map<String, IPath> sourceLibraryMap, C
 		}
 	}
 
+	private static final Set<String> BUILD_RELEVANT_NAMESPACES = Set.of( //
+			BundleNamespace.BUNDLE_NAMESPACE, // Require-Bundle
+			PackageNamespace.PACKAGE_NAMESPACE, // Import-Package
+			HostNamespace.HOST_NAMESPACE // Fragment-Host
+	);
+
+	/**
+	 * Returns all transitive dependencies that are relevant for building
+	 * {@code roots}, including {@code roots} themselves.
+	 */
+	public static Collection<BundleDescription> collectBuildRelevantDependencies(Collection<BundleDescription> roots) {
+		return DependencyManager.findRequirementsClosure(roots, BUILD_RELEVANT_NAMESPACES,
+				DependencyManager.Options.INCLUDE_OPTIONAL_DEPENDENCIES);
+	}
+
 	public static boolean hasTestPluginName(IProject project) {
 		String pattern = PDECore.getDefault().getPreferencesManager().getString(ICoreConstants.TEST_PLUGIN_PATTERN);
 		return pattern != null && !pattern.isEmpty() && Pattern.compile(pattern).matcher(project.getName()).find();

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2005, 2022 IBM Corporation and others.
+ *  Copyright (c) 2005, 2026 IBM Corporation and others.
  *
  *  This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License 2.0
@@ -41,6 +41,7 @@
 import org.osgi.framework.wiring.BundleRevision;
 import org.osgi.framework.wiring.BundleWire;
 import org.osgi.framework.wiring.BundleWiring;
+import org.osgi.resource.Namespace;
 import org.osgi.resource.Resource;
 
 /**
@@ -175,6 +176,32 @@ public static Set<BundleDescription> getDependencies(Collection<IPluginModelBase
 	 */
 	public static Set<BundleDescription> findRequirementsClosure(Collection<BundleDescription> bundles,
 			Options... options) {
+		return findRequirementsClosure(bundles, Set.of(), options);
+	}
+
+	/**
+	 * Returns a {@link Set} of bundle descriptions of the given
+	 * {@link IPluginModelBase}s and all of their required dependencies of the
+	 * given OSGi-Wiring {@link Namespace}s.
+	 * <p>
+	 * The set includes the descriptions of the given bundle descriptions as
+	 * well as all transitively computed explicit and optional (if requested)
+	 * dependencies. So it is the self-contained closure for all required
+	 * dependencies of the given set of plug-ins.
+	 * </p>
+	 *
+	 * @param bundles
+	 *            the collection of {@link BundleDescription}s to compute
+	 *            dependencies for.
+	 * @param namespaces
+	 *            the set of OSGi wiring name-spaces whose required wires are
+	 *            considered. If empty all name-spaces are considered.
+	 * @param options
+	 *            the specified {@link Options} for computing the closure
+	 * @return a set of bundle descriptions
+	 */
+	public static Set<BundleDescription> findRequirementsClosure(Collection<BundleDescription> bundles,
+			Set<String> namespaces, Options... options) {
 
 		Set<Options> optionSet = Set.of(options);
 		boolean includeOptional = optionSet.contains(Options.INCLUDE_OPTIONAL_DEPENDENCIES);
@@ -234,7 +261,8 @@ public static Set<BundleDescription> findRequirementsClosure(Collection<BundleDe
 				}
 			}
 
-			List<BundleWire> requiredWires = wiring.getRequiredWires(null);
+			Iterable<BundleWire> requiredWires = namespaces.isEmpty() ? wiring.getRequiredWires(null)
+					: namespaces.stream().map(wiring::getRequiredWires).flatMap(List::stream)::iterator;
 			for (BundleWire wire : requiredWires) {
 				BundleRevision declaringBundle = wire.getRequirement().getRevision();
 				if (declaringBundle != bundle && !closure.contains(declaringBundle)) {

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

@@ -44,7 +44,7 @@ public List<IProject> getDependentProjects(IBuildConfiguration buildConfiguratio
 			if (model != null) {
 				BundleDescription bundle = model.getBundleDescription();
 				if (bundle != null) {
-					return BuildDependencyCollector.collectBuildRelevantDependencies(Set.of(bundle)).stream()
+					return ClasspathComputer.collectBuildRelevantDependencies(Set.of(bundle)).stream()
 							.map(b -> (org.osgi.resource.Resource) b) //
 							.filter(dependency -> dependency != bundle).map(PluginRegistry::findModel)
 							.map(IPluginModelBase::getUnderlyingResource).filter(Objects::nonNull)