Category match requirement must match 0...n items

(cherry picked from commit e5463f5)
eclipse-tycho · Jan 19, 2024 · e0ad936 · e0ad936
1 parent 0079237
commit e0ad936
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 326 deletions.
diff --git a/...lugin/src/main/java/org/eclipse/tycho/p2maven/actions/AbstractSiteDependenciesAction.java b/...lugin/src/main/java/org/eclipse/tycho/p2maven/actions/AbstractSiteDependenciesAction.java
@@ -41,7 +41,7 @@ public AbstractSiteDependenciesAction(String id, String version) {
         this.version = version;
     }
 
-    abstract SiteModel getSiteModel();
+	protected abstract SiteModel getSiteModel();
 
     @Override
     protected Set<IRequirement> getRequiredCapabilities() {
@@ -90,7 +90,7 @@ private IRequirement getRequirement(SiteIU iu) {
         } else if ("match".equals(type)) {
             IMatchExpression<IInstallableUnit> iuMatcher = ExpressionUtil.getFactory()
                     .<IInstallableUnit> matchExpression(ExpressionUtil.parse(expression), params);
-            return MetadataFactory.createRequirement(iuMatcher, null, 0, 1, true);
+			return MetadataFactory.createRequirement(iuMatcher, null, 0, Integer.MAX_VALUE, true);
         } else if ("context".equals(type)) {
             throw new IllegalStateException(
                     "Context iu queries are not supported in Tycho. Faulty expression is " + expression);

diff --git a/...en-plugin/src/main/java/org/eclipse/tycho/p2maven/actions/CategoryDependenciesAction.java b/...en-plugin/src/main/java/org/eclipse/tycho/p2maven/actions/CategoryDependenciesAction.java
@@ -15,16 +15,16 @@
 import org.eclipse.equinox.internal.p2.updatesite.SiteModel;
 
 public class CategoryDependenciesAction extends AbstractSiteDependenciesAction {
-    private final SiteModel siteModel;
+	private final SiteModel siteModel;
 
-    public CategoryDependenciesAction(SiteModel siteModel, String id, String version) {
-        super(id, version);
-        this.siteModel = siteModel;
-    }
+	public CategoryDependenciesAction(SiteModel siteModel, String id, String version) {
+		super(id, version);
+		this.siteModel = siteModel;
+	}
 
-    @Override
-    SiteModel getSiteModel() {
-        return this.siteModel;
-    }
+	@Override
+	protected SiteModel getSiteModel() {
+		return this.siteModel;
+	}
 
 }
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
@@ -120,6 +120,7 @@ public void afterProjectsRead(MavenSession session) throws MavenExecutionExcepti
                 + session.getUserProperties().getProperty(TychoConstants.SESSION_PROPERTY_TYCHO_MODE, "project"));
         log.info("Tycho Builder:  "
                 + session.getUserProperties().getProperty(TychoConstants.SESSION_PROPERTY_TYCHO_BUILDER, "maven"));
+        log.info("Build Threads:  " + session.getRequest().getDegreeOfConcurrency());
         if (disableLifecycleParticipation(session)) {
             buildListeners.notifyBuildStart(session);
             return;

diff --git a/tycho-core/src/main/java/org/eclipse/tycho/p2/publisher/AbstractDependenciesAction.java b/tycho-core/src/main/java/org/eclipse/tycho/p2/publisher/AbstractDependenciesAction.java
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/p2/publisher/AbstractSiteDependenciesAction.java b/tycho-core/src/main/java/org/eclipse/tycho/p2/publisher/AbstractSiteDependenciesAction.java
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/p2/publisher/CategoryDependenciesAction.java b/tycho-core/src/main/java/org/eclipse/tycho/p2/publisher/CategoryDependenciesAction.java
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/p2/publisher/FeatureDependenciesAction.java b/tycho-core/src/main/java/org/eclipse/tycho/p2/publisher/FeatureDependenciesAction.java
@@ -34,6 +34,7 @@
 import org.eclipse.equinox.p2.publisher.eclipse.FeatureEntry;
 import org.eclipse.equinox.p2.query.QueryUtil;
 import org.eclipse.equinox.spi.p2.publisher.PublisherHelper;
+import org.eclipse.tycho.p2maven.actions.AbstractDependenciesAction;
 
 public class FeatureDependenciesAction extends AbstractDependenciesAction {
     /**

diff --git a/tycho-core/src/main/java/org/eclipse/tycho/p2/publisher/ProductDependenciesAction.java b/tycho-core/src/main/java/org/eclipse/tycho/p2/publisher/ProductDependenciesAction.java
@@ -28,6 +28,7 @@
 import org.eclipse.equinox.p2.publisher.AdviceFileAdvice;
 import org.eclipse.equinox.p2.publisher.IPublisherInfo;
 import org.eclipse.equinox.p2.publisher.eclipse.FeatureEntry;
+import org.eclipse.tycho.p2maven.actions.AbstractDependenciesAction;
 
 public class ProductDependenciesAction extends AbstractDependenciesAction {
     private final IProductDescriptor product;
@@ -53,7 +54,7 @@ protected Set<IRequirement> getRequiredCapabilities() {
         ProductContentType type = product.getProductContentType();
         if (type == ProductContentType.FEATURES || type == ProductContentType.MIXED) {
             for (IVersionedId feature : product.getFeatures()) {
-                String id = feature.getId() + FEATURE_GROUP_IU_SUFFIX; //$NON-NLS-1$
+                String id = feature.getId() + FEATURE_GROUP_IU_SUFFIX;
                 Version version = feature.getVersion();
 
                 addRequiredCapability(required, id, version, null, false);