Bug 578054 - adjust the manifest for importing the API
Change-Id: I405dbde5d2f336b205575a27f778a523acbf149d
Signed-off-by: Christoph Läubrich <laeubi@laeubi-soft.de>
Reviewed-on: https://git.eclipse.org/r/c/equinox/rt.equinox.p2/+/189303
Tested-by: Equinox Bot <equinox-bot@eclipse.org>
Reviewed-by: Mickael Istria <mistria@redhat.com>
diff --git a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
index 9e402ee..73462bd 100644
--- a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.core;singleton:=true
-Bundle-Version: 2.9.0.qualifier
+Bundle-Version: 2.9.100.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.equinox.internal.p2.core.Activator
Bundle-Vendor: %providerName
@@ -64,14 +64,16 @@
org.eclipse.equinox.p2.updatesite,
org.eclipse.equinox.p2.director.app,
org.eclipse.equinox.p2.transport.ecf",
- org.eclipse.equinox.p2.core;version="2.8.0",
- org.eclipse.equinox.p2.core.spi;version="2.1.0"
-Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.5.0,4.0.0)"
+ org.eclipse.equinox.p2.core;version="2.8.0";uses:="org.eclipse.core.runtime",
+ org.eclipse.equinox.p2.core.spi;version="2.1.0";uses:="org.eclipse.equinox.p2.core"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/eventBus.xml, OSGI-INF/agentProvider.xml
Import-Package: org.bouncycastle.bcpg;version="1.65.0",
org.bouncycastle.openpgp;version="1.65.0",
+ org.eclipse.core.runtime;common=split;version="[3.5.0,4.0.0)",
+ org.eclipse.equinox.p2.core;version="[2.8.0,2.9.0)";resolution:=optional,
+ org.eclipse.equinox.p2.core.spi;version="[2.1.0,2.2.0)";resolution:=optional,
org.eclipse.osgi.framework.eventmgr;version="1.2.0",
org.eclipse.osgi.framework.log;version="1.0.0",
org.eclipse.osgi.service.debug;version="1.0.0",
diff --git a/bundles/org.eclipse.equinox.p2.core/META-INF/p2.inf b/bundles/org.eclipse.equinox.p2.core/META-INF/p2.inf
new file mode 100644
index 0000000..0983c41
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.core/META-INF/p2.inf
@@ -0,0 +1,5 @@
+# Workaround https://bugs.eclipse.org/bugs/show_bug.cgi?id=525368
+# we hint about which bundle to download at install that is capable of
+# resolving packages
+requires.0.namespace = osgi.bundle
+requires.0.name = org.eclipse.equinox.common
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.p2.core/pom.xml b/bundles/org.eclipse.equinox.p2.core/pom.xml
index 64622ec..3913f72 100644
--- a/bundles/org.eclipse.equinox.p2.core/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.core/pom.xml
@@ -9,6 +9,6 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.core</artifactId>
- <version>2.9.0-SNAPSHOT</version>
+ <version>2.9.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
