diff options
author | Alexander Kurtakov | 2021-01-16 11:20:28 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2021-01-16 18:55:59 +0000 |
commit | 09d81ece3fae68ac93ddb730854e54c97cbb8646 (patch) | |
tree | cd0ab5e2a99efa4a250eb776f2c3ebffed9f1221 | |
parent | bfc64dec51e2d35ead869507099a134d241f4c32 (diff) | |
download | rt.equinox.p2-I20210118-1800.tar.gz rt.equinox.p2-I20210118-1800.tar.xz rt.equinox.p2-I20210118-1800.zip |
Do not include equinox.ds in p2 products.I20210118-1800I20210117-1940I20210117-1800I20210116-1800
It's been replaced by felix.scr years ago.
Change-Id: I465071f04e6fdf15d472b0cc13141582d73654dc
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
8 files changed, 93 insertions, 12 deletions
diff --git a/bundles/org.eclipse.equinox.p2.installer/installer.product b/bundles/org.eclipse.equinox.p2.installer/installer.product index 7a6917f60..7e885dd71 100644 --- a/bundles/org.eclipse.equinox.p2.installer/installer.product +++ b/bundles/org.eclipse.equinox.p2.installer/installer.product @@ -35,10 +35,12 @@ <plugin id="org.apache.commons.codec"/> <plugin id="org.apache.commons.httpclient"/> <plugin id="org.apache.commons.logging"/> + <plugin id="org.apache.felix.scr"/> <plugin id="org.eclipse.core.contenttype"/> <plugin id="org.eclipse.core.expressions"/> <plugin id="org.eclipse.core.jobs"/> <plugin id="org.eclipse.core.net"/> + <plugin id="org.eclipse.core.net.linux.x86_64" fragment="true"/> <plugin id="org.eclipse.core.runtime"/> <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/> <plugin id="org.eclipse.ecf"/> @@ -51,11 +53,12 @@ <plugin id="org.eclipse.ecf.ssl" fragment="true"/> <plugin id="org.eclipse.equinox.app"/> <plugin id="org.eclipse.equinox.common"/> - <plugin id="org.eclipse.equinox.ds"/> + <plugin id="org.eclipse.equinox.concurrent"/> <plugin id="org.eclipse.equinox.frameworkadmin"/> <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/> <plugin id="org.eclipse.equinox.launcher"/> <plugin id="org.eclipse.equinox.launcher.cocoa.macosx" fragment="true"/> + <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64" fragment="true"/> <plugin id="org.eclipse.equinox.p2.artifact.repository"/> <plugin id="org.eclipse.equinox.p2.core"/> <plugin id="org.eclipse.equinox.p2.director"/> @@ -72,23 +75,29 @@ <plugin id="org.eclipse.equinox.preferences"/> <plugin id="org.eclipse.equinox.registry"/> <plugin id="org.eclipse.equinox.security"/> + <plugin id="org.eclipse.equinox.security.linux.x86_64" fragment="true"/> <plugin id="org.eclipse.equinox.security.macosx" fragment="true"/> <plugin id="org.eclipse.equinox.simpleconfigurator"/> <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/> <plugin id="org.eclipse.equinox.transforms.hook" fragment="true"/> <plugin id="org.eclipse.equinox.util"/> <plugin id="org.eclipse.osgi"/> + <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/> <plugin id="org.eclipse.osgi.services"/> + <plugin id="org.eclipse.osgi.util"/> <plugin id="org.eclipse.swt"/> + <plugin id="org.eclipse.swt.browser.chromium.gtk.linux.x86_64" fragment="true"/> <plugin id="org.eclipse.swt.cocoa.macosx" fragment="true"/> + <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/> <plugin id="org.sat4j.core"/> <plugin id="org.sat4j.pb"/> + <plugin id="org.tukaani.xz"/> </plugins> <configurations> + <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" /> <plugin id="org.eclipse.equinox.app" autoStart="true" startLevel="4" /> <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" /> - <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" /> <plugin id="org.eclipse.equinox.frameworkadmin.equinox" autoStart="true" startLevel="3" /> <plugin id="org.eclipse.equinox.registry" autoStart="true" startLevel="3" /> <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" /> diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/Bootstrap.product b/bundles/org.eclipse.equinox.p2.reconciler.dropins/Bootstrap.product index 0b8e0c2b2..833e2413c 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/Bootstrap.product +++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/Bootstrap.product @@ -3,6 +3,9 @@ <product name="p2 bootstrap" id="org.eclipse.equinox.p2.reconciler.dropins.product" application="org.eclipse.equinox.p2.reconciler.application" version="1.3.0.qualifier" useFeatures="false" includeLaunchers="true"> + <configIni> + </configIni> + <launcherArgs> <vmArgs>-Dorg.eclipse.equinox.p2.reconciler.noConfig=true </vmArgs> @@ -22,10 +25,12 @@ </vm> <plugins> + <plugin id="org.apache.felix.scr"/> <plugin id="org.eclipse.core.contenttype"/> <plugin id="org.eclipse.core.expressions"/> <plugin id="org.eclipse.core.jobs"/> <plugin id="org.eclipse.core.net"/> + <plugin id="org.eclipse.core.net.linux.x86_64" fragment="true"/> <plugin id="org.eclipse.core.runtime"/> <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/> <plugin id="org.eclipse.ecf"/> @@ -36,7 +41,7 @@ <plugin id="org.eclipse.ecf.ssl" fragment="true"/> <plugin id="org.eclipse.equinox.app"/> <plugin id="org.eclipse.equinox.common"/> - <plugin id="org.eclipse.equinox.ds"/> + <plugin id="org.eclipse.equinox.concurrent"/> <plugin id="org.eclipse.equinox.frameworkadmin"/> <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/> <plugin id="org.eclipse.equinox.p2.artifact.repository"/> @@ -50,6 +55,7 @@ <plugin id="org.eclipse.equinox.p2.metadata"/> <plugin id="org.eclipse.equinox.p2.metadata.repository"/> <plugin id="org.eclipse.equinox.p2.publisher"/> + <plugin id="org.eclipse.equinox.p2.publisher.eclipse"/> <plugin id="org.eclipse.equinox.p2.reconciler.dropins"/> <plugin id="org.eclipse.equinox.p2.repository"/> <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/> @@ -58,13 +64,17 @@ <plugin id="org.eclipse.equinox.preferences"/> <plugin id="org.eclipse.equinox.registry"/> <plugin id="org.eclipse.equinox.security"/> + <plugin id="org.eclipse.equinox.security.linux.x86_64" fragment="true"/> <plugin id="org.eclipse.equinox.simpleconfigurator"/> <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/> <plugin id="org.eclipse.equinox.util"/> <plugin id="org.eclipse.osgi"/> + <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/> <plugin id="org.eclipse.osgi.services"/> + <plugin id="org.eclipse.osgi.util"/> <plugin id="org.sat4j.core"/> <plugin id="org.sat4j.pb"/> + <plugin id="org.tukaani.xz"/> </plugins> diff --git a/bundles/org.eclipse.equinox.p2.tests.reconciler.product/reconciler.product b/bundles/org.eclipse.equinox.p2.tests.reconciler.product/reconciler.product index 16b033ab4..02388ffa0 100644 --- a/bundles/org.eclipse.equinox.p2.tests.reconciler.product/reconciler.product +++ b/bundles/org.eclipse.equinox.p2.tests.reconciler.product/reconciler.product @@ -24,6 +24,8 @@ <plugins> <plugin id="com.ibm.icu"/> + <plugin id="com.sun.jna"/> + <plugin id="com.sun.jna.platform"/> <plugin id="javax.annotation"/> <plugin id="javax.inject"/> <plugin id="javax.xml"/> @@ -62,6 +64,7 @@ <plugin id="org.eclipse.e4.ui.css.swt"/> <plugin id="org.eclipse.e4.ui.css.swt.theme"/> <plugin id="org.eclipse.e4.ui.di"/> + <plugin id="org.eclipse.e4.ui.dialogs"/> <plugin id="org.eclipse.e4.ui.model.workbench"/> <plugin id="org.eclipse.e4.ui.services"/> <plugin id="org.eclipse.e4.ui.swt.gtk" fragment="true"/> @@ -85,7 +88,7 @@ <plugin id="org.eclipse.emf.ecore.xmi"/> <plugin id="org.eclipse.equinox.app"/> <plugin id="org.eclipse.equinox.common"/> - <plugin id="org.eclipse.equinox.ds"/> + <plugin id="org.eclipse.equinox.concurrent"/> <plugin id="org.eclipse.equinox.event"/> <plugin id="org.eclipse.equinox.frameworkadmin"/> <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/> @@ -124,16 +127,19 @@ <plugin id="org.eclipse.help"/> <plugin id="org.eclipse.jface"/> <plugin id="org.eclipse.jface.databinding"/> + <plugin id="org.eclipse.jface.notifications"/> <plugin id="org.eclipse.osgi"/> <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/> <plugin id="org.eclipse.osgi.services"/> <plugin id="org.eclipse.osgi.util"/> <plugin id="org.eclipse.swt"/> + <plugin id="org.eclipse.swt.browser.chromium.gtk.linux.x86_64" fragment="true"/> <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/> <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/> <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/> <plugin id="org.eclipse.ui"/> <plugin id="org.eclipse.ui.workbench"/> + <plugin id="org.eclipse.urischeme"/> <plugin id="org.sat4j.core"/> <plugin id="org.sat4j.pb"/> <plugin id="org.tukaani.xz"/> @@ -144,9 +150,9 @@ </plugins> <configurations> + <plugin id="org.apache.felix.scr" autoStart="true" startLevel="3" /> <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="2" /> <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" /> - <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="3" /> <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="3" /> <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" /> <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" /> diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product index 6b02be252..d5045d458 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product +++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product @@ -136,9 +136,21 @@ Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in t <plugins> <plugin id="com.ibm.icu"/> + <plugin id="com.sun.jna"/> + <plugin id="com.sun.jna.platform"/> + <plugin id="javax.annotation"/> + <plugin id="javax.inject"/> + <plugin id="org.apache.batik.constants"/> + <plugin id="org.apache.batik.css"/> + <plugin id="org.apache.batik.i18n"/> + <plugin id="org.apache.batik.util"/> <plugin id="org.apache.commons.codec"/> <plugin id="org.apache.commons.httpclient"/> + <plugin id="org.apache.commons.io"/> + <plugin id="org.apache.commons.jxpath"/> <plugin id="org.apache.commons.logging"/> + <plugin id="org.apache.felix.scr"/> + <plugin id="org.apache.xmlgraphics"/> <plugin id="org.eclipse.compare"/> <plugin id="org.eclipse.compare.core"/> <plugin id="org.eclipse.core.commands"/> @@ -149,11 +161,37 @@ Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in t <plugin id="org.eclipse.core.expressions"/> <plugin id="org.eclipse.core.filebuffers"/> <plugin id="org.eclipse.core.filesystem"/> + <plugin id="org.eclipse.core.filesystem.linux.x86_64" fragment="true"/> <plugin id="org.eclipse.core.filesystem.macosx" fragment="true"/> <plugin id="org.eclipse.core.jobs"/> <plugin id="org.eclipse.core.net"/> + <plugin id="org.eclipse.core.net.linux.x86_64" fragment="true"/> <plugin id="org.eclipse.core.resources"/> <plugin id="org.eclipse.core.runtime"/> + <plugin id="org.eclipse.e4.core.commands"/> + <plugin id="org.eclipse.e4.core.contexts"/> + <plugin id="org.eclipse.e4.core.di"/> + <plugin id="org.eclipse.e4.core.di.annotations"/> + <plugin id="org.eclipse.e4.core.di.extensions"/> + <plugin id="org.eclipse.e4.core.di.extensions.supplier"/> + <plugin id="org.eclipse.e4.core.services"/> + <plugin id="org.eclipse.e4.emf.xpath"/> + <plugin id="org.eclipse.e4.ui.bindings"/> + <plugin id="org.eclipse.e4.ui.css.core"/> + <plugin id="org.eclipse.e4.ui.css.swt"/> + <plugin id="org.eclipse.e4.ui.css.swt.theme"/> + <plugin id="org.eclipse.e4.ui.di"/> + <plugin id="org.eclipse.e4.ui.dialogs"/> + <plugin id="org.eclipse.e4.ui.ide"/> + <plugin id="org.eclipse.e4.ui.model.workbench"/> + <plugin id="org.eclipse.e4.ui.services"/> + <plugin id="org.eclipse.e4.ui.swt.gtk" fragment="true"/> + <plugin id="org.eclipse.e4.ui.widgets"/> + <plugin id="org.eclipse.e4.ui.workbench"/> + <plugin id="org.eclipse.e4.ui.workbench.addons.swt"/> + <plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/> + <plugin id="org.eclipse.e4.ui.workbench.swt"/> + <plugin id="org.eclipse.e4.ui.workbench3"/> <plugin id="org.eclipse.ecf"/> <plugin id="org.eclipse.ecf.filetransfer"/> <plugin id="org.eclipse.ecf.identity"/> @@ -162,13 +200,19 @@ Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in t <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl" fragment="true"/> <plugin id="org.eclipse.ecf.provider.filetransfer.ssl" fragment="true"/> <plugin id="org.eclipse.ecf.ssl" fragment="true"/> + <plugin id="org.eclipse.emf.common"/> + <plugin id="org.eclipse.emf.ecore"/> + <plugin id="org.eclipse.emf.ecore.change"/> + <plugin id="org.eclipse.emf.ecore.xmi"/> <plugin id="org.eclipse.equinox.app"/> + <plugin id="org.eclipse.equinox.bidi"/> <plugin id="org.eclipse.equinox.common"/> - <plugin id="org.eclipse.equinox.ds"/> + <plugin id="org.eclipse.equinox.concurrent"/> <plugin id="org.eclipse.equinox.frameworkadmin"/> <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/> <plugin id="org.eclipse.equinox.launcher"/> <plugin id="org.eclipse.equinox.launcher.cocoa.macosx" fragment="true"/> + <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64" fragment="true"/> <plugin id="org.eclipse.equinox.p2.artifact.repository"/> <plugin id="org.eclipse.equinox.p2.console"/> <plugin id="org.eclipse.equinox.p2.core"/> @@ -181,6 +225,7 @@ Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in t <plugin id="org.eclipse.equinox.p2.metadata.repository"/> <plugin id="org.eclipse.equinox.p2.operations"/> <plugin id="org.eclipse.equinox.p2.publisher"/> + <plugin id="org.eclipse.equinox.p2.publisher.eclipse"/> <plugin id="org.eclipse.equinox.p2.repository"/> <plugin id="org.eclipse.equinox.p2.repository.tools"/> <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/> @@ -193,6 +238,7 @@ Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in t <plugin id="org.eclipse.equinox.preferences"/> <plugin id="org.eclipse.equinox.registry"/> <plugin id="org.eclipse.equinox.security"/> + <plugin id="org.eclipse.equinox.security.linux.x86_64" fragment="true"/> <plugin id="org.eclipse.equinox.security.macosx" fragment="true"/> <plugin id="org.eclipse.equinox.security.ui"/> <plugin id="org.eclipse.equinox.simpleconfigurator"/> @@ -201,29 +247,41 @@ Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in t <plugin id="org.eclipse.help"/> <plugin id="org.eclipse.jface"/> <plugin id="org.eclipse.jface.databinding"/> + <plugin id="org.eclipse.jface.notifications"/> <plugin id="org.eclipse.jface.text"/> <plugin id="org.eclipse.osgi"/> + <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/> <plugin id="org.eclipse.osgi.services"/> + <plugin id="org.eclipse.osgi.util"/> <plugin id="org.eclipse.swt"/> + <plugin id="org.eclipse.swt.browser.chromium.gtk.linux.x86_64" fragment="true"/> <plugin id="org.eclipse.swt.cocoa.macosx" fragment="true"/> + <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/> <plugin id="org.eclipse.text"/> <plugin id="org.eclipse.ui"/> <plugin id="org.eclipse.ui.cocoa" fragment="true"/> <plugin id="org.eclipse.ui.editors"/> <plugin id="org.eclipse.ui.forms"/> <plugin id="org.eclipse.ui.ide"/> + <plugin id="org.eclipse.ui.navigator"/> <plugin id="org.eclipse.ui.net"/> <plugin id="org.eclipse.ui.views"/> <plugin id="org.eclipse.ui.workbench"/> <plugin id="org.eclipse.ui.workbench.texteditor"/> + <plugin id="org.eclipse.urischeme"/> <plugin id="org.sat4j.core"/> <plugin id="org.sat4j.pb"/> + <plugin id="org.tukaani.xz"/> + <plugin id="org.w3c.css.sac"/> + <plugin id="org.w3c.dom.events"/> + <plugin id="org.w3c.dom.smil"/> + <plugin id="org.w3c.dom.svg"/> </plugins> <configurations> + <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" /> <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" /> <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" /> - <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" /> <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" /> </configurations> diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product index 5b5aefbe8..518936061 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product +++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product @@ -95,7 +95,6 @@ <plugin id="org.eclipse.equinox.app"/> <plugin id="org.eclipse.equinox.common"/> <plugin id="org.eclipse.equinox.concurrent"/> - <plugin id="org.eclipse.equinox.ds"/> <plugin id="org.eclipse.equinox.event"/> <plugin id="org.eclipse.equinox.frameworkadmin"/> <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/> diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.discovery/cloud.product b/examples/org.eclipse.equinox.p2.examples.rcp.discovery/cloud.product index 947f97741..0f39834a8 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.discovery/cloud.product +++ b/examples/org.eclipse.equinox.p2.examples.rcp.discovery/cloud.product @@ -95,7 +95,6 @@ <plugin id="org.eclipse.equinox.app"/> <plugin id="org.eclipse.equinox.common"/> <plugin id="org.eclipse.equinox.concurrent"/> - <plugin id="org.eclipse.equinox.ds"/> <plugin id="org.eclipse.equinox.event"/> <plugin id="org.eclipse.equinox.frameworkadmin"/> <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/> diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/prestartupdate.product b/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/prestartupdate.product index 7c3a05a8b..7415716ac 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/prestartupdate.product +++ b/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/prestartupdate.product @@ -56,7 +56,7 @@ <plugin id="org.eclipse.ecf.ssl" fragment="true"/> <plugin id="org.eclipse.equinox.app"/> <plugin id="org.eclipse.equinox.common"/> - <plugin id="org.eclipse.equinox.ds"/> + <plugin id="org.apache.felix.scr"/> <plugin id="org.eclipse.equinox.frameworkadmin"/> <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/> <plugin id="org.eclipse.equinox.p2.artifact.repository"/> @@ -95,7 +95,7 @@ </plugins> <configurations> - <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="0" /> + <plugin id="org.apache.felix.scr" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.equinox.p2.examples.rcp.prestartupdate" autoStart="true" startLevel="5" /> </configurations> diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/sdkui.product b/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/sdkui.product index 8a628b04c..b5471e7d3 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/sdkui.product +++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/sdkui.product @@ -61,7 +61,7 @@ <plugin id="org.eclipse.ecf.ssl" fragment="true"/> <plugin id="org.eclipse.equinox.app"/> <plugin id="org.eclipse.equinox.common"/> - <plugin id="org.eclipse.equinox.ds"/> + <plugin id="org.apache.felix.scr"/> <plugin id="org.eclipse.equinox.frameworkadmin"/> <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/> <plugin id="org.eclipse.equinox.p2.artifact.repository"/> |