Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Daniel2014-02-07 13:06:25 -0500
committerGerrit Code Review @ Eclipse.org2014-02-16 16:00:37 -0500
commitbeb7dfaa019b509869388fe2588411e28a13422e (patch)
tree35aa6899fd2f63e62041cf832930f3600d2237cc /features/org.eclipse.equinox.p2.core.feature/feature.xml
parentb087b40f8c839c12744439ac8a6ca945bae59035 (diff)
downloadrt.equinox.p2-beb7dfaa019b509869388fe2588411e28a13422e.tar.gz
rt.equinox.p2-beb7dfaa019b509869388fe2588411e28a13422e.tar.xz
rt.equinox.p2-beb7dfaa019b509869388fe2588411e28a13422e.zip
bug 419647: React to ECF feature restructuringI20140218-0800
Replaces direct inclusion of ECF bundles in P2 features with feature inclusion. https://bugs.eclipse.org/bugs/show_bug.cgi?id=419647 Change-Id: Ie11ca39a3da89ad61fe54f8eff9d2e5f6dd55ebc Signed-off-by: Krzysztof Daniel <krzysztof.daniel@gmail.com>
Diffstat (limited to 'features/org.eclipse.equinox.p2.core.feature/feature.xml')
-rw-r--r--features/org.eclipse.equinox.p2.core.feature/feature.xml96
1 files changed, 9 insertions, 87 deletions
diff --git a/features/org.eclipse.equinox.p2.core.feature/feature.xml b/features/org.eclipse.equinox.p2.core.feature/feature.xml
index 634c8d333..0dc324d70 100644
--- a/features/org.eclipse.equinox.p2.core.feature/feature.xml
+++ b/features/org.eclipse.equinox.p2.core.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.p2.core.feature"
label="%featureName"
- version="1.2.100.qualifier"
+ version="1.3.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.0.qualifier">
@@ -19,6 +19,14 @@
%license
</license>
+ <requires>
+ <import feature="org.eclipse.ecf.core.ssl.feature" version="1.0.0" match="compatible"/>
+ <import feature="org.eclipse.ecf.filetransfer.feature" version="3.9.0" match="compatible"/>
+ <import feature="org.eclipse.ecf.filetransfer.httpclient4.feature" version="3.8.0" match="compatible"/>
+ <import feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature" version="1.0.0" match="compatible"/>
+ <import feature="org.eclipse.ecf.filetransfer.ssl.feature" version="1.0.0" match="compatible"/>
+ </requires>
+
<plugin
id="org.eclipse.equinox.p2.artifact.repository"
download-size="0"
@@ -118,64 +126,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.ecf"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ecf.filetransfer"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ecf.identity"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ecf.provider.filetransfer"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ecf.provider.filetransfer.ssl"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ecf.ssl"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.codec"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.logging"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.equinox.frameworkadmin"
download-size="0"
install-size="0"
@@ -260,32 +210,4 @@
fragment="true"
unpack="false"/>
- <plugin
- id="org.eclipse.ecf.provider.filetransfer.httpclient4"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.apache.httpcomponents.httpclient"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.httpcomponents.httpcore"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
</feature>

Back to the top