Test Harness: Session Tests: List felix.scr dependencies explicitly

* We don't need the optional ones

* We should not install org.eclipse.osgi again, as this is already set
  as the 'osgi.framework' in the config.ini

It's easier to just list the few dependencies we really want explicitly.

Author: sratz

runtime/tests/org.eclipse.core.tests.harness/META-INF/MANIFEST.MF

@@ -8,7 +8,6 @@ Export-Package: org.eclipse.core.tests.harness;version="2.0",
  org.eclipse.core.tests.harness.session,
  org.eclipse.core.tests.session;version="2.0"
 Require-Bundle: org.junit,
- org.apache.felix.scr,
  org.eclipse.test.performance,
  org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
  org.eclipse.jdt.junit.runtime,
@@ -24,6 +23,11 @@ Require-Bundle: org.junit,
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: javax.xml.parsers,
+ org.apache.felix.scr.info,
+ org.osgi.service.event,
+ org.osgi.service.component,
+ org.osgi.util.promise,
+ org.osgi.util.function,
  net.bytebuddy,
  org.apiguardian.api,
  org.assertj.core.api,

runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/session/customization/CustomSessionConfigurationImpl.java

@@ -20,7 +20,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Objects;
 import java.util.Optional;
@@ -37,8 +36,6 @@
 import org.osgi.framework.Constants;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.Version;
-import org.osgi.framework.wiring.BundleWire;
-import org.osgi.framework.wiring.BundleWiring;
 
 @SuppressWarnings("restriction")
 public class CustomSessionConfigurationImpl implements CustomSessionConfiguration {
@@ -61,18 +58,6 @@ public CustomSessionConfigurationImpl() {
 		addMinimalBundleSet();
 	}
 
-	private static void collectDependencies(Bundle bundle, Collection<Bundle> dependencyClosure) {
-		if (!dependencyClosure.add(bundle)) {
-			return;
-		}
-		BundleWiring wiring = bundle.adapt(BundleWiring.class);
-		if (wiring != null) {
-			for (BundleWire wire : wiring.getRequiredWires(null)) {
-				collectDependencies(wire.getProviderWiring().getBundle(), dependencyClosure);
-			}
-		}
-	}
-
 	@SuppressWarnings("deprecation")
 	private void addMinimalBundleSet() {
 		// Just use any class from the bundles we want to add as minimal bundle set
@@ -86,11 +71,12 @@ private void addMinimalBundleSet() {
 		addBundle(org.eclipse.core.runtime.content.IContentType.class); // org.eclipse.core.contenttype
 		addBundle(org.eclipse.equinox.app.IApplication.class); // org.eclipse.equinox.app
 
-		// org.apache.felix.scr + dependencies
-		Bundle scrBundle = FrameworkUtil.getBundle(org.apache.felix.scr.info.ScrInfo.class);
-		Collection<Bundle> scrAndDependencies = new HashSet<>();
-		collectDependencies(scrBundle, scrAndDependencies);
-		scrAndDependencies.forEach(this::addBundle);
+		// org.apache.felix.scr + (non-optional) dependencies
+		addBundle(org.apache.felix.scr.info.ScrInfo.class); // org.apache.felix.scr
+		addBundle(org.osgi.service.event.EventAdmin.class); // org.osgi.service.event
+		addBundle(org.osgi.service.component.ComponentConstants.class); // org.osgi.service.component
+		addBundle(org.osgi.util.promise.Promise.class); // org.osgi.util.promise
+		addBundle(org.osgi.util.function.Function.class); // org.osgi.util.function
 
 		addBundle(org.eclipse.core.tests.harness.TestHarnessPlugin.class); // org.eclipse.core.tests.harness
 		addBundle(org.eclipse.test.performance.Performance.class); // org.eclipse.test.performance

runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/ConfigurationSessionTestSuite.java

@@ -26,7 +26,6 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -46,8 +45,6 @@
 import org.osgi.framework.Constants;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.Version;
-import org.osgi.framework.wiring.BundleWire;
-import org.osgi.framework.wiring.BundleWiring;
 
 @SuppressWarnings("restriction")
 public class ConfigurationSessionTestSuite extends SessionTestSuite {
@@ -74,18 +71,6 @@ public ConfigurationSessionTestSuite(String pluginId, String name) {
 		super(pluginId, name);
 	}
 
-	private static void collectDependencies(Bundle bundle, Collection<Bundle> dependencyClosure) {
-		if (!dependencyClosure.add(bundle)) {
-			return;
-		}
-		BundleWiring wiring = bundle.adapt(BundleWiring.class);
-		if (wiring != null) {
-			for (BundleWire wire : wiring.getRequiredWires(null)) {
-				collectDependencies(wire.getProviderWiring().getBundle(), dependencyClosure);
-			}
-		}
-	}
-
 	@SuppressWarnings("deprecation")
 	public void addMinimalBundleSet() {
 		// Just use any class from the bundles we want to add as minimal bundle set
@@ -99,11 +84,12 @@ public void addMinimalBundleSet() {
 		addBundle(org.eclipse.core.runtime.content.IContentType.class); // org.eclipse.core.contenttype
 		addBundle(org.eclipse.equinox.app.IApplication.class); // org.eclipse.equinox.app
 
-		// org.apache.felix.scr + dependencies
-		Bundle scrBundle = FrameworkUtil.getBundle(org.apache.felix.scr.info.ScrInfo.class);
-		Collection<Bundle> scrAndDependencies = new HashSet<>();
-		collectDependencies(scrBundle, scrAndDependencies);
-		scrAndDependencies.forEach(i -> addBundle(i, null));
+		// org.apache.felix.scr + (non-optional) dependencies
+		addBundle(org.apache.felix.scr.info.ScrInfo.class); // org.apache.felix.scr
+		addBundle(org.osgi.service.event.EventAdmin.class); // org.osgi.service.event
+		addBundle(org.osgi.service.component.ComponentConstants.class); // org.osgi.service.component
+		addBundle(org.osgi.util.promise.Promise.class); // org.osgi.util.promise
+		addBundle(org.osgi.util.function.Function.class); // org.osgi.util.function
 
 		addBundle(org.eclipse.core.tests.harness.TestHarnessPlugin.class); // org.eclipse.core.tests.harness
 		addBundle(org.eclipse.test.performance.Performance.class); // org.eclipse.test.performance