From 738759b2ebb5f5a52a51e278aca972e4cfb976a0 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Tue, 29 Apr 2025 23:38:39 +0200
Subject: [PATCH] Consider dependencies of transitively included fragments

Fixes https://github.com/eclipse-pde/eclipse.pde/issues/1727
---
 .../pde/internal/core/DependencyManager.java  | 18 ++++++++++++
 .../tests/internal/DependencyManagerTest.java | 28 +++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/DependencyManager.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/DependencyManager.java
index ba6c2b94989..692bbe53321 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/DependencyManager.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/DependencyManager.java
@@ -35,6 +35,7 @@
 import org.eclipse.pde.core.target.NameVersionDescriptor;
 import org.osgi.framework.Constants;
 import org.osgi.framework.Version;
+import org.osgi.framework.namespace.HostNamespace;
 import org.osgi.framework.wiring.BundleRequirement;
 import org.osgi.framework.wiring.BundleRevision;
 import org.osgi.framework.wiring.BundleWire;
@@ -196,6 +197,19 @@ public static Set<BundleDescription> findRequirementsClosure(Collection<BundleDe
 				}
 			}
 
+			if (isFragment(wiring.getRevision())) {
+				// Requirements of a fragment are hosted at the host, which
+				// therefore requires the corresponding wires: OSGi Core spec,
+				// chapter 6.4.1 - Hosted Requirements and Capabilities
+				for (BundleWire hostWire : wiring.getRequiredWires(HostNamespace.HOST_NAMESPACE)) {
+					// Temporarily remove this fragment's host from the closure
+					// to ensure it's added again below. In the subsequent
+					// processing this fragment's requirements will then also be
+					// considered (before it was discarded).
+					closure.remove(hostWire.getProvider());
+				}
+			}
+
 			List<BundleWire> requiredWires = wiring.getRequiredWires(null);
 			for (BundleWire wire : requiredWires) {
 				BundleRevision declaringBundle = wire.getRequirement().getRevision();
@@ -222,6 +236,10 @@ private static void addNewRequiredBundle(BundleDescription bundle, Set<BundleDes
 		}
 	}
 
+	private static boolean isFragment(BundleRevision bundle) {
+		return (bundle.getTypes() & BundleRevision.TYPE_FRAGMENT) != 0;
+	}
+
 	private static boolean isOptional(BundleRequirement requirement) {
 		return Constants.RESOLUTION_OPTIONAL.equals(requirement.getDirectives().get(Constants.RESOLUTION_DIRECTIVE));
 	}
diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/core/tests/internal/DependencyManagerTest.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/core/tests/internal/DependencyManagerTest.java
index 3ca9345b7cd..fabc8bcf047 100644
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/core/tests/internal/DependencyManagerTest.java
+++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/core/tests/internal/DependencyManagerTest.java
@@ -308,6 +308,34 @@ public void testFindRequirementsClosure_includeFragmentsProvidingPackages() thro
 		assertThat(wClosure).isEqualTo(Set.of(bundleW, bundleB, fragmentB));
 	}
 
+	@Test
+	public void testFindRequirementsClosure_requirementsOfTransitivlyRequiredFragment() throws Exception {
+		setTargetPlatform( //
+				bundle("bundle.host", "1.0.0"),
+
+				bundle("bundle.a", "1.0.0", //
+						entry(REQUIRE_BUNDLE, "bundle.host"), //
+						entry(REQUIRE_CAPABILITY, "some.test.capability")),
+
+				bundle("bundle.fragment", "1.0.0", //
+						entry(FRAGMENT_HOST, "bundle.host"), //
+						entry(REQUIRE_BUNDLE, "bundle.b"), //
+						entry(PROVIDE_CAPABILITY, "some.test.capability")),
+
+				bundle("bundle.b", "1.0.0"));
+
+		BundleDescription bundleHost = bundleDescription("bundle.host", "1.0.0");
+		BundleDescription bundleFragment = bundleDescription("bundle.fragment", "1.0.0");
+		BundleDescription bundleA = bundleDescription("bundle.a", "1.0.0");
+		BundleDescription bundleB = bundleDescription("bundle.b", "1.0.0");
+
+		List<BundleDescription> bundles = List.of(bundleHost, bundleA);
+		// It's important that the host is first
+
+		Set<BundleDescription> noFragmentsClosure = findRequirementsClosure(bundles);
+		assertThat(noFragmentsClosure).isEqualTo(Set.of(bundleHost, bundleFragment, bundleA, bundleB));
+	}
+
 	@Test
 	public void testFindRequirementsClosure_includeOptional() throws Exception {