[backport] Import BundlesAction for source support

p2-maven-plugin/src/main/java/org/eclipse/tycho/p2maven/InstallableUnitGenerator.java

@@ -53,7 +53,6 @@
 import org.eclipse.equinox.p2.publisher.IPublisherAction;
 import org.eclipse.equinox.p2.publisher.IPublisherInfo;
 import org.eclipse.equinox.p2.publisher.PublisherInfo;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
 import org.eclipse.equinox.p2.publisher.eclipse.Feature;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactRepositoryManager;
 import org.eclipse.osgi.framework.util.CaseInsensitiveDictionaryMap;
@@ -67,6 +66,7 @@
 import org.eclipse.tycho.p2maven.actions.ProductDependenciesAction;
 import org.eclipse.tycho.p2maven.actions.ProductFile2;
 import org.eclipse.tycho.p2maven.io.MetadataIO;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 import org.eclipse.tycho.resolver.InstallableUnitProvider;
 import org.osgi.framework.Constants;
 import org.xml.sax.SAXException;

p2-maven-plugin/src/main/java/org/eclipse/tycho/p2maven/MavenProjectDependencyProcessor.java

@@ -43,10 +43,10 @@
 import org.eclipse.equinox.p2.metadata.IProvidedCapability;
 import org.eclipse.equinox.p2.metadata.IRequirement;
 import org.eclipse.equinox.p2.metadata.expression.IMatchExpression;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
 import org.eclipse.equinox.p2.query.CollectionResult;
 import org.eclipse.equinox.p2.query.IQueryable;
 import org.eclipse.tycho.p2maven.io.MetadataIO;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 
 /**
  * THis component computes dependencies between projects

p2-maven-plugin/src/main/java/org/eclipse/tycho/p2maven/actions/BundleDependenciesAction.java

@@ -31,13 +31,13 @@
 import org.eclipse.equinox.p2.publisher.AdviceFileParser;
 import org.eclipse.equinox.p2.publisher.IPublisherInfo;
 import org.eclipse.equinox.p2.publisher.actions.ICapabilityAdvice;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
 import org.eclipse.equinox.spi.p2.publisher.PublisherHelper;
 import org.eclipse.osgi.service.resolver.BundleDescription;
 import org.eclipse.osgi.service.resolver.BundleSpecification;
 import org.eclipse.osgi.service.resolver.ImportPackageSpecification;
 import org.eclipse.osgi.util.ManifestElement;
 import org.eclipse.tycho.OptionalResolutionAction;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 
 public class BundleDependenciesAction extends BundlesAction {
 

p2-maven-plugin/src/main/java/org/eclipse/tycho/p2maven/tools/TychoFeaturesAndBundlesPublisherApplication.java

@@ -46,13 +46,13 @@
 import org.eclipse.equinox.p2.publisher.IPublisherInfo;
 import org.eclipse.equinox.p2.publisher.IPublisherResult;
 import org.eclipse.equinox.p2.publisher.PublisherInfo;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
 import org.eclipse.equinox.p2.repository.IRepositoryManager;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
 import org.eclipse.equinox.p2.repository.artifact.spi.ArtifactDescriptor;
 import org.eclipse.equinox.spi.p2.publisher.PublisherHelper;
 import org.eclipse.osgi.service.resolver.BundleDescription;
 import org.eclipse.tycho.p2maven.advices.PGPSignatureAdvice;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 import org.osgi.framework.BundleException;
 
 public class TychoFeaturesAndBundlesPublisherApplication extends AbstractPublisherApplication {

target-platform-configuration/src/main/java/org/eclipse/tycho/target/TargetPlatformConfigurationInstallableUnitProvider.java

@@ -31,12 +31,12 @@
 import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription;
 import org.eclipse.equinox.p2.metadata.Version;
 import org.eclipse.equinox.p2.metadata.VersionRange;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
 import org.eclipse.tycho.ArtifactType;
 import org.eclipse.tycho.core.TargetPlatformConfiguration;
 import org.eclipse.tycho.core.TychoProject;
 import org.eclipse.tycho.core.TychoProjectManager;
 import org.eclipse.tycho.core.resolver.DefaultTargetPlatformConfigurationReader;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 import org.eclipse.tycho.resolver.InstallableUnitProvider;
 
 /**

tycho-core/src/main/java/org/eclipse/tycho/core/TychoProjectManager.java

@@ -62,6 +62,7 @@
 import org.eclipse.tycho.core.resolver.shared.IncludeSourceMode;
 import org.eclipse.tycho.helper.PluginRealmHelper;
 import org.eclipse.tycho.model.project.EclipseProject;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 import org.eclipse.tycho.targetplatform.TargetDefinition;
 
 import aQute.bnd.osgi.Processor;
@@ -164,7 +165,7 @@ private Map<String, String> getProfileProperties(TargetEnvironment environment,
         properties.put("org.eclipse.update.install.features", "true");
         IncludeSourceMode sourceMode = configuration.getTargetDefinitionIncludeSourceMode();
         if (sourceMode == IncludeSourceMode.force || sourceMode == IncludeSourceMode.honor) {
-            properties.put("org.eclipse.update.install.sources", "true");
+            properties.put(BundlesAction.FILTER_PROPERTY_INSTALL_SOURCE, "true");
         }
         properties.putAll(configuration.getProfileProperties());
         return properties;

tycho-core/src/main/java/org/eclipse/tycho/core/bnd/TargetPlatformRepository.java

@@ -26,13 +26,13 @@
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.eclipse.equinox.p2.metadata.IArtifactKey;
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
 import org.eclipse.equinox.p2.query.IQueryResult;
 import org.eclipse.equinox.p2.query.QueryUtil;
 import org.eclipse.tycho.ArtifactKey;
 import org.eclipse.tycho.ArtifactType;
 import org.eclipse.tycho.TargetPlatform;
 import org.eclipse.tycho.TargetPlatformService;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 
 import aQute.bnd.osgi.Instruction;
 import aQute.bnd.service.RepositoryPlugin;

tycho-core/src/main/java/org/eclipse/tycho/core/resolver/AdditionalBundleRequirementsInstallableUnitProvider.java

@@ -29,12 +29,12 @@
 import org.eclipse.equinox.p2.metadata.IRequirement;
 import org.eclipse.equinox.p2.metadata.MetadataFactory;
 import org.eclipse.equinox.p2.metadata.VersionRange;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
 import org.eclipse.tycho.BuildProperties;
 import org.eclipse.tycho.BuildPropertiesParser;
 import org.eclipse.tycho.ReactorProject;
 import org.eclipse.tycho.core.TychoProjectManager;
 import org.eclipse.tycho.core.osgitools.DefaultReactorProject;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 import org.eclipse.tycho.resolver.InstallableUnitProvider;
 
 import aQute.bnd.osgi.Constants;

tycho-core/src/main/java/org/eclipse/tycho/core/resolver/MavenTargetDefinitionContent.java

@@ -57,7 +57,6 @@
 import org.eclipse.equinox.p2.publisher.IPublisherInfo;
 import org.eclipse.equinox.p2.publisher.PublisherInfo;
 import org.eclipse.equinox.p2.publisher.actions.IPropertyAdvice;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
 import org.eclipse.equinox.p2.publisher.eclipse.Feature;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;
@@ -85,6 +84,7 @@
 import org.eclipse.tycho.p2.resolver.WrappedArtifact;
 import org.eclipse.tycho.p2maven.advices.MavenChecksumAdvice;
 import org.eclipse.tycho.p2maven.advices.MavenPropertiesAdvice;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 import org.eclipse.tycho.targetplatform.TargetDefinition.BNDInstructions;
 import org.eclipse.tycho.targetplatform.TargetDefinition.MavenDependency;
 import org.eclipse.tycho.targetplatform.TargetDefinition.MavenGAVLocation;

tycho-core/src/main/java/org/eclipse/tycho/core/resolver/target/ArtifactTypeHelper.java

@@ -24,7 +24,7 @@
 import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription;
 import org.eclipse.equinox.p2.metadata.Version;
 import org.eclipse.equinox.p2.metadata.VersionRange;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 import org.eclipse.equinox.p2.query.IQuery;
 import org.eclipse.equinox.p2.query.QueryUtil;
 import org.eclipse.equinox.spi.p2.publisher.PublisherHelper;

tycho-core/src/main/java/org/eclipse/tycho/core/resolver/target/TargetPlatformFilterEvaluator.java

@@ -22,7 +22,7 @@
 import org.eclipse.equinox.p2.metadata.IProvidedCapability;
 import org.eclipse.equinox.p2.metadata.Version;
 import org.eclipse.equinox.p2.metadata.VersionRange;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 import org.eclipse.equinox.spi.p2.publisher.PublisherHelper;
 import org.eclipse.tycho.core.shared.MavenLogger;
 import org.eclipse.tycho.targetplatform.TargetPlatformFilter;

tycho-core/src/main/java/org/eclipse/tycho/osgi/resource/InstallableUnitCapability.java

@@ -18,7 +18,7 @@
 
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.equinox.p2.metadata.IProvidedCapability;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 import org.eclipse.equinox.spi.p2.publisher.PublisherHelper;
 import org.osgi.framework.Version;
 import org.osgi.framework.namespace.BundleNamespace;

tycho-core/src/main/java/org/eclipse/tycho/osgi/resource/InstallableUnitRequirement.java

@@ -21,7 +21,7 @@
 import org.eclipse.equinox.p2.metadata.Version;
 import org.eclipse.equinox.p2.metadata.VersionRange;
 import org.eclipse.equinox.p2.metadata.expression.IMatchExpression;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 import org.eclipse.equinox.spi.p2.publisher.PublisherHelper;
 import org.osgi.framework.namespace.BundleNamespace;
 import org.osgi.framework.namespace.PackageNamespace;

tycho-core/src/main/java/org/eclipse/tycho/p2/publisher/BundleDependenciesAction.java

@@ -32,7 +32,7 @@
 import org.eclipse.equinox.p2.publisher.AdviceFileParser;
 import org.eclipse.equinox.p2.publisher.IPublisherInfo;
 import org.eclipse.equinox.p2.publisher.actions.ICapabilityAdvice;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 import org.eclipse.equinox.spi.p2.publisher.PublisherHelper;
 import org.eclipse.osgi.service.resolver.BundleDescription;
 import org.eclipse.osgi.service.resolver.BundleSpecification;

tycho-core/src/main/java/org/eclipse/tycho/p2/resolver/BundlePublisher.java

@@ -33,7 +33,7 @@
 import org.eclipse.equinox.p2.publisher.Publisher;
 import org.eclipse.equinox.p2.publisher.PublisherInfo;
 import org.eclipse.equinox.p2.publisher.actions.IPropertyAdvice;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;

tycho-core/src/main/java/org/eclipse/tycho/p2/resolver/FeatureGenerator.java

@@ -45,7 +45,7 @@
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.equinox.p2.metadata.IVersionedId;
 import org.eclipse.equinox.p2.metadata.VersionedId;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 import org.eclipse.equinox.p2.publisher.eclipse.Feature;
 import org.eclipse.tycho.core.MavenModelFacade;
 import org.eclipse.tycho.core.MavenModelFacade.MavenLicense;

tycho-core/src/main/java/org/eclipse/tycho/p2/resolver/FileTargetDefinitionContent.java

@@ -27,7 +27,7 @@
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.equinox.p2.publisher.IPublisherInfo;
 import org.eclipse.equinox.p2.publisher.PublisherInfo;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 import org.eclipse.equinox.p2.publisher.eclipse.Feature;
 import org.eclipse.equinox.p2.query.IQuery;
 import org.eclipse.equinox.p2.query.IQueryResult;

tycho-core/src/main/java/org/eclipse/tycho/p2/tools/director/shared/AbstractDirectorApplicationCommand.java

@@ -25,6 +25,7 @@
 import org.eclipse.tycho.DependencySeed;
 import org.eclipse.tycho.TargetEnvironment;
 import org.eclipse.tycho.p2.CommandLineArguments;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 import org.eclipse.tycho.p2tools.copiedfromp2.PhaseSetFactory;
 
 /**
@@ -165,8 +166,8 @@ protected List<String> getDirectorApplicationArguments() {
     public Map<String, String> getProfileProperties() {
         Map<String, String> props = new TreeMap<>(this.profileProperties);
         props.put("org.eclipse.update.install.features", Boolean.toString(installFeatures));
-        if (installSources && props.get("org.eclipse.update.install.sources") == null) {
-            props.put("org.eclipse.update.install.sources", "true");
+        if (installSources && props.get(BundlesAction.FILTER_PROPERTY_INSTALL_SOURCE) == null) {
+            props.put(BundlesAction.FILTER_PROPERTY_INSTALL_SOURCE, "true");
         }
         return props;
     }

tycho-core/src/main/java/org/eclipse/tycho/p2resolver/AbstractResolutionStrategy.java

@@ -33,6 +33,7 @@
 import org.eclipse.tycho.TargetEnvironment;
 import org.eclipse.tycho.core.shared.MavenLogger;
 import org.eclipse.tycho.p2.resolver.ResolverException;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 
 public abstract class AbstractResolutionStrategy {
     protected static final IInstallableUnit[] EMPTY_IU_ARRAY = new IInstallableUnit[0];
@@ -71,7 +72,7 @@ protected abstract Collection<IInstallableUnit> resolve(Map<String, String> prop
     private Map<String, String> getEffectiveFilterProperties(TargetEnvironment environment) {
         Map<String, String> result = environment.toFilterProperties();
         result.put("org.eclipse.update.install.features", "true");
-        result.put("org.eclipse.update.install.sources", "true");
+        result.put(BundlesAction.FILTER_PROPERTY_INSTALL_SOURCE, "true");
         insertAdditionalFilterProperties(result);
         return result;
     }

tycho-core/src/main/java/org/eclipse/tycho/p2resolver/P2GeneratorImpl.java

@@ -54,7 +54,7 @@
 import org.eclipse.equinox.p2.publisher.IPublisherResult;
 import org.eclipse.equinox.p2.publisher.PublisherInfo;
 import org.eclipse.equinox.p2.publisher.actions.IFeatureRootAdvice;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 import org.eclipse.equinox.p2.publisher.eclipse.Feature;
 import org.eclipse.equinox.p2.publisher.eclipse.FeaturesAction;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;

tycho-core/src/main/java/org/eclipse/tycho/p2resolver/P2ResolverFactoryImpl.java

@@ -38,7 +38,7 @@
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.equinox.p2.metadata.IProvidedCapability;
 import org.eclipse.equinox.p2.metadata.IRequirement;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactRepositoryManager;
 import org.eclipse.tycho.ArtifactDescriptor;
 import org.eclipse.tycho.IRepositoryIdManager;

tycho-core/src/main/java/org/eclipse/tycho/p2resolver/P2ResolverImpl.java

@@ -41,7 +41,7 @@
 import org.eclipse.equinox.p2.metadata.MetadataFactory;
 import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription;
 import org.eclipse.equinox.p2.metadata.VersionRange;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 import org.eclipse.equinox.p2.query.IQuery;
 import org.eclipse.equinox.p2.query.IQueryResult;
 import org.eclipse.equinox.p2.query.IQueryable;

tycho-core/src/main/java/org/eclipse/tycho/p2resolver/RepositoryLocationContent.java

@@ -32,7 +32,7 @@
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.equinox.p2.publisher.IPublisherInfo;
 import org.eclipse.equinox.p2.publisher.PublisherInfo;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 import org.eclipse.equinox.p2.publisher.eclipse.Feature;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;

tycho-core/src/main/java/org/eclipse/tycho/p2resolver/SourcesBundleDependencyMetadataGenerator.java

@@ -24,7 +24,7 @@
 import org.eclipse.equinox.p2.publisher.IPublisherAdvice;
 import org.eclipse.equinox.p2.publisher.IPublisherInfo;
 import org.eclipse.equinox.p2.publisher.PublisherInfo;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
+import org.eclipse.tycho.p2maven.tmp.BundlesAction;
 import org.eclipse.osgi.service.resolver.BundleDescription;
 import org.eclipse.osgi.service.resolver.StateObjectFactory;
 import org.eclipse.tycho.BuildPropertiesParser;

tycho-core/src/test/java/org/eclipse/tycho/p2resolver/P2DependencyGeneratorImplTest.java

@@ -79,7 +79,7 @@ public void bundle() throws Exception {
 
         assertEquals("org.eclipse.tycho.p2.impl.test.bundle", unit.getId());
         assertEquals("1.0.0.qualifier", unit.getVersion().toString());
-        assertEquals(3, unit.getRequirements().size());
+        assertEquals(4, unit.getRequirements().size());
         assertEquals(DEFAULT_CLASSIFIER, unit.getProperty(TychoConstants.PROP_CLASSIFIER));
 
         // not really necessary, but we get this because we reuse standard p2 implementation
@@ -97,14 +97,21 @@ public void bundle_with_p2_inf() throws Exception {
         assertEquals("1.0.0.qualifier", unit.getVersion().toString());
 
         List<IRequirement> requirements = new ArrayList<>(unit.getRequirements());
-        assertEquals(1, requirements.size());
-        IRequiredCapability requirement = (IRequiredCapability) requirements.get(0);
-        assertEquals(IInstallableUnit.NAMESPACE_IU_ID, requirement.getNamespace());
-        assertEquals("required.p2.inf", requirement.getName());
-
+        assertNotNull(getReqCap(requirements, IInstallableUnit.NAMESPACE_IU_ID, "required.p2.inf"));
         assertNotNull(getUnitWithId("iu.p2.inf", units));
     }
 
+    private IRequiredCapability getReqCap(List<IRequirement> requirements, String ns, String name) {
+        for (IRequirement r : requirements) {
+            if (r instanceof IRequiredCapability cap) {
+                if (ns.equals(cap.getNamespace()) && name.equals(cap.getName())) {
+                    return cap;
+                }
+            }
+        }
+        return null;
+    }
+
     private IInstallableUnit getUnitWithId(String id, List<IInstallableUnit> units) {
         for (IInstallableUnit unit : units) {
             if (id.equals(unit.getId())) {