From 92ce1ecdedfeb73eb3c995dc01733fea299b55fb Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Thu, 14 Mar 2019 17:08:53 +0000
Subject: [PATCH] Fix feature includes

---
 rse/features/org.eclipse.rse.ftp-feature/feature.xml     | 9 +--------
 rse/features/org.eclipse.rse.telnet-feature/feature.xml  | 8 +-------
 .../org.eclipse.tm.terminal.view.feature/feature.xml     | 2 --
 .../org.eclipse.tm.terminal.view.rse.feature/feature.xml | 3 ---
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.xml b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
index 4db815c..9a779f5 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
@@ -37,19 +37,12 @@
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.ui.console"/>
-      <import plugin="org.apache.commons.net" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.apache.commons.net"/>
       <import plugin="org.eclipse.rse.services"/>
       <import plugin="org.eclipse.rse.subsystems.files.core"/>
       <import plugin="org.eclipse.rse.ui"/>
    </requires>
 
-   <plugin
-         id="org.apache.commons.net"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.rse.services.files.ftp"
          download-size="0"
diff --git a/rse/features/org.eclipse.rse.telnet-feature/feature.xml b/rse/features/org.eclipse.rse.telnet-feature/feature.xml
index 61487db..6b16ace 100644
--- a/rse/features/org.eclipse.rse.telnet-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.telnet-feature/feature.xml
@@ -41,15 +41,9 @@
       <import plugin="org.eclipse.rse.subsystems.files.core"/>
       <import plugin="org.eclipse.rse.subsystems.shells.core"/>
       <import plugin="org.eclipse.rse.ui"/>
+      <import plugin="org.apache.commons.net"/>
    </requires>
 
-   <plugin
-         id="org.apache.commons.net"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.rse.connectorservice.telnet"
          download-size="0"
diff --git a/terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml
index 6e53196..ab7c658 100644
--- a/terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml
@@ -33,8 +33,6 @@
    <requires>
       <import plugin="org.eclipse.core.expressions" version="3.4.400" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tm.terminal.view.core"/>
-      <import plugin="org.eclipse.tm.terminal.control"/>
       <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
    </requires>
 
diff --git a/terminal/features/org.eclipse.tm.terminal.view.rse.feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.view.rse.feature/feature.xml
index 35a974a..c4f43ba 100644
--- a/terminal/features/org.eclipse.tm.terminal.view.rse.feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.view.rse.feature/feature.xml
@@ -36,11 +36,8 @@
       <import plugin="org.eclipse.rse.core"/>
       <import plugin="org.eclipse.rse.subsystems.files.core"/>
       <import plugin="org.eclipse.rse.ui"/>
-      <import plugin="org.eclipse.tm.terminal.view.core"/>
-      <import plugin="org.eclipse.tm.terminal.control"/>
       <import plugin="org.eclipse.ui" version="3.8.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.tm.terminal.view.feature"/>
-      <import plugin="org.eclipse.tm.terminal.view.ui"/>
    </requires>
 
    <plugin
-- 
2.20.1