diff options
10 files changed, 21 insertions, 44 deletions
diff --git a/releng/features/org.eclipse.ecf.console.feature/feature.xml b/releng/features/org.eclipse.ecf.console.feature/feature.xml index aa39e029b..1258ec324 100644 --- a/releng/features/org.eclipse.ecf.console.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.console.feature/feature.xml @@ -26,7 +26,8 @@ Contributors: Composent, Inc. - initial API and implementation </license> <requires> - <import feature="org.eclipse.ecf.core.feature" version="1.1" match="compatible"/> + <import plugin="org.eclipse.ecf"/> + <import plugin="org.eclipse.ecf.identity"/> </requires> <plugin diff --git a/releng/features/org.eclipse.ecf.core.ssl.feature/feature.xml b/releng/features/org.eclipse.ecf.core.ssl.feature/feature.xml index 02ac73a23..1a8244fed 100644 --- a/releng/features/org.eclipse.ecf.core.ssl.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.core.ssl.feature/feature.xml @@ -25,7 +25,8 @@ Contributors: Composent, Inc. - initial API and implementation </license> <requires> - <import feature="org.eclipse.ecf.core.feature" version="1.1" match="compatible"/> + <import plugin="org.eclipse.ecf"/> + <import plugin="org.eclipse.ecf.identity"/> </requires> <plugin diff --git a/releng/features/org.eclipse.ecf.datashare.feature/feature.xml b/releng/features/org.eclipse.ecf.datashare.feature/feature.xml index 596f81709..8bf01012e 100644 --- a/releng/features/org.eclipse.ecf.datashare.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.datashare.feature/feature.xml @@ -27,7 +27,8 @@ messaging within a named channel. </license> <requires> - <import feature="org.eclipse.ecf.core.feature" version="1.1" match="compatible"/> + <import plugin="org.eclipse.ecf"/> + <import plugin="org.eclipse.ecf.identity"/> </requires> <plugin diff --git a/releng/features/org.eclipse.ecf.discovery.feature/feature.xml b/releng/features/org.eclipse.ecf.discovery.feature/feature.xml index 004b1b24f..27add58fc 100644 --- a/releng/features/org.eclipse.ecf.discovery.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.discovery.feature/feature.xml @@ -26,7 +26,8 @@ </license> <requires> - <import feature="org.eclipse.ecf.core.feature" version="1.1" match="compatible"/> + <import plugin="org.eclipse.ecf"/> + <import plugin="org.eclipse.ecf.identity"/> </requires> <plugin diff --git a/releng/features/org.eclipse.ecf.filetransfer.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.feature/feature.xml index 48f814a40..e5fe7a975 100644 --- a/releng/features/org.eclipse.ecf.filetransfer.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.filetransfer.feature/feature.xml @@ -26,7 +26,8 @@ Contributors: Composent, Inc. - initial API and implementation </license> <requires> - <import feature="org.eclipse.ecf.core.feature" version="1.1" match="compatible"/> + <import plugin="org.eclipse.ecf"/> + <import plugin="org.eclipse.ecf.identity"/> </requires> <plugin diff --git a/releng/features/org.eclipse.ecf.presence.feature/feature.xml b/releng/features/org.eclipse.ecf.presence.feature/feature.xml index 1b84f6cf0..d6e03108d 100644 --- a/releng/features/org.eclipse.ecf.presence.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.presence.feature/feature.xml @@ -27,7 +27,8 @@ allows distribution of user presence and instant messaging using common Instant </license> <requires> - <import feature="org.eclipse.ecf.core.feature" version="1.1" match="compatible"/> + <import plugin="org.eclipse.ecf"/> + <import plugin="org.eclipse.ecf.identity"/> </requires> <plugin diff --git a/releng/features/org.eclipse.ecf.remoteservice.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.feature/feature.xml index c0e2686d6..7b2a5d3be 100644 --- a/releng/features/org.eclipse.ecf.remoteservice.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.remoteservice.feature/feature.xml @@ -35,7 +35,8 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services </license> <requires> - <import feature="org.eclipse.ecf.core.feature" version="1.1" match="compatible"/> + <import plugin="org.eclipse.ecf"/> + <import plugin="org.eclipse.ecf.identity"/> </requires> <plugin diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml index f4c8e357c..ece00293e 100644 --- a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml @@ -116,10 +116,6 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services version="0.0.0"/> <includes - id="org.eclipse.ecf.core.feature" - version="0.0.0"/> - - <includes id="org.eclipse.ecf.provider.generic.datashare.feature" version="0.0.0"/> @@ -139,4 +135,9 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services id="org.eclipse.ecf.presence.feature" version="0.0.0"/> + <requires> + <import plugin="org.eclipse.ecf"/> + <import plugin="org.eclipse.ecf.identity"/> + </requires> + </feature> diff --git a/releng/features/org.eclipse.ecf.sdk/feature.xml b/releng/features/org.eclipse.ecf.sdk/feature.xml index aadc999af..c6d095dac 100644 --- a/releng/features/org.eclipse.ecf.sdk/feature.xml +++ b/releng/features/org.eclipse.ecf.sdk/feature.xml @@ -312,38 +312,6 @@ limitations under the License. version="0.0.0"/> <includes - id="org.eclipse.ecf.filetransfer.httpclient.feature" - version="0.0.0"/> - - <includes - id="org.eclipse.ecf.filetransfer.httpclient4.feature" - version="0.0.0"/> - - <includes - id="org.eclipse.ecf.filetransfer.httpclient.ssl.feature" - version="0.0.0"/> - - <includes - id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature" - version="0.0.0"/> - - <includes - id="org.eclipse.ecf.core.feature" - version="0.0.0"/> - - <includes - id="org.eclipse.ecf.core.ssl.feature" - version="0.0.0"/> - - <includes - id="org.eclipse.ecf.filetransfer.feature" - version="0.0.0"/> - - <includes - id="org.eclipse.ecf.filetransfer.ssl.feature" - version="0.0.0"/> - - <includes id="org.eclipse.ecf.core" version="0.0.0"/> diff --git a/releng/features/org.eclipse.ecf.sharedobject.feature/feature.xml b/releng/features/org.eclipse.ecf.sharedobject.feature/feature.xml index 20093cadb..012410818 100644 --- a/releng/features/org.eclipse.ecf.sharedobject.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.sharedobject.feature/feature.xml @@ -25,7 +25,8 @@ Contributors: Composent, Inc. - initial API and implementation </license> <requires> - <import feature="org.eclipse.ecf.core.feature" version="1.1" match="compatible"/> + <import plugin="org.eclipse.ecf"/> + <import plugin="org.eclipse.ecf.identity"/> </requires> <plugin |