commit c53e62202370f139cd7f59e991e757405233650d
author Thomas Watson <tjwatson@us.ibm.com> Wed May 14 11:05:51 2014 -0500
committer Thomas Watson <tjwatson@us.ibm.com> Wed May 14 11:05:51 2014 -0500
tree 2473269a16cf9a904cb3281c3ffa3bdf46e121db
parent df2b012dce4f1e9b59ec2a844ee8737c3443ce6e

Bug 434870 - org.eclipse.equinox.server.p2 is tied to a specific (outdated) version of ECF

features/org.eclipse.equinox.server.p2/feature.xml

diff --git a/features/org.eclipse.equinox.server.p2/feature.xml b/features/org.eclipse.equinox.server.p2/feature.xml
index 4edec6b..ff3a2f4 100644
--- a/features/org.eclipse.equinox.server.p2/feature.xml
+++ b/features/org.eclipse.equinox.server.p2/feature.xml
@@ -15,6 +15,15 @@
       %license
    </license>
 
+   <requires>
+      <import feature="org.eclipse.ecf.core.feature" version="1.1.0" match="compatible"/>
+      <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"
@@ -114,57 +123,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.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.eclipse.ecf.provider.filetransfer.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"