Consider a requirement's filter and max when computing dependencies

#3197
eclipse-tycho · Dec 9, 2023 · 208b1c6 · 208b1c6
1 parent b193066
commit 208b1c6
Show file tree

Hide file tree

Showing 15 changed files with 1,891 additions and 1 deletion.
diff --git a/p2-maven-plugin/src/main/java/org/eclipse/tycho/p2maven/InstallableUnitSlicer.java b/p2-maven-plugin/src/main/java/org/eclipse/tycho/p2maven/InstallableUnitSlicer.java
@@ -93,7 +93,11 @@ public IQueryResult<IInstallableUnit> computeDirectDependencies(Collection<IInst
 		}).toList();
 		for (IInstallableUnit iu : avaiableIUs.query(QueryUtil.ALL_UNITS, new NullProgressMonitor()).toSet()) {
 			for (IRequirement requirement : collect) {
-				if (iu.satisfies(requirement)) {
+				// Negative requirements should not create a dependency.
+				// If there is a filter, we need more context, e.g, see
+				// org.eclipse.equinox.internal.p2.director.Slicer.isApplicable(IRequirement)
+				// Failing that, we need to assume the filter isn't applicable.
+				if (requirement.getMax() != 0 && requirement.getFilter() == null && iu.satisfies(requirement)) {
 					result.add(iu);
 					// TODO remove the requirement from the set so we only collect exactly one
 					// provider for a requirement?

diff --git a/...tj-cycle/plugins/org.eclipse.justj.openjdk.hotspot.jre.base.stripped/META-INF/MANIFEST.MF b/...tj-cycle/plugins/org.eclipse.justj.openjdk.hotspot.jre.base.stripped/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.justj.openjdk.hotspot.jre.base.stripped;singleton:=true
+Bundle-Version: 17.0.9.qualifier
+Bundle-ClassPath: .
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Automatic-Module-Name: org.eclipse.justj.openjdk.hotspot.jre.base.stripped